diff options
| -rw-r--r-- | openpower/configs/witherspoon_defconfig | 2 | ||||
| -rw-r--r-- | openpower/package/hcode/Config.in | 2 | ||||
| -rw-r--r-- | openpower/package/hostboot-p8/hostboot-p8.mk | 2 | ||||
| -rw-r--r-- | openpower/package/hostboot/0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch | 47 | ||||
| -rw-r--r-- | openpower/package/hostboot/Config.in | 2 |
5 files changed, 4 insertions, 51 deletions
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig index d405bd9c..cf14ab58 100644 --- a/openpower/configs/witherspoon_defconfig +++ b/openpower/configs/witherspoon_defconfig @@ -46,7 +46,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="f7cffdbe00f6a3945b36e46e77572bdd07731c37" +BR2_OPENPOWER_MACHINE_XML_VERSION="e3e9aef82673b31d838782368ccb2871bb3848d8" 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 5c6cbb42..2b665b8a 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 "hw022319a.930" if BR2_HCODE_LATEST_VERSION + default "hw031219a.940" if BR2_HCODE_LATEST_VERSION default BR2_HCODE_CUSTOM_VERSION_VALUE \ if BR2_HCODE_CUSTOM_VERSION diff --git a/openpower/package/hostboot-p8/hostboot-p8.mk b/openpower/package/hostboot-p8/hostboot-p8.mk index 58be71bd..c84bd1a1 100644 --- a/openpower/package/hostboot-p8/hostboot-p8.mk +++ b/openpower/package/hostboot-p8/hostboot-p8.mk @@ -3,7 +3,7 @@ # hostboot for POWER8 # ################################################################################ -HOSTBOOT_P8_VERSION ?= a3b0cb929cbf28bc82e54ef8787d36fd5eac4b0a +HOSTBOOT_P8_VERSION ?= fd4c772765b22a912273f88ddf39cff369e50d09 HOSTBOOT_P8_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_P8_VERSION)) diff --git a/openpower/package/hostboot/0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch b/openpower/package/hostboot/0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch deleted file mode 100644 index e8def566..00000000 --- a/openpower/package/hostboot/0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6f008e0bfdfbc9256f18ea0939dfc11d23348675 Mon Sep 17 00:00:00 2001 -From: Stewart Smith <stewart@linux.vnet.ibm.com> -Date: Thu, 2 Mar 2017 16:15:25 +1100 -Subject: [PATCH] Disable warnings that crop up a lot with GCC6 - -NOTE: THIS IS A TERRIBLE IDEA - -Instead, Hostboot developers should go and fix their code. - -Change-Id: I3e1da9f61ff442e49f143f51ccfc3c7c018beb1f -Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com> ---- - src/build/mkrules/cflags.env.mk | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/build/mkrules/cflags.env.mk b/src/build/mkrules/cflags.env.mk -index 6bb900288388..428de9326400 100644 ---- a/src/build/mkrules/cflags.env.mk -+++ b/src/build/mkrules/cflags.env.mk -@@ -5,7 +5,7 @@ - # - # OpenPOWER HostBoot Project - # --# Contributors Listed Below - COPYRIGHT 2013,2016 -+# Contributors Listed Below - COPYRIGHT 2013,2017 - # [+] Google Inc. - # [+] International Business Machines Corp. - # -@@ -40,11 +40,13 @@ endif - - COMMONFLAGS += $(OPT_LEVEL) -nostdlib - CFLAGS += $(COMMONFLAGS) -mcpu=power7 -nostdinc -g -mno-vsx -mno-altivec\ -- -Wall -Werror -mtraceback=no -pipe -mabi=elfv1 \ -+ -Wall -mtraceback=no -pipe -mabi=elfv1 \ -+ -Wno-error=sizeof-array-argument \ -+ -Wno-error=unused-function \ - -ffunction-sections -fdata-sections -ffreestanding -mbig-endian - ASMFLAGS += $(COMMONFLAGS) -mcpu=power7 -mbig-endian -ffreestanding -mabi=elfv1 - CXXFLAGS += $(CFLAGS) -nostdinc++ -fno-rtti -fno-exceptions -Wall \ -- -fuse-cxa-atexit -std=gnu++14 -+ -fuse-cxa-atexit -std=gnu++14 -fpermissive - LDFLAGS += --nostdlib --sort-common -EB $(COMMONFLAGS) - - INCFLAGS = $(addprefix -I, $(INCDIR) ) --- -2.9.4 - diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in index b948b229..4dcdc7e3 100644 --- a/openpower/package/hostboot/Config.in +++ b/openpower/package/hostboot/Config.in @@ -25,7 +25,7 @@ config BR2_HOSTBOOT_CUSTOM_VERSION_VALUE config BR2_HOSTBOOT_VERSION string - default "37e67698be56632c6505990dc3375136494d2a67" if BR2_HOSTBOOT_LATEST_VERSION + default "0b3f4e146b01dab0bdb9ed9da7a3d9c9272e3b83" if BR2_HOSTBOOT_LATEST_VERSION default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \ if BR2_HOSTBOOT_CUSTOM_VERSION |
