Add witherspoon defconfig, p9 support for hostboot
Opened RTC issues 160270 and 160273 to fix patches that were
added.
diff --git a/openpower/package/capp-ucode/Config.in b/openpower/package/capp-ucode/Config.in
index 1bdbc23..d432419 100644
--- a/openpower/package/capp-ucode/Config.in
+++ b/openpower/package/capp-ucode/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_CAPP_UCODE
bool "capp_capp"
- default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+ default y if (BR2_OPENPOWER_PLATFORM)
help
Microcode for CAPP hardware
diff --git a/openpower/package/hostboot-binaries/Config.in b/openpower/package/hostboot-binaries/Config.in
index eccf3e3..4c3e770 100644
--- a/openpower/package/hostboot-binaries/Config.in
+++ b/openpower/package/hostboot-binaries/Config.in
@@ -1,5 +1,5 @@
config BR2_PACKAGE_HOSTBOOT_BINARIES
bool "hostboot_binaries"
- default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+ default y if (BR2_OPENPOWER_PLATFORM)
help
Project to stage hostboot binary images
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index f7f8005..d864c49 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_HOSTBOOT
bool "hostboot"
- default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+ default y if (BR2_OPENPOWER_PLATFORM)
select BR2_CPP
help
Project to build the hostboot firmware codebase
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 8e6f9d3..0dcd7a5 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -3,8 +3,10 @@
# hostboot
#
################################################################################
+HOSTBOOT_VERSION_BRANCH_MASTER_P8 = 3707a3c6562bb54f43099f15836b79ea13659aa7
+HOSTBOOT_VERSION_BRANCH_MASTER = f5d53757fabb36a84abb75c2f97b66a7429f134b
-HOSTBOOT_VERSION ?= 3707a3c6562bb54f43099f15836b79ea13659aa7
+HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
HOSTBOOT_LICENSE = Apache-2.0
@@ -16,7 +18,24 @@
HOSTBOOT_ENV_VARS=$(TARGET_MAKE_ENV) \
CONFIG_FILE=$(BR2_EXTERNAL)/configs/hostboot/$(BR2_HOSTBOOT_CONFIG_FILE) \
OPENPOWER_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) HOST_PREFIX="" HOST_BINUTILS_DIR=$(HOST_BINUTILS_DIR) \
- HOSTBOOT_VERSION=`cat $(HOSTBOOT_VERSION_FILE)`
+ HOSTBOOT_VERSION=`cat $(HOSTBOOT_VERSION_FILE)`
+
+define HOSTBOOT_APPLY_PATCHES
+ if [ "$(BR2_OPENPOWER_POWER9)" == "y" ]; then \
+ $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL)/package/hostboot/p9Patches \*.patch; \
+ if [ -d $(BR2_EXTERNAL)/custom/patches/hostboot/p9Patches ]; then \
+ $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL)/custom/patches/hostboot/p9Patches \*.patch; \
+ fi; \
+ fi; \
+ if [ "$(BR2_OPENPOWER_POWER8)" == "y" ]; then \
+ $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL)/package/hostboot/p8Patches \*.patch; \
+ if [ -d $(BR2_EXTERNAL)/custom/patches/hostboot/p8Patches ]; then \
+ $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL)/custom/patches/hostboot/p8Patches \*.patch; \
+ fi; \
+ fi;
+endef
+
+HOSTBOOT_POST_PATCH_HOOKS += HOSTBOOT_APPLY_PATCHES
define HOSTBOOT_BUILD_CMDS
$(HOSTBOOT_ENV_VARS) bash -c 'cd $(@D) && source ./env.bash && $(MAKE)'
diff --git a/openpower/package/hostboot/hostboot-0001-Increase-uart-delay.patch b/openpower/package/hostboot/p8Patches/hostboot-0001-Increase-uart-delay.patch
similarity index 100%
rename from openpower/package/hostboot/hostboot-0001-Increase-uart-delay.patch
rename to openpower/package/hostboot/p8Patches/hostboot-0001-Increase-uart-delay.patch
diff --git a/openpower/package/hostboot/hostboot-0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch b/openpower/package/hostboot/p8Patches/hostboot-0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch
similarity index 100%
rename from openpower/package/hostboot/hostboot-0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch
rename to openpower/package/hostboot/p8Patches/hostboot-0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0001-Increase-uart-delay.patch b/openpower/package/hostboot/p9Patches/hostboot-0001-Increase-uart-delay.patch
new file mode 120000
index 0000000..10137ed
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0001-Increase-uart-delay.patch
@@ -0,0 +1 @@
+../p8Patches/hostboot-0001-Increase-uart-delay.patch
\ No newline at end of file
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0002-remove-attr-override-compile.patch b/openpower/package/hostboot/p9Patches/hostboot-0002-remove-attr-override-compile.patch
new file mode 100644
index 0000000..362121f
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0002-remove-attr-override-compile.patch
@@ -0,0 +1,26 @@
+From d71055295a21e7fe9105bdfe0085006462ab568c Mon Sep 17 00:00:00 2001
+From: Matt Ploetz <maploetz@us.ibm.com>
+Date: Tue, 9 Aug 2016 10:08:15 -0500
+Subject: [PATCH] Remove attribute override compile
+
+Change-Id: Ia3f4cda97ff1ec80619bf8b5144144903b2b24f5
+---
+ src/usr/targeting/makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/usr/targeting/makefile b/src/usr/targeting/makefile
+index 61dfb0a..c0c31ea 100644
+--- a/src/usr/targeting/makefile
++++ b/src/usr/targeting/makefile
+@@ -65,7 +65,7 @@ OBJS += ${HOSTBOOT_SPECIFIC_OBJS}
+ SUBDIRS += test.d
+ SUBDIRS += xmltohb.d
+ SUBDIRS += runtime.d
+-SUBDIRS += attroverride.d
++#SUBDIRS += attroverride.d
+
+ include ${ROOTPATH}/config.mk
+
+--
+1.8.2.2
+
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0003-remove-unsed-var-attn-rt.patch b/openpower/package/hostboot/p9Patches/hostboot-0003-remove-unsed-var-attn-rt.patch
new file mode 100644
index 0000000..0ae93ed
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0003-remove-unsed-var-attn-rt.patch
@@ -0,0 +1,26 @@
+From 8e9ebe09e1656fab860bb0d5bf1da2f6aad9378d Mon Sep 17 00:00:00 2001
+From: Matt Ploetz <maploetz@us.ibm.com>
+Date: Tue, 9 Aug 2016 10:21:39 -0500
+Subject: [PATCH] Remove unused var
+
+Change-Id: I563e862d078cb99ac0083b58b80608acfd431597
+---
+ src/usr/diag/attn/runtime/attn_rt.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/usr/diag/attn/runtime/attn_rt.C b/src/usr/diag/attn/runtime/attn_rt.C
+index 62860d9..0675174 100644
+--- a/src/usr/diag/attn/runtime/attn_rt.C
++++ b/src/usr/diag/attn/runtime/attn_rt.C
+@@ -105,7 +105,7 @@ namespace ATTN_RT
+ int rc = 0;
+ errlHndl_t err = NULL;
+ AttentionList attentions;
+- MemOps & memOps = getMemOps();
++ //MemOps & memOps = getMemOps();
+
+
+ do
+--
+1.8.2.2
+
diff --git a/openpower/package/occ/Config.in b/openpower/package/occ/Config.in
index f00396d..29b5eb4 100644
--- a/openpower/package/occ/Config.in
+++ b/openpower/package/occ/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_OCC
bool "occ"
- default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+ default y if (BR2_OPENPOWER_PLATFORM)
select BR2_CPP
help
Project to build OCC
diff --git a/openpower/package/openpower-ffs/Config.in b/openpower/package/openpower-ffs/Config.in
index 688b654..19a98f4 100644
--- a/openpower/package/openpower-ffs/Config.in
+++ b/openpower/package/openpower-ffs/Config.in
@@ -1,5 +1,5 @@
config BR2_PACKAGE_HOST_OPENPOWER_FFS
bool "ffs"
- default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+ default y if (BR2_OPENPOWER_PLATFORM)
help
Utilites for building an 'ffs' image file.
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 7719eda..de52b7d 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_OPENPOWER_PNOR
bool "openpower_pnor"
- default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+ default y if (BR2_OPENPOWER_PLATFORM)
select BR2_PACKAGE_HOSTBOOT
select BR2_PACKAGE_HOSTBOOT_BINARIES
select BR2_PACKAGE_SKIBOOT
diff --git a/openpower/package/p8-pore-binutils/Config.in b/openpower/package/p8-pore-binutils/Config.in
index 6099c31..f8d4bf0 100644
--- a/openpower/package/p8-pore-binutils/Config.in
+++ b/openpower/package/p8-pore-binutils/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_HOST_P8_PORE_BINUTILS
bool "p8-pore-binutils"
- default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+ default y if (BR2_OPENPOWER_PLATFORM)
select BR2_CPP
help
Project to build the P8 PORE binutils
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 446805f..cb19c76 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -3,9 +3,9 @@
config BR2_PACKAGE_SKIBOOT
bool "skiboot"
depends on BR2_powerpc64 || BR2_powerpc64le
- default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+ default y if (BR2_OPENPOWER_PLATFORM)
help
- Build skiboot POWER8 firmware
+ Build skiboot POWER firmware
if BR2_PACKAGE_SKIBOOT