diff options
9 files changed, 7 insertions, 63 deletions
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig index b270ef01..cb2d2b6e 100644 --- a/openpower/configs/garrison_defconfig +++ b/openpower/configs/garrison_defconfig @@ -42,7 +42,7 @@ BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y BR2_HOSTBOOT_P8_CONFIG_FILE="garrison.config" BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="garrison-xml" -BR2_OPENPOWER_MACHINE_XML_VERSION="19a516499e1090c20c5a3303db256529ef22c1c9" +BR2_OPENPOWER_MACHINE_XML_VERSION="c5c35cb575ed4cd77400ef17cf954addc9fc855d" BR2_OPENPOWER_MACHINE_XML_FILENAME="garrison.xml" BR2_OPENPOWER_SYSTEM_XML_FILENAME="GARRISON_hb.system.xml" BR2_OPENPOWER_MRW_XML_FILENAME="GARRISON_hb.mrw.xml" diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig index fbb9799f..dab9e122 100644 --- a/openpower/configs/habanero_defconfig +++ b/openpower/configs/habanero_defconfig @@ -1,6 +1,5 @@ BR2_powerpc64le=y BR2_powerpc_power8=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/habanero-patches" BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" BR2_GCC_VERSION_6_X=y BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" @@ -44,7 +43,7 @@ BR2_OPENPOWER_POWER8=y BR2_HOSTBOOT_P8_CONFIG_FILE="habanero.config" BR2_OPENPOWER_MACHINE_XML_TARGET_TYPES_OPENPOWER_XML=y BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="habanero-xml" -BR2_OPENPOWER_MACHINE_XML_VERSION="acb73cf1f3d46e375abea1511d77427b568d87fb" +BR2_OPENPOWER_MACHINE_XML_VERSION="c3998a513e1f71de4f8e250ebb50aeaf303eb73e" BR2_OPENPOWER_MACHINE_XML_FILENAME="habanero.xml" BR2_OPENPOWER_SYSTEM_XML_FILENAME="HABANERO_hb.system.xml" BR2_OPENPOWER_MRW_XML_FILENAME="HABANERO_hb.mrw.xml" diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig index 3c1f1dbe..33149bf5 100644 --- a/openpower/configs/palmetto_defconfig +++ b/openpower/configs/palmetto_defconfig @@ -1,6 +1,5 @@ BR2_powerpc64le=y BR2_powerpc_power8=y -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/palmetto-patches" BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux" BR2_GCC_VERSION_6_X=y BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer" @@ -41,7 +40,7 @@ BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER8=y BR2_HOSTBOOT_P8_CONFIG_FILE="palmetto.config" BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="palmetto-xml" -BR2_OPENPOWER_MACHINE_XML_VERSION="e0fae90fcd61b0c8a0df1d1b7e36f1af68c0bc12" +BR2_OPENPOWER_MACHINE_XML_VERSION="19aa4d3a0f0b39f891a7628bc41946d0dc83fb2a" BR2_OPENPOWER_MACHINE_XML_FILENAME="palmetto.xml" BR2_OPENPOWER_SYSTEM_XML_FILENAME="PALMETTO_hb.system.xml" BR2_OPENPOWER_MRW_XML_FILENAME="PALMETTO_hb.mrw.xml" diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig index a3bce25d..41cafaa0 100644 --- a/openpower/configs/witherspoon_defconfig +++ b/openpower/configs/witherspoon_defconfig @@ -42,7 +42,7 @@ BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER9=y BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config" BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml" -BR2_OPENPOWER_MACHINE_XML_VERSION="e76c2fc5aeb512a0eb33438c239746de5b629885" +BR2_OPENPOWER_MACHINE_XML_VERSION="f7cffdbe00f6a3945b36e46e77572bdd07731c37" BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml" BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml" BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml" diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in index b2741888..430a19a3 100644 --- a/openpower/package/hcode/Config.in +++ b/openpower/package/hcode/Config.in @@ -31,7 +31,7 @@ config BR2_HCODE_CUSTOM_VERSION_VALUE config BR2_HCODE_VERSION string - default "hw121818a.930" if BR2_HCODE_LATEST_VERSION + default "hw123119a.930" 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 d83b826a..87db8c29 100644 --- a/openpower/package/hostboot/Config.in +++ b/openpower/package/hostboot/Config.in @@ -28,7 +28,7 @@ config BR2_HOSTBOOT_CUSTOM_VERSION_VALUE config BR2_HOSTBOOT_VERSION string - default "3a992958a6d431a58a0cc72f6c5554ef0ed2f617" if BR2_HOSTBOOT_LATEST_VERSION + default "fba889a1a092467ff83e8540b399c6a7f0d3e748" if BR2_HOSTBOOT_LATEST_VERSION default "3f1f2186bb80322594a3cc81241c390119d69552" if BR2_HOSTBOOT_STABLE_VERSION default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \ if BR2_HOSTBOOT_CUSTOM_VERSION diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk index 93f55337..b07e0549 100644 --- a/openpower/package/openpower-pnor/openpower-pnor.mk +++ b/openpower/package/openpower-pnor/openpower-pnor.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENPOWER_PNOR_VERSION ?= a4d9702936085a1a01ff305037b89dc6e915dd35 +OPENPOWER_PNOR_VERSION ?= c52413a69c5e0089aca9d535eabc70f6233213af OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION)) OPENPOWER_PNOR_LICENSE = Apache-2.0 diff --git a/openpower/patches/habanero-patches/machine-xml/habanero-xml-0002-Add-System-Fw-Fru-Id.patch b/openpower/patches/habanero-patches/machine-xml/habanero-xml-0002-Add-System-Fw-Fru-Id.patch deleted file mode 100644 index f285bfa6..00000000 --- a/openpower/patches/habanero-patches/machine-xml/habanero-xml-0002-Add-System-Fw-Fru-Id.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d1fa8a2e10849a388e09f94dd25dc9008951c1c8 Mon Sep 17 00:00:00 2001 -From: Bill Hoffa <wghoffa@us.ibm.com> -Date: Tue, 31 Mar 2015 07:43:23 -0500 -Subject: [PATCH] Add System Fw Fru Id - ---- - habanero.xml | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/habanero.xml b/habanero.xml -index 1aa85a8..16976a7 100644 ---- a/habanero.xml -+++ b/habanero.xml -@@ -4667,6 +4667,10 @@ - <default></default> - </attribute> - <attribute> -+ <id>BMC_FRU_ID</id> -+ <default>43</default> -+ </attribute> -+ <attribute> - <id>FRU_NAME</id> - <default></default> - </attribute> --- -1.8.2.2 - diff --git a/openpower/patches/palmetto-patches/machine-xml/palmetto-xml-0002-Add-Sys-Fw-Fru-Id.patch b/openpower/patches/palmetto-patches/machine-xml/palmetto-xml-0002-Add-Sys-Fw-Fru-Id.patch deleted file mode 100644 index 00ba3caa..00000000 --- a/openpower/patches/palmetto-patches/machine-xml/palmetto-xml-0002-Add-Sys-Fw-Fru-Id.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3856cbf0c35a5ed0d983717150efbe446324713d Mon Sep 17 00:00:00 2001 -From: Bill Hoffa <wghoffa@us.ibm.com> -Date: Tue, 31 Mar 2015 08:17:17 -0500 -Subject: [PATCH 2/2] Add Sys Fw Fru Id - ---- - palmetto.xml | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/palmetto.xml b/palmetto.xml -index 89669ab..8f32666 100644 ---- a/palmetto.xml -+++ b/palmetto.xml -@@ -2554,6 +2554,10 @@ - <default></default> - </attribute> - <attribute> -+ <id>BMC_FRU_ID</id> -+ <default>15</default> -+ </attribute> -+ <attribute> - <id>FRU_NAME</id> - <default></default> - </attribute> --- -1.8.2.2 - |
