Merge branch 'master' into master-p10
Pull the upstream 'master' branch into master-p10. This is
a necessary step in allowing us to eventually merge back
the master-p10 branch upstream.
A few highlights in solving the conflicts:
* buildroot is now the upstream openpower version (2020.08.2)
* the openpower-pnor package is the upstream version (without
Power10 support). This is due to us using openpower-pnor-p10
for Power10 recently.
Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
Conflicts:
.gitmodules
README.md
buildroot
openpower/package/Config.in
openpower/package/hostboot-binaries/Config.in
openpower/package/ocmb-explorer-fw/Config.in
openpower/package/ocmb-explorer-fw/ocmb-explorer-fw.mk
openpower/package/openpower-pnor/Config.in
openpower/package/openpower-pnor/openpower-pnor.mk
openpower/package/ppe42-binutils/Config.in
openpower/package/ppe42-gcc/Config.in
openpower/package/skiboot/Config.in
openpower/platform/Config.in
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index a25bf52..18443b4 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -1,22 +1,17 @@
config BR2_PACKAGE_OPENPOWER_PNOR
bool "openpower_pnor"
- default y if (BR2_OPENPOWER_PLATFORM)
+ default y if (BR2_OPENPOWER_PLATFORM && BR2_OPENPOWER_POWER9)
depends on (!BR2_PACKAGE_OPENPOWER_PNOR_P10)
- select BR2_PACKAGE_HOSTBOOT_P10 if (! (BR2_OPENPOWER_POWER8 || BR2_OPENPOWER_POWER9) )
- select BR2_PACKAGE_HOSTBOOT if BR2_OPENPOWER_POWER9
- select BR2_PACKAGE_HOSTBOOT_P8 if BR2_OPENPOWER_POWER8
+ select BR2_PACKAGE_HOSTBOOT
select BR2_PACKAGE_HOSTBOOT_BINARIES
select BR2_PACKAGE_SKIBOOT
select BR2_PACKAGE_OPENPOWER_FFS
- select BR2_PACKAGE_OCC_P10 if (! (BR2_OPENPOWER_POWER8 || BR2_OPENPOWER_POWER9 ) )
- select BR2_PACKAGE_OCC if BR2_OPENPOWER_POWER9
- select BR2_PACKAGE_OCC_P8 if BR2_OPENPOWER_POWER8
+ select BR2_PACKAGE_OCC
select BR2_PACKAGE_CAPP_UCODE
select BR2_PACKAGE_IMA_CATALOG
select BR2_PACKAGE_HOST_OPENPOWER_VPNOR
select BR2_PACKAGE_MACHINE_XML
- select BR2_PACKAGE_HCODE_P10 if (BR2_OPENPOWER_POWER10)
- select BR2_PACKAGE_HCODE if (BR2_OPENPOWER_POWER9)
+ select BR2_PACKAGE_HCODE if BR2_OPENPOWER_POWER9
help
Utilites for building a targeting binary image
@@ -178,8 +173,4 @@
bool "Create a virtual PNOR image along with the standard image"
default n
-config BR2_OPENPOWER_MAKE_LIDS
- bool "Create a package of content and signature binaries to be used for lid creation"
- default n
-
endmenu