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/platform/Config.in b/openpower/platform/Config.in
index b6baa4d..efe480b 100644
--- a/openpower/platform/Config.in
+++ b/openpower/platform/Config.in
@@ -1,12 +1,7 @@
config BR2_OPENPOWER_PLATFORM
bool "Enables only one openPower platform"
default n
- depends on ((BR2_OPENPOWER_POWER8 || BR2_OPENPOWER_POWER9 || BR2_OPENPOWER_POWER10) && !(BR2_OPENPOWER_POWER8 && BR2_OPENPOWER_POWER9) && !(BR2_OPENPOWER_POWER8 && BR2_OPENPOWER_POWER10) && !(BR2_OPENPOWER_POWER9 && BR2_OPENPOWER_POWER10) && !(BR2_OPENPOWER_POWER8 && BR2_OPENPOWER_POWER9 && BR2_OPENPOWER_POWER10))
-
-config BR2_OPENPOWER_POWER8
- bool "Enables the OpenPower p8 platform"
- default n
- depends on BR2_powerpc64 || BR2_powerpc64le
+ depends on ((BR2_OPENPOWER_POWER9 || BR2_OPENPOWER_POWER10) && !(BR2_OPENPOWER_POWER9 && BR2_OPENPOWER_POWER10))
config BR2_OPENPOWER_POWER9
bool "Enables the OpenPower p9 platform"