Merge pull request #3623 from stewartsmith/stewart-blackbird-6
Update Raptor Blackbird Support
diff --git a/ci/build-all-defconfigs.sh b/ci/build-all-defconfigs.sh
index 30703f2..f21b847 100755
--- a/ci/build-all-defconfigs.sh
+++ b/ci/build-all-defconfigs.sh
@@ -7,7 +7,6 @@
SDK_ONLY=0
CONFIGTAG="_defconfig"
DEFCONFIGS=();
-CCACHE_DIR=""
SDK_DIR=""
opt=$(getopt -o 'o:Ss:p:r' -- "$@")
@@ -83,7 +82,7 @@
# Even if they should be interchangeable, we want to force the sdk
# build on every supported OS variations
- HASH_PROPERTIES="$(HASH PROPERTIES) $(lsb_release -as | tr -d '/n[:space:]')"
+ HASH_PROPERTIES="$HASH_PROPERTIES $(lsb_release -as | tr -d '[:space:]')"
# Disable things not necessary for the sdk
# (Buildroot manual section 6.1.3 plus a few more things)
@@ -192,7 +191,7 @@
export SDK_DIR
}
-if [ -z "${PLATFORM_LIST}" ]; then
+if [ -z "${PLATFORM_LIST-}" ]; then
echo "Using all the defconfigs for all the platforms"
DEFCONFIGS=`(cd openpower/configs; ls -1 *_defconfig)`
else
@@ -203,14 +202,14 @@
done
fi
-if [ -z "$CCACHE_DIR" ]; then
+if [ -z "${CCACHE_DIR-}" ]; then
CCACHE_DIR=`pwd`/.op-build_ccache
fi
shopt -s expand_aliases
source op-build-env
-if [ -n "$DL_DIR" ]; then
+if [ -n "${DL_DIR-}" ]; then
unset BR2_DL_DIR
export BR2_DL_DIR=${DL_DIR}
fi
diff --git a/openpower/configs/nicole_defconfig b/openpower/configs/nicole_defconfig
index 26a681a..7c24821 100644
--- a/openpower/configs/nicole_defconfig
+++ b/openpower/configs/nicole_defconfig
@@ -45,7 +45,7 @@
BR2_OPENPOWER_POWER9=y
BR2_HOSTBOOT_CONFIG_FILE="nicole.config"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="nicole-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="1ac78dd5c54cc203f409147763aafa3b0120ee18"
+BR2_OPENPOWER_MACHINE_XML_VERSION="9a6da5f0c3f86025378e16fe7e82b4f0503f12b2"
BR2_OPENPOWER_MACHINE_XML_FILENAME="nicole.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="NICOLE_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="NICOLE_hb.mrw.xml"
diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index a370bc5..30044e1 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -31,7 +31,7 @@
config BR2_HCODE_VERSION
string
- default "hw050520a.opmst" if BR2_HCODE_LATEST_VERSION
+ default "hw051220a.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 eb432cf..869cc4e 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_VERSION
string
- default "d52fed67bdebe2b5faff2cf90b9c3927bcf4a718" if BR2_HOSTBOOT_LATEST_VERSION
+ default "edf98952769db1dccfc6f6c4bab8fee0c1dee7e7" if BR2_HOSTBOOT_LATEST_VERSION
default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_CUSTOM_VERSION