Merge pull request #1347 from sammj/release-notes
release-notes: Clone project repos via HTTPS
diff --git a/openpower/configs/witherspoon-redbud_defconfig b/openpower/configs/witherspoon-redbud_defconfig
index 05cda4a..9a42792 100644
--- a/openpower/configs/witherspoon-redbud_defconfig
+++ b/openpower/configs/witherspoon-redbud_defconfig
@@ -43,7 +43,7 @@
BR2_OPENPOWER_POWER9=y
BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="4b12db655c758d7ec508e8a2afe4b380d5ca4c28"
+BR2_OPENPOWER_MACHINE_XML_VERSION="9a28007ab143a3a042f7b315f26501cd5cb4b73c"
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/configs/witherspoon-sequoia_defconfig b/openpower/configs/witherspoon-sequoia_defconfig
index d1c6dff..625999d 100644
--- a/openpower/configs/witherspoon-sequoia_defconfig
+++ b/openpower/configs/witherspoon-sequoia_defconfig
@@ -43,7 +43,7 @@
BR2_OPENPOWER_POWER9=y
BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="4b12db655c758d7ec508e8a2afe4b380d5ca4c28"
+BR2_OPENPOWER_MACHINE_XML_VERSION="9a28007ab143a3a042f7b315f26501cd5cb4b73c"
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/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index 335f178..e7cc9f6 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HOSTBOOT_BINARIES_VERSION ?= 883d2186e4508f327b3c90f3ca096aa4bff6b73a
+HOSTBOOT_BINARIES_VERSION ?= cf51511662aac5331975c60aa1896b200c0ceb30
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 6f40135..896ce64 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 ?= 75333b1d93a30e2337fb5580357ff32733d28db3
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 4a20bcf8521ff1bd73d5d44fb14235b9d22b834c
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/hostboot/p9Patches/hostboot-0001-Skip-Presence-Detect-in-HDAT-for-BMC-Type.patch b/openpower/package/hostboot/p9Patches/hostboot-0001-Skip-Presence-Detect-in-HDAT-for-BMC-Type.patch
deleted file mode 100644
index 7e34dfe..0000000
--- a/openpower/package/hostboot/p9Patches/hostboot-0001-Skip-Presence-Detect-in-HDAT-for-BMC-Type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d9da41e3a912a916c4063d0e3995ce71b260e288 Mon Sep 17 00:00:00 2001
-From: Bill Hoffa <wghoffa@us.ibm.com>
-Date: Tue, 8 Aug 2017 14:18:41 -0500
-Subject: [PATCH] Skip Presence Detect in HDAT for BMC Type
-
-Change-Id: Iba981eef5e6535458085b1750d25a8d11aa37200
----
- src/usr/hdat/hdathostslcadata.C | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/usr/hdat/hdathostslcadata.C b/src/usr/hdat/hdathostslcadata.C
-index d112659..4599eb7 100755
---- a/src/usr/hdat/hdathostslcadata.C
-+++ b/src/usr/hdat/hdathostslcadata.C
-@@ -94,7 +94,8 @@ bool getVPDCollectedStatus(TARGETING::Target *i_Target)
- //@TODO: RTC 149382: Method to get VPD collected status for Targets
-
- if((i_Target->getAttr<ATTR_TYPE>() != TYPE_PCI) &&
-- (i_Target->getAttr<ATTR_TYPE>() != TYPE_SYS))
-+ (i_Target->getAttr<ATTR_TYPE>() != TYPE_SYS) &&
-+ (i_Target->getAttr<ATTR_TYPE>() != TYPE_BMC))
- {
- l_vpdCollectedStatus = pvpdPresent(i_Target);
- }
---
-1.8.2.2
-
diff --git a/openpower/package/libflash/libflash.mk b/openpower/package/libflash/libflash.mk
index d47edf7..a409b46 100644
--- a/openpower/package/libflash/libflash.mk
+++ b/openpower/package/libflash/libflash.mk
@@ -5,8 +5,8 @@
################################################################################
LIBFLASH_VERSION = v5.7-76-g830fc9a0ed0a
-
LIBFLASH_SITE = $(call github,open-power,skiboot,$(LIBFLASH_VERSION))
+
LIBFLASH_INSTALL_STAGING = YES
LIBFLASH_INSTALL_TARGET = YES
@@ -29,6 +29,10 @@
-C $(@D)/external/pflash)
endef
+define HOST_LIBFLASH_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/external/pflash
+endef
+
define LIBFLASH_INSTALL_STAGING_CMDS
PREFIX=$(STAGING_DIR)/usr $(LIBFLASH_MAKE_ENV) -C $(@D)/external/shared \
install
@@ -42,4 +46,9 @@
-C $(@D)/external/pflash install)
endef
+define HOST_LIBFLASH_INSTALL_CMDS
+ $(INSTALL) $(@D)/external/pflash/pflash $(HOST_DIR)/usr/bin/pflash
+endef
+
$(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 9360628..644d281 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -8,6 +8,7 @@
select BR2_PACKAGE_OCC
select BR2_PACKAGE_CAPP_UCODE
select BR2_PACKAGE_IMA_CATALOG
+ select BR2_PACKAGE_HOST_OPENPOWER_VPNOR
select BR2_PACKAGE_MACHINE_XML
help
Utilites for building a targeting binary image
@@ -144,3 +145,7 @@
config BR2_OPENPOWER_PNOR_XZ_ENABLED
bool "Enable xz compression in PNOR payloads"
default n
+
+config BR2_BUILD_PNOR_SQUASHFS
+ bool "Create a virtual PNOR image along with the standard image"
+ default y
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index dd08018..89a553f 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENPOWER_PNOR_VERSION ?= d73af7e470ff65f7702e602a38f19c0c7a7d3c75
+OPENPOWER_PNOR_VERSION ?= 554b2efe2299575bd48f1e46e54a4e05fcf96753
OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
OPENPOWER_PNOR_LICENSE = Apache-2.0
@@ -48,6 +48,9 @@
OPENPOWER_RELEASE=p8
endif
+ifeq ($(BR2_BUILD_PNOR_SQUASHFS),y)
+ OPENPOWER_PNOR_DEPENDENCIES += host-openpower-vpnor
+endif
OPENPOWER_PNOR_INSTALL_IMAGES = YES
OPENPOWER_PNOR_INSTALL_TARGET = NO
@@ -123,6 +126,13 @@
dd if=$(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME) of=$(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_UPDATE_FILENAME) bs=32M count=1; \
$(INSTALL) $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_UPDATE_FILENAME) $(BINARIES_DIR); \
fi
+
+ # 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); \
+ $(INSTALL) $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME).squashfs.tar $(BINARIES_DIR); \
+ fi
endef
$(eval $(generic-package))
diff --git a/openpower/package/openpower-vpnor/openpower-vpnor.mk b/openpower/package/openpower-vpnor/openpower-vpnor.mk
new file mode 100644
index 0000000..e7ee67a
--- /dev/null
+++ b/openpower/package/openpower-vpnor/openpower-vpnor.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# openpower_vpnor
+#
+################################################################################
+
+HOST_OPENPOWER_VPNOR_VERSION ?= 5c90711a8aaa6b1d760388a5116e36831ce5e7ab
+HOST_OPENPOWER_VPNOR_SITE ?= $(call github,openbmc,openpower-pnor-code-mgmt,$(HOST_OPENPOWER_VPNOR_VERSION))
+HOST_OPENPOWER_VPNOR_DEPENDENCIES = host-squashfs host-libflash
+
+define HOST_OPENPOWER_VPNOR_INSTALL_CMDS
+ $(INSTALL) -D $(@D)/generate-squashfs $(HOST_DIR)/usr/bin/generate-squashfs
+endef
+
+$(eval $(host-generic-package))