Merge pull request #2866 from mabaiocchi/axone_hb-bin_fix2
Update hostboot-binaries makefile
diff --git a/openpower/configs/opal_defconfig b/openpower/configs/opal_defconfig
index 10bb04e..3332cea 100644
--- a/openpower/configs/opal_defconfig
+++ b/openpower/configs/opal_defconfig
@@ -46,7 +46,9 @@
# BR2_PACKAGE_OPENPOWER_PNOR is not set
BR2_OPENPOWER_CONFIG_NAME="opal"
BR2_PACKAGE_PETITBOOT=y
+BR2_PACKAGE_PETITBOOT_MTD=y
# BR2_PACKAGE_HOST_P8_PORE_BINUTILS is not set
+# BR2_PACKAGE_OCC_P8 is not set
# BR2_PACKAGE_CAPP_UCODE is not set
BR2_SKIBOOT_DEVICETREE=y
# BR2_PACKAGE_IMA_CATALOG is not set
diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index a5a9840..6e993d0 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -31,7 +31,7 @@
config BR2_HCODE_VERSION
string
- default "hw050919a.940" if BR2_HCODE_LATEST_VERSION
+ default "hw051119a.940" 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 db12b36..cf50180 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_VERSION
string
- default "fe000f81b6492f77e783f72b408260d5346b9757" if BR2_HOSTBOOT_LATEST_VERSION
+ default "9cd799d038d2e733680747afff3ad08d29810949" if BR2_HOSTBOOT_LATEST_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 819d677..56ad761 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENPOWER_PNOR_VERSION ?= af14555016bde21bc1bee44261faaf1383779129
+OPENPOWER_PNOR_VERSION ?= f49ec7c18ebc967f83fe8fdbffe79d7bbfa5fa70
OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
OPENPOWER_PNOR_LICENSE = Apache-2.0
diff --git a/openpower/package/skiboot/skiboot.mk b/openpower/package/skiboot/skiboot.mk
index 5f3e258..708cef7 100644
--- a/openpower/package/skiboot/skiboot.mk
+++ b/openpower/package/skiboot/skiboot.mk
@@ -43,7 +43,7 @@
$(MAKE) $(SKIBOOT_MAKE_OPTS) -C $(@D) all
$(if $(BR2_SKIBOOT_DEVICETREE), \
- $(MAKE) -C $(@D)/external/devicetree)
+ $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/external/devicetree)
endef
define SKIBOOT_INSTALL_IMAGES_CMDS