Merge branch 'one-witherspoon-to-rule-them-all'
Fixes: https://github.com/open-power/op-build/pull/1444
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
diff --git a/openpower/configs/witherspoon-sequoia_defconfig b/openpower/configs/witherspoon-sequoia_defconfig
index 183791a..5bd19fb 100644
--- a/openpower/configs/witherspoon-sequoia_defconfig
+++ b/openpower/configs/witherspoon-sequoia_defconfig
@@ -1,6 +1,6 @@
BR2_powerpc64le=y
BR2_powerpc_power8=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/sequoia-patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/witherspoon-patches"
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
BR2_TOOLCHAIN_BUILDROOT_CXX=y
diff --git a/openpower/configs/witherspoon-redbud_defconfig b/openpower/configs/witherspoon_defconfig
similarity index 95%
rename from openpower/configs/witherspoon-redbud_defconfig
rename to openpower/configs/witherspoon_defconfig
index 085b914..88f5dff 100644
--- a/openpower/configs/witherspoon-redbud_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -1,6 +1,6 @@
BR2_powerpc64le=y
BR2_powerpc_power8=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/redbud-patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/witherspoon-patches"
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -48,7 +48,7 @@
BR2_OPENPOWER_BIOS_XML_FILENAME="WITHERSPOON_bios.xml"
BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
BR2_OPENPOWER_CONFIG_NAME="witherspoon"
-BR2_OPENPOWER_PNOR_FILENAME="witherspoon-redbud.pnor"
+BR2_OPENPOWER_PNOR_FILENAME="witherspoon.pnor"
BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc"
BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc"
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 4e46a5d..c5da4a2 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
config BR2_SKIBOOT_VERSION
string
- default "v5.8-72-g3f936bae970e" if BR2_SKIBOOT_LATEST_VERSION
+ default "v5.8-109-g4b22457e7837" if BR2_SKIBOOT_LATEST_VERSION
default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
if BR2_SKIBOOT_CUSTOM_VERSION
diff --git a/openpower/patches/redbud-patches/skiboot/0001-NOT-FOR-UPSTREAM-Add-support-for-Redbud.patch b/openpower/patches/redbud-patches/skiboot/0001-NOT-FOR-UPSTREAM-Add-support-for-Redbud.patch
deleted file mode 100644
index 25897fb..0000000
--- a/openpower/patches/redbud-patches/skiboot/0001-NOT-FOR-UPSTREAM-Add-support-for-Redbud.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 399620b8282f89728ab94fd0c273882063bf32b1 Mon Sep 17 00:00:00 2001
-From: Alistair Popple <alistair@popple.id.au>
-Date: Thu, 22 Jun 2017 13:26:01 +1000
-Subject: [PATCH] NOT FOR UPSTREAM: Add support for Redbud
-
-Add support for Redbud. This is mutually exclusive with support for Sequoia so
-anything built with this patch will not work on Sequoia.
-
-Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
----
- platforms/astbmc/Makefile.inc | 2 +-
- platforms/astbmc/{witherspoon.c => redbud.c} | 68 +++++++---------------------
- 2 files changed, 18 insertions(+), 52 deletions(-)
- rename platforms/astbmc/{witherspoon.c => redbud.c} (91%)
-
-diff --git a/platforms/astbmc/Makefile.inc b/platforms/astbmc/Makefile.inc
-index 49292c10601c..797a03c323ad 100644
---- a/platforms/astbmc/Makefile.inc
-+++ b/platforms/astbmc/Makefile.inc
-@@ -4,7 +4,7 @@ ASTBMC_OBJS = pnor.o common.o slots.o \
- palmetto.o habanero.o firestone.o \
- p8dtu.o p8dnu.o \
- garrison.o barreleye.o \
-- witherspoon.o zaius.o romulus.o p9dsu.o
-+ redbud.o zaius.o romulus.o p9dsu.o
-
- ASTBMC = $(PLATDIR)/astbmc/built-in.o
- $(ASTBMC): $(ASTBMC_OBJS:%=$(PLATDIR)/astbmc/%)
-diff --git a/platforms/astbmc/witherspoon.c b/platforms/astbmc/redbud.c
-similarity index 91%
-rename from platforms/astbmc/witherspoon.c
-rename to platforms/astbmc/redbud.c
-index 6a773061db74..90373f66961f 100644
---- a/platforms/astbmc/witherspoon.c
-+++ b/platforms/astbmc/redbud.c
-@@ -51,7 +51,7 @@ static const struct slot_table_entry witherspoon_gpu1[] = {
- static const struct slot_table_entry witherspoon_gpu2[] = {
- {
- .etype = st_pluggable_slot,
-- .location = ST_LOC_DEVFN(0xc0,0),
-+ .location = ST_LOC_DEVFN(0x60,0),
- .name = "GPU2",
- },
- { .etype = st_end },
-@@ -60,26 +60,8 @@ static const struct slot_table_entry witherspoon_gpu2[] = {
- static const struct slot_table_entry witherspoon_gpu3[] = {
- {
- .etype = st_pluggable_slot,
-- .location = ST_LOC_DEVFN(0x60,0),
-- .name = "GPU3",
-- },
-- { .etype = st_end },
--};
--
--static const struct slot_table_entry witherspoon_gpu4[] = {
-- {
-- .etype = st_pluggable_slot,
- .location = ST_LOC_DEVFN(0x80,0),
-- .name = "GPU4",
-- },
-- { .etype = st_end },
--};
--
--static const struct slot_table_entry witherspoon_gpu5[] = {
-- {
-- .etype = st_pluggable_slot,
-- .location = ST_LOC_DEVFN(0xa0,0),
-- .name = "GPU5",
-+ .name = "GPU3",
- },
- { .etype = st_end },
- };
-@@ -97,12 +79,6 @@ static const struct slot_table_entry witherspoon_plx0_down[] = {
- .children = witherspoon_gpu1,
- .name = "GPU1 down",
- },
-- {
-- .etype = st_builtin_dev,
-- .location = ST_LOC_DEVFN(0x4c,0),
-- .children = witherspoon_gpu2,
-- .name = "GPU2 down",
-- },
- { .etype = st_end },
- };
-
-@@ -110,20 +86,14 @@ static const struct slot_table_entry witherspoon_plx1_down[] = {
- {
- .etype = st_builtin_dev,
- .location = ST_LOC_DEVFN(0x44,0),
-- .children = witherspoon_gpu3,
-- .name = "GPU3 down",
-+ .children = witherspoon_gpu2,
-+ .name = "GPU2 down",
- },
- {
- .etype = st_builtin_dev,
- .location = ST_LOC_DEVFN(0x45,0),
-- .children = witherspoon_gpu4,
-- .name = "GPU4 down",
-- },
-- {
-- .etype = st_builtin_dev,
-- .location = ST_LOC_DEVFN(0x4d,0),
-- .children = witherspoon_gpu5,
-- .name = "GPU5 down",
-+ .children = witherspoon_gpu3,
-+ .name = "GPU3 down",
- },
- { .etype = st_end },
- };
-@@ -175,11 +145,6 @@ static const struct slot_table_entry witherspoon_npu0_slots[] = {
- .location = ST_LOC_NPU_GROUP(1),
- .name = "GPU1",
- },
-- {
-- .etype = st_npu_slot,
-- .location = ST_LOC_NPU_GROUP(2),
-- .name = "GPU2",
-- },
- { .etype = st_end },
- };
-
-@@ -187,17 +152,12 @@ static const struct slot_table_entry witherspoon_npu8_slots[] = {
- {
- .etype = st_npu_slot,
- .location = ST_LOC_NPU_GROUP(0),
-- .name = "GPU3",
-+ .name = "GPU2",
- },
- {
- .etype = st_npu_slot,
- .location = ST_LOC_NPU_GROUP(1),
-- .name = "GPU4",
-- },
-- {
-- .etype = st_npu_slot,
-- .location = ST_LOC_NPU_GROUP(2),
-- .name = "GPU5",
-+ .name = "GPU3",
- },
- { .etype = st_end },
- };
-@@ -290,10 +250,10 @@ static void dt_create_npu2(void)
-
- create_link(npu, 0, 0);
- create_link(npu, 0, 1);
-- create_link(npu, 1, 2);
-+ create_link(npu, 0, 2);
- create_link(npu, 1, 3);
-- create_link(npu, 2, 4);
-- create_link(npu, 2, 5);
-+ create_link(npu, 1, 4);
-+ create_link(npu, 1, 5);
- }
- }
-
-@@ -304,6 +264,12 @@ static bool witherspoon_probe(void)
- if (!dt_node_is_compatible(dt_root, "ibm,witherspoon"))
- return false;
-
-+ prerror("********************************************************************************\n");
-+ prerror("* README: THIS BUILD IS ONLY FOR SYSTEMS SUPPORTING A MAXIMUM OF 4 GPUS *\n");
-+ prerror("* *\n");
-+ prerror("* !!! THIS BUILD WILL NOT WORK ON SYSTEMS WHICH SUPPORT 6 GPUS !!! *\n");
-+ prerror("********************************************************************************\n");
-+
- /* Lot of common early inits here */
- astbmc_early_init();
-
---
-2.9.4
-
diff --git a/openpower/patches/sequoia-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch b/openpower/patches/sequoia-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch
deleted file mode 100644
index 63867ce..0000000
--- a/openpower/patches/sequoia-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From fc91388ea139d6233484e1fefc606165861f517a Mon Sep 17 00:00:00 2001
-From: Bill Hoffa <wghoffa@us.ibm.com>
-Date: Tue, 8 Aug 2017 15:15:01 -0500
-Subject: [PATCH] Temporarily Change PLL BUCKET settings
-
----
- witherspoon.xml | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/witherspoon.xml b/witherspoon.xml
-index 103e865..1319c79 100644
---- a/witherspoon.xml
-+++ b/witherspoon.xml
-@@ -18641,19 +18641,19 @@
- </attribute>
- <attribute>
- <id>OB0_PLL_BUCKET</id>
-- <default>1</default>
-+ <default>0x02</default>
- </attribute>
- <attribute>
- <id>OB1_PLL_BUCKET</id>
-- <default>1</default>
-+ <default>0x02</default>
- </attribute>
- <attribute>
- <id>OB2_PLL_BUCKET</id>
-- <default>1</default>
-+ <default>0x02</default>
- </attribute>
- <attribute>
- <id>OB3_PLL_BUCKET</id>
-- <default>1</default>
-+ <default>0x02</default>
- </attribute>
- <attribute>
- <id>OBUS_RATIO_VALUE</id>
---
-1.8.2.2
-
diff --git a/openpower/patches/redbud-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch b/openpower/patches/witherspoon-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch
similarity index 100%
rename from openpower/patches/redbud-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch
rename to openpower/patches/witherspoon-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch