Merge pull request #1469 from stewart-ibm/skiboot-v5.8-121-g0e075173caeb
skiboot v5.8-121-g0e075173caeb
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 5b52f43..0bc0af0 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 695bd891343faf1f0ef85fe53148590e58239efd
-HOSTBOOT_VERSION_BRANCH_MASTER ?= d79906ed72501bf59cc4f1684aa58b9ee0c987fb
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 4b2859591b45f9b83c6856c4d242e20fc236ebf0
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/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 2d92d5d..2aa3bfd 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENPOWER_PNOR_VERSION ?= 824989ffd21a300363de4871aa0e6f286d7f6ce0
+OPENPOWER_PNOR_VERSION ?= 21d66daff697f8c13fb067340ca621e9208ab1ea
OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
OPENPOWER_PNOR_LICENSE = Apache-2.0
@@ -61,6 +61,18 @@
OPENPOWER_PNOR_SCRATCH_DIR = $(STAGING_DIR)/openpower_pnor_scratch/
OPENPOWER_VERSION_DIR = $(STAGING_DIR)/openpower_version
OPENPOWER_MRW_SCRATCH_DIR = $(STAGING_DIR)/openpower_mrw_scratch
+OUTPUT_BUILD_DIR = $(STAGING_DIR)/../../../build/
+OUTPUT_IMAGES_DIR = $(STAGING_DIR)/../../../images/
+HOSTBOOT_BUILD_IMAGES_DIR = $(STAGING_DIR)/../../../staging/hostboot_build_images/
+
+FILES_TO_TAR = $(HOSTBOOT_BUILD_IMAGES_DIR)/* \
+ $(OUTPUT_BUILD_DIR)/skiboot-*/skiboot.elf \
+ $(OUTPUT_BUILD_DIR)/skiboot-*/skiboot.map \
+ $(OUTPUT_BUILD_DIR)/linux-*/.config \
+ $(OUTPUT_BUILD_DIR)/linux-*/vmlinux \
+ $(OUTPUT_BUILD_DIR)/linux-*/System.map \
+ $(OUTPUT_IMAGES_DIR)/zImage.epapr
+
# Subpackages we want to include in the version info (do not include openpower-pnor)
OPENPOWER_VERSIONED_SUBPACKAGES = skiboot hostboot linux petitboot machine-xml occ hostboot-binaries capp-ucode
@@ -130,9 +142,12 @@
# If this is a VPNOR system, run the generate-squashfs command and
# create a tarball
if [ "$(BR2_BUILD_PNOR_SQUASHFS)" == "y" ]; then \
- PATH=$(PATH):$(HOST_DIR)/usr/bin $(HOST_DIR)/usr/bin/generate-squashfs -f $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME).squashfs.tar $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME); \
+ PATH=$(HOST_DIR)/usr/bin:$(PATH) $(HOST_DIR)/usr/bin/generate-squashfs -f $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME).squashfs.tar $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME); \
$(INSTALL) $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME).squashfs.tar $(BINARIES_DIR); \
fi
+
+ tar --transform 's/.*\///g' -zcvf $(OUTPUT_IMAGES_DIR)/host_fw_debug.tar $(FILES_TO_TAR)
+
endef
$(eval $(generic-package))
diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk
index 0687cea..891d992 100644
--- a/openpower/package/sbe/sbe.mk
+++ b/openpower/package/sbe/sbe.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SBE_VERSION ?= 8d90ab20978f12fe867f68b0c3615afbb0f046d1
+SBE_VERSION ?= ff713dfd14ecf97b050a737cc5da2d6f01db493f
SBE_SITE ?= $(call github,open-power,sbe,$(SBE_VERSION))
SBE_LICENSE = Apache-2.0
diff --git a/openpower/scripts/release-notes b/openpower/scripts/release-notes
index a0f322f..33974d5 100755
--- a/openpower/scripts/release-notes
+++ b/openpower/scripts/release-notes
@@ -74,6 +74,23 @@
my $witherspoon_insanity;
+# If both witherspoon and witherspoon-sequoia exist we've switched back
+# to a single witherspoon platform and the -sequoia platform is just to
+# keep Jenkins happy - ignore it.
+if ("witherspoon" ~~ @begin_platforms
+ && "witherspoon-sequoia" ~~ @begin_platforms) {
+ my $index = 0;
+ $index++ until @begin_platforms[$index] eq "witherspoon-sequoia";
+ splice(@begin_platforms, $index, 1);
+}
+
+if ("witherspoon" ~~ @end_platforms
+ && "witherspoon-sequoia" ~~ @end_platforms) {
+ my $index = 0;
+ $index++ until @end_platforms[$index] eq "witherspoon-sequoia";
+ splice(@end_platforms, $index, 1);
+}
+
if (($platform && $platform eq 'witherspoon')
&& -f "$end_worktree/openpower/configs/witherspoon-sequoia_defconfig") {
@begin_platforms = ('witherspoon');