Merge pull request #3572 from mabaiocchi/w_enable_PP_KC
Witherspoon: Enable Physical Presence Detection and Key Clear functio…
diff --git a/ci/build-all-defconfigs.sh b/ci/build-all-defconfigs.sh
index e1455b2..a866f38 100755
--- a/ci/build-all-defconfigs.sh
+++ b/ci/build-all-defconfigs.sh
@@ -56,11 +56,6 @@
done
fi
-if [ -z "${OUTDIR}" or ! -d "${OUTDIR}" ]; then
- echo "No output directory specified"
- exit 1;
-fi
-
if [ -z "$CCACHE_DIR" ]; then
CCACHE_DIR=`pwd`/.op-build_ccache
fi
@@ -73,23 +68,23 @@
export BR2_DL_DIR=${DL_DIR}
fi
-if [ -f $(ldconfig -p | grep libeatmydata.so | tr ' ' '\n' | grep /|head -n1) ]; then
+if [ -f "$(ldconfig -p | grep libeatmydata.so | tr ' ' '\n' | grep /|head -n1)" ]; then
export LD_PRELOAD=${LD_PRELOAD:+"$LD_PRELOAD "}libeatmydata.so
fi
for i in ${DEFCONFIGS[@]}; do
- export O=${OUTDIR}-$i
+ export O=${OUTDIR}/$i
rm -rf $O
op-build O=$O $i
- ./buildroot/utils/config --file $O/.config --set-val BR2_CCACHE y
- ./buildroot/utils/config --file $O/.config --set-str BR2_CCACHE_DIR $CCACHE_DIR
+ ./buildroot/utils/config --file $O/.config --enable CCACHE \
+ --set-str CCACHE_DIR $CCACHE_DIR
if [ -d "$SDK_DIR" ]; then
- ./buildroot/utils/config --file $O/.config --set-val BR2_TOOLCHAIN_EXTERNAL y
- ./buildroot/utils/config --file $O/.config --set-str BR2_TOOLCHAIN_EXTERNAL_PATH $SDK_DIR
- ./buildroot/utils/config --file $O/.config --set-val BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC y
- ./buildroot/utils/config --file $O/.config --set-val BR2_TOOLCHAIN_EXTERNAL_CXX y
+ ./buildroot/utils/config --file $O/.config --enable TOOLCHAIN_EXTERNAL \
+ --set-str TOOLCHAIN_EXTERNAL_PATH $SDK_DIR \
+ --enable TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC \
+ --enable TOOLCHAIN_EXTERNAL_CXX
# FIXME: How do we work this out programatically?
- ./buildroot/utils/config --file $O/.config --set-val BR2_TOOLCHAIN_EXTERNAL_GCC_6 y
+ ./buildroot/utils/config --file $O/.config --enable BR2_TOOLCHAIN_EXTERNAL_GCC_6
KERNEL_VER=$(./buildroot/utils/config --file $O/.config --state BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE)
echo "KERNEL_VER " $KERNEL_VER
diff --git a/ci/build-sdk.sh b/ci/build-sdk.sh
index 8267af3..6848565 100755
--- a/ci/build-sdk.sh
+++ b/ci/build-sdk.sh
@@ -27,7 +27,25 @@
export O=`pwd`/output-$1-$2/
op-build O=$O $2
-./buildroot/utils/config --file $O/.config --set-val BR2_CCACHE y
-./buildroot/utils/config --file $O/.config --set-str BR2_CCACHE_DIR $CCACHE_DIR
+./buildroot/utils/config --file $O/.config --enable CCACHE
+./buildroot/utils/config --file $O/.config --set-str CCACHE_DIR $CCACHE_DIR
+
+# Disable things not necessary for the sdk
+# (Buildroot manual section 6.1.3)
+./buildroot/utils/config --file $O/.config --disable INIT_BUSYBOX \
+ --enable INIT_NONE \
+ --disable SYSTEM_BIN_SH_BUSYBOX \
+ --disable TARGET_ROOTFS_TAR
+
+# Additionally, disable OpenPower packages and
+# ROOTFS stuff that we won't need
+./buildroot/utils/config --file $O/.config --disable OPENPOWER_PLATFORM \
+ --undefine ROOTFS_USERS_TABLES \
+ --undefine ROOTFS_OVERLAY \
+ --undefine ROOTFS_POST_BUILD_SCRIPT \
+ --undefine ROOTFS_POST_FAKEROOT_SCRIPT \
+ --undefine ROOTFS_POST_IMAGE_SCRIPT \
+ --undefine ROOTFS_POST_SCRIPT_ARGS
+
op-build O=$O olddefconfig
op-build O=$O sdk
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
index f9f4299..8e74664 100644
--- a/openpower/configs/barreleye_defconfig
+++ b/openpower/configs/barreleye_defconfig
@@ -17,7 +17,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/blackbird_defconfig b/openpower/configs/blackbird_defconfig
index 32bf270..3fd9455 100644
--- a/openpower/configs/blackbird_defconfig
+++ b/openpower/configs/blackbird_defconfig
@@ -17,7 +17,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
index 1636af8..18d5d4e 100644
--- a/openpower/configs/firenze_defconfig
+++ b/openpower/configs/firenze_defconfig
@@ -15,7 +15,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index b36a1dd..dd4f1fd 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -17,7 +17,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index c58467a..a0b66d4 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -17,7 +17,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index b2fd767..e5c2694 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -17,7 +17,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/mihawk_defconfig b/openpower/configs/mihawk_defconfig
index 0c651ae..b0b350a 100644
--- a/openpower/configs/mihawk_defconfig
+++ b/openpower/configs/mihawk_defconfig
@@ -18,7 +18,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/nicole_defconfig b/openpower/configs/nicole_defconfig
index f151c64..26a681a 100644
--- a/openpower/configs/nicole_defconfig
+++ b/openpower/configs/nicole_defconfig
@@ -16,7 +16,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/opal_defconfig b/openpower/configs/opal_defconfig
index 5287230..fcc24a9 100644
--- a/openpower/configs/opal_defconfig
+++ b/openpower/configs/opal_defconfig
@@ -13,7 +13,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/p8dtu_defconfig b/openpower/configs/p8dtu_defconfig
index dcf6553..efe1fa0 100644
--- a/openpower/configs/p8dtu_defconfig
+++ b/openpower/configs/p8dtu_defconfig
@@ -18,7 +18,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig
index 0d84b02..c213172 100644
--- a/openpower/configs/p9dsu_defconfig
+++ b/openpower/configs/p9dsu_defconfig
@@ -17,7 +17,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 3b04e81..a7434ac 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -15,7 +15,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/pseries_defconfig b/openpower/configs/pseries_defconfig
index 9bfcf35..8f8c167 100644
--- a/openpower/configs/pseries_defconfig
+++ b/openpower/configs/pseries_defconfig
@@ -16,7 +16,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/pseries_skiroot_defconfig"
diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
index 204d27e..fc4ddd2 100644
--- a/openpower/configs/romulus_defconfig
+++ b/openpower/configs/romulus_defconfig
@@ -17,7 +17,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/vesnin_defconfig b/openpower/configs/vesnin_defconfig
index e35db6e..252634b 100644
--- a/openpower/configs/vesnin_defconfig
+++ b/openpower/configs/vesnin_defconfig
@@ -16,7 +16,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index 1efcf8c..0587162 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -17,7 +17,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index b7ba441..2e088af 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -17,7 +17,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig
index 350bd57..117e248 100644
--- a/openpower/configs/zz_defconfig
+++ b/openpower/configs/zz_defconfig
@@ -15,7 +15,7 @@
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.30"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.33"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch
index e5ab3ee..5879598 100644
--- a/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch
+++ b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch
@@ -14,7 +14,7 @@
1 file changed, 3 insertions(+)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 9b3b1b16eafb..2a3aa1509d40 100644
+index 2f49a7b3ce85..b7e17c62396e 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -789,6 +789,9 @@ void xhci_shutdown(struct usb_hcd *hcd)
diff --git a/openpower/linux/0002-Release-OpenPower-kernel.patch b/openpower/linux/0002-Release-OpenPower-kernel.patch
index e1e05fe..87ff292 100644
--- a/openpower/linux/0002-Release-OpenPower-kernel.patch
+++ b/openpower/linux/0002-Release-OpenPower-kernel.patch
@@ -9,13 +9,13 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index e1f41756f475..d462eddd8aee 100644
+index c09d5a4d2e7a..6a59ef669154 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
VERSION = 5
PATCHLEVEL = 4
- SUBLEVEL = 30
+ SUBLEVEL = 33
-EXTRAVERSION =
+EXTRAVERSION = -openpower1
NAME = Kleptomaniac Octopus
diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index df470fa..7f2820a 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -31,7 +31,7 @@
config BR2_HCODE_VERSION
string
- default "hw041520a.opmst" if BR2_HCODE_LATEST_VERSION
+ default "hw042020a.opmst" if BR2_HCODE_LATEST_VERSION
default BR2_HCODE_CUSTOM_VERSION_VALUE \
if BR2_HCODE_CUSTOM_VERSION
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index 0b802b2..1125e56 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_VERSION
string
- default "b481ff043e1b3fe97ac535cba28e087491986db7" if BR2_HOSTBOOT_LATEST_VERSION
+ default "cc7fb146afd86c1e5e2f9a8e5ea3724c7f3bc4d6" if BR2_HOSTBOOT_LATEST_VERSION
default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_CUSTOM_VERSION
diff --git a/openpower/package/occ/Config.in b/openpower/package/occ/Config.in
index 4ebb73d..d9df0b3 100644
--- a/openpower/package/occ/Config.in
+++ b/openpower/package/occ/Config.in
@@ -43,7 +43,7 @@
config BR2_OCC_VERSION
string
- default "3ab29212518e6574019fd569588a58cba9ba9823" if BR2_OCC_LATEST_VERSION
+ default "ab4dc96fd6cf584c42bd0b45be25458c0e61ad63" if BR2_OCC_LATEST_VERSION
default BR2_OCC_CUSTOM_VERSION_VALUE \
if BR2_OCC_CUSTOM_VERSION
diff --git a/openpower/package/skiboot/0001-platform-add-Raptor-Blackbird-support.patch b/openpower/package/skiboot/0001-platform-add-Raptor-Blackbird-support.patch
deleted file mode 100644
index a7ed4f1..0000000
--- a/openpower/package/skiboot/0001-platform-add-Raptor-Blackbird-support.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 376bed3fbe902138b92e95d9da58bb5e1509072e Mon Sep 17 00:00:00 2001
-From: Stewart Smith <stewart@flamingspork.com>
-Date: Sun, 8 Dec 2019 19:06:25 -0800
-Subject: [PATCH] platform: add Raptor Blackbird support
-
-Based off the Raptor patch:
-https://git.raptorcs.com/git/blackbird-skiboot/commit/?id=c81f9d66592dc2a7cf7f6c59c3def5cee0638c1f
-
-Notable changes are slot names matching what's silkscreened on the board.
-See https://i1.wp.com/www.flamingspork.com/blog/wp-content/uploads/2019/12/IMG_4006-scaled.jpg
-for a photo of the actual board.
-
-I haven't included the port 80h bit as I haven't worked out how to probe that from the BMC to test.
-
-Boot tested, seems good.
-
-Signed-off-by: Stewart Smith <stewart@flamingspork.com>
----
- platforms/astbmc/Makefile.inc | 3 +-
- platforms/astbmc/blackbird.c | 66 +++++++++++++++++++++++++++++++++++
- 2 files changed, 68 insertions(+), 1 deletion(-)
- create mode 100644 platforms/astbmc/blackbird.c
-
-diff --git a/platforms/astbmc/Makefile.inc b/platforms/astbmc/Makefile.inc
-index fd4eaeac..e0f8760d 100644
---- a/platforms/astbmc/Makefile.inc
-+++ b/platforms/astbmc/Makefile.inc
-@@ -6,7 +6,8 @@ ASTBMC_OBJS = pnor.o common.o slots.o \
- garrison.o barreleye.o \
- witherspoon.o zaius.o romulus.o p9dsu.o \
- vesnin.o nicole.o mihawk.o\
-- talos.o swift.o
-+ talos.o blackbird.o \
-+ swift.o
-
- ASTBMC = $(PLATDIR)/astbmc/built-in.a
- $(ASTBMC): $(ASTBMC_OBJS:%=$(PLATDIR)/astbmc/%)
-diff --git a/platforms/astbmc/blackbird.c b/platforms/astbmc/blackbird.c
-new file mode 100644
-index 00000000..8817b8c5
---- /dev/null
-+++ b/platforms/astbmc/blackbird.c
-@@ -0,0 +1,66 @@
-+// SPDX-License-Identifier: Apache-2.0
-+/* Copyright 2017 IBM Corp.
-+ * Copyright 2018-2019 Raptor Engineering, LLC
-+ * Copyright 2019 Stewart Smith
-+ */
-+
-+#include <skiboot.h>
-+#include <device.h>
-+#include <console.h>
-+#include <chip.h>
-+#include <ipmi.h>
-+#include <psi.h>
-+
-+#include "astbmc.h"
-+
-+ST_PLUGGABLE(blackbird_cpu1_slot1, "SLOT1 PCIE 4.0 X16");
-+ST_PLUGGABLE(blackbird_cpu1_slot2, "SLOT2 PCIE 4.0 X8");
-+
-+ST_BUILTIN_DEV(blackbird_builtin_sata, "Builtin SATA");
-+ST_BUILTIN_DEV(blackbird_builtin_usb, "Builtin USB");
-+ST_BUILTIN_DEV(blackbird_builtin_ethernet, "Builtin Ethernet");
-+ST_BUILTIN_DEV(blackbird_builtin_bmc, "BMC");
-+
-+static const struct slot_table_entry blackbird_phb_table[] = {
-+ ST_PHB_ENTRY(0, 0, blackbird_cpu1_slot1),
-+ ST_PHB_ENTRY(0, 1, blackbird_cpu1_slot2),
-+
-+ ST_PHB_ENTRY(0, 2, blackbird_builtin_sata),
-+ ST_PHB_ENTRY(0, 3, blackbird_builtin_usb),
-+ ST_PHB_ENTRY(0, 4, blackbird_builtin_ethernet),
-+ ST_PHB_ENTRY(0, 5, blackbird_builtin_bmc),
-+
-+ { .etype = st_end },
-+};
-+
-+static bool blackbird_probe(void)
-+{
-+ if (!dt_node_is_compatible(dt_root, "rcs,blackbird"))
-+ return false;
-+
-+ /* Lot of common early inits here */
-+ astbmc_early_init();
-+
-+ /* Setup UART for use by OPAL (Linux hvc) */
-+ uart_set_console_policy(UART_CONSOLE_OPAL);
-+
-+ slot_table_init(blackbird_phb_table);
-+
-+ return true;
-+}
-+
-+DECLARE_PLATFORM(blackbird) = {
-+ .name = "Blackbird",
-+ .probe = blackbird_probe,
-+ .init = astbmc_init,
-+ .start_preload_resource = flash_start_preload_resource,
-+ .resource_loaded = flash_resource_loaded,
-+ .bmc = &bmc_plat_ast2500_openbmc,
-+ .pci_get_slot_info = slot_table_get_slot_info,
-+ .pci_probe_complete = check_all_slot_table,
-+ .cec_power_down = astbmc_ipmi_power_down,
-+ .cec_reboot = astbmc_ipmi_reboot,
-+ .elog_commit = ipmi_elog_commit,
-+ .exit = astbmc_exit,
-+ .terminate = ipmi_terminate,
-+};
---
-2.23.0
-
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 6caaee4..5bb5443 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
config BR2_SKIBOOT_VERSION
string
- default "v6.6-rc1-4-ge991415a" if BR2_SKIBOOT_LATEST_VERSION
+ default "v6.6-rc1-9-g9547b3da" if BR2_SKIBOOT_LATEST_VERSION
default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
if BR2_SKIBOOT_CUSTOM_VERSION
diff --git a/openpower/scripts/update-defconfigs.sh b/openpower/scripts/update-defconfigs.sh
old mode 100644
new mode 100755
index c82900c..f51fc8f
--- a/openpower/scripts/update-defconfigs.sh
+++ b/openpower/scripts/update-defconfigs.sh
@@ -10,6 +10,9 @@
echo $PLATFORM
ODIR=`mktemp -d`
op-build O=$ODIR $PLATFORM_DEFCONFIG
+ if [ $# -gt 0 ]; then
+ buildroot/utils/config --file $ODIR/.config "$@"
+ fi
op-build O=$ODIR olddefconfig
op-build O=$ODIR savedefconfig
rm -rf $ODIR