diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2018-02-14 08:44:25 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 08:44:25 +1100 |
| commit | 5890fca714f34c8f184eacc266c613455074cf9a (patch) | |
| tree | d9cb79606d1780fee1dd6e596369cb09e221ada5 | |
| parent | 8a5385422082395f052732846da9ba28c4db4e47 (diff) | |
| parent | 87e9aaa1791ae2b63f9acf69ffeb560bf75ea829 (diff) | |
| download | blackbird-op-build-5890fca714f34c8f184eacc266c613455074cf9a.tar.gz blackbird-op-build-5890fca714f34c8f184eacc266c613455074cf9a.zip | |
Merge pull request #1860 from stewart-ibm/op-jenkins-op-build-update_1128_2-12-2018
op-build update 2-12-2018
5 files changed, 102 insertions, 2 deletions
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig index 902f8596..9e1b708b 100644 --- a/openpower/configs/zaius_defconfig +++ b/openpower/configs/zaius_defconfig @@ -1,5 +1,6 @@ BR2_powerpc64le=y BR2_powerpc_power8=y +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/zaius-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/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk index 2e072e61..ed21f5c3 100644 --- a/openpower/package/hostboot-binaries/hostboot_binaries.mk +++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk @@ -5,7 +5,7 @@ ################################################################################ -HOSTBOOT_BINARIES_VERSION ?= 6924d6b711ba7b1d4c47346c9a8dff88cfaaf4c8 +HOSTBOOT_BINARIES_VERSION ?= 134d61bcf3f2183c69793a3b9475d3ae80a6deae HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION)) HOSTBOOT_BINARIES_LICENSE = Apache-2.0 diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk index 98359583..5116078f 100644 --- a/openpower/package/hostboot/hostboot.mk +++ b/openpower/package/hostboot/hostboot.mk @@ -4,7 +4,7 @@ # ################################################################################ HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= d3025f5d7ddd0723946bb54fcb471d2bf1fd2da4 -HOSTBOOT_VERSION_BRANCH_MASTER ?= 9bfb2013af399c316891e005ca0fb8b417deffb3 +HOSTBOOT_VERSION_BRANCH_MASTER ?= de8120523a0cf74b2c682b1f8723b99cb0388a4e HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8)) HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION)) diff --git a/openpower/patches/zaius-patches/machine-xml/0001-Update-EREPAIR-attributes.patch b/openpower/patches/zaius-patches/machine-xml/0001-Update-EREPAIR-attributes.patch new file mode 100644 index 00000000..0f352ae4 --- /dev/null +++ b/openpower/patches/zaius-patches/machine-xml/0001-Update-EREPAIR-attributes.patch @@ -0,0 +1,59 @@ +From b2391175e61b3d1bd7e5fdba719d7fd2925fdbed Mon Sep 17 00:00:00 2001 +From: Adrian Barrera <abarrera@us.ibm.com> +Date: Tue, 6 Feb 2018 18:38:21 -0600 +Subject: [PATCH 1/2] Update EREPAIR attributes + +--- + zaius.xml | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/zaius.xml b/zaius.xml +index 3b9f54a884d4..df1f4dfcd2d0 100644 +--- a/zaius.xml ++++ b/zaius.xml +@@ -8972,11 +8972,11 @@ + </attribute> + <attribute> + <id>DMI_EREPAIR_THRESHOLD_FIELD</id> +- <default></default> ++ <default>0x1</default> + </attribute> + <attribute> + <id>DMI_EREPAIR_THRESHOLD_MNFG</id> +- <default></default> ++ <default>0x0</default> + </attribute> + <attribute> + <id>DO_ABUS_DECONFIG</id> +@@ -9932,6 +9932,14 @@ + <id>OS_IPL_MODE</id> + <default></default> + </attribute> ++ <attribute> ++ <id>O_EREPAIR_THRESHOLD_FIELD</id> ++ <default>0x1</default> ++ </attribute> ++ <attribute> ++ <id>O_EREPAIR_THRESHOLD_MNFG</id> ++ <default>0x0</default> ++ </attribute> + <attribute> + <id>PAYLOAD_BASE</id> + <default>0</default> +@@ -10543,11 +10551,11 @@ + </attribute> + <attribute> + <id>X_EREPAIR_THRESHOLD_FIELD</id> +- <default></default> ++ <default>0x1</default> + </attribute> + <attribute> + <id>X_EREPAIR_THRESHOLD_MNFG</id> +- <default></default> ++ <default>0x0</default> + </attribute> + <attribute> + <id>power-def-filenames</id> +-- +2.14.3 + diff --git a/openpower/patches/zaius-patches/machine-xml/0002-Update-Obus-PLL-bucket-to-25G.patch b/openpower/patches/zaius-patches/machine-xml/0002-Update-Obus-PLL-bucket-to-25G.patch new file mode 100644 index 00000000..58b69afa --- /dev/null +++ b/openpower/patches/zaius-patches/machine-xml/0002-Update-Obus-PLL-bucket-to-25G.patch @@ -0,0 +1,40 @@ +From d3a35441092c3616e69a2e3c81c0e2f1f5df96ed Mon Sep 17 00:00:00 2001 +From: Adrian Barrera <abarrera@us.ibm.com> +Date: Fri, 9 Feb 2018 15:23:55 -0600 +Subject: [PATCH 2/2] Update Obus PLL bucket to 25G + +--- + zaius.xml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/zaius.xml b/zaius.xml +index df1f4dfcd2d0..9929e8b9f5a4 100644 +--- a/zaius.xml ++++ b/zaius.xml +@@ -14407,19 +14407,19 @@ + </attribute> + <attribute> + <id>OB0_PLL_BUCKET</id> +- <default>2</default> ++ <default>1</default> + </attribute> + <attribute> + <id>OB1_PLL_BUCKET</id> +- <default>2</default> ++ <default>1</default> + </attribute> + <attribute> + <id>OB2_PLL_BUCKET</id> +- <default>2</default> ++ <default>1</default> + </attribute> + <attribute> + <id>OB3_PLL_BUCKET</id> +- <default>2</default> ++ <default>1</default> + </attribute> + <attribute> + <id>OBUS_RATIO_VALUE</id> +-- +2.14.3 + |
