Merge pull request #3650 from op-jenkins/op-build-update_143_5-26-2020
op-build update 5-26-2020
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index 1647bdc..63bac55 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_VERSION
string
- default "9865ef91c0a29cbe44b2c5b6777a0ab339dfff80" if BR2_HOSTBOOT_LATEST_VERSION
+ default "508f9fe2050d00dc6989e5aec90c5ad5282fff5a" 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 39f89b0..e834097 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -73,11 +73,11 @@
GENERATED_PNOR_LAYOUT_FILES = $(shell find "$(OPENPOWER_PNOR_SCRATCH_DIR)" -maxdepth 1 -name "*WithOffsets.xml")
FILES_TO_TAR = $(HOSTBOOT_BUILD_IMAGES_DIR)/* \
- $(OUTPUT_BUILD_DIR)/skiboot-$(BR2_SKIBOOT_VERSION)/skiboot.elf \
- $(OUTPUT_BUILD_DIR)/skiboot-$(BR2_SKIBOOT_VERSION)/skiboot.map \
- $(OUTPUT_BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_VERSION)/.config \
- $(OUTPUT_BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_VERSION)/vmlinux \
- $(OUTPUT_BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_VERSION)/System.map \
+ $(OUTPUT_BUILD_DIR)/skiboot-$(SKIBOOT_VERSION)/skiboot.elf \
+ $(OUTPUT_BUILD_DIR)/skiboot-$(SKIBOOT_VERSION)/skiboot.map \
+ $(OUTPUT_BUILD_DIR)/linux-$(LINUX_VERSION)/.config \
+ $(OUTPUT_BUILD_DIR)/linux-$(LINUX_VERSION)/vmlinux \
+ $(OUTPUT_BUILD_DIR)/linux-$(LINUX_VERSION)/System.map \
$(OUTPUT_IMAGES_DIR)/zImage.epapr \
$(GENERATED_PNOR_LAYOUT_FILES)
@@ -133,7 +133,7 @@
-payload_filename $(BR2_SKIBOOT_LID_XZ_NAME) \
-binary_dir $(BINARIES_DIR) \
-bootkernel_filename $(LINUX_IMAGE_NAME) \
- -ocmbfw_version $(BR2_OCMB_EXPLORER_FW_VERSION) \
+ -ocmbfw_version $(OCMB_EXPLORER_FW_VERSION) \
-ocmbfw_url $(BR2_OCMB_EXPLORER_FW_URL) \
-ocmbfw_original_filename $(BINARIES_DIR)/$(BR2_OCMBFW_FILENAME) \
-ocmbfw_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_OCMBFW_PROCESSED_FILENAME) \
diff --git a/openpower/package/sbe/Config.in b/openpower/package/sbe/Config.in
index e5f1d46..a44eccf 100644
--- a/openpower/package/sbe/Config.in
+++ b/openpower/package/sbe/Config.in
@@ -27,7 +27,7 @@
config BR2_SBE_VERSION
string
- default "c58e8fd0b44413ef08fafb0480b473a879a09a75" if BR2_SBE_LATEST_VERSION
+ default "a5aa22f2ed057779d2cf055f466e911f5ddce496" if BR2_SBE_LATEST_VERSION
default BR2_SBE_CUSTOM_VERSION_VALUE \
if BR2_SBE_CUSTOM_VERSION
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index c67f0ab..bf39141 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
config BR2_SKIBOOT_VERSION
string
- default "v6.6" if BR2_SKIBOOT_LATEST_VERSION
+ default "v6.6-10-g75198f66" if BR2_SKIBOOT_LATEST_VERSION
default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
if BR2_SKIBOOT_CUSTOM_VERSION