Merge pull request #431 from ismirno/master-p10
Enable PLDM File IO
diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index 4ce2325..9697126 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -25,7 +25,7 @@
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_SKIBOOT=y
BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="8bb456166aeac415700ab04b68469aa10a8a359c"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="a4a3ede812e032ec118d7735d294bdd14a51739f"
BR2_SKIBOOT_CUSTOM_GIT=y
BR2_SKIBOOT_CUSTOM_REPO_URL="git@github.ibm.com:p10/skiboot.git"
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
@@ -54,7 +54,7 @@
BR2_HOSTBOOT_P10_CONFIG_FILE="rainier.config"
BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_OPENPOWER_MACHINE_XML_VERSION="5d06f0f643cc6f34ab1f06ee53b938142b4bc266"
+BR2_OPENPOWER_MACHINE_XML_VERSION="d7b9fbc4d04fcd3133a9c944b6492169bf5137c9"
BR2_OPENPOWER_MACHINE_XML_FILENAME="Rainier-2U-MRW.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="RAINIER_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="RAINIER_hb.mrw.xml"
diff --git a/openpower/package/ekb/Config.in b/openpower/package/ekb/Config.in
index 2eb0aa3..ca00ac5 100644
--- a/openpower/package/ekb/Config.in
+++ b/openpower/package/ekb/Config.in
@@ -30,7 +30,7 @@
config BR2_EKB_VERSION
string
- default "a991724ab7a3318cbf792e32518012a652664a66" if BR2_EKB_LATEST_VERSION
+ default "820aec61c30756cd32bad7ecf40c9d92c129913d" if BR2_EKB_LATEST_VERSION
default BR2_EKB_CUSTOM_VERSION_VALUE if BR2_EKB_CUSTOM_VERSION
endif
diff --git a/openpower/package/hcode-p10/Config.in b/openpower/package/hcode-p10/Config.in
index e879fb7..ec62f2b 100644
--- a/openpower/package/hcode-p10/Config.in
+++ b/openpower/package/hcode-p10/Config.in
@@ -31,7 +31,7 @@
config BR2_HCODE_P10_VERSION
string
- default "hw072920a.opmst10" if BR2_HCODE_P10_LATEST_VERSION
+ default "hw080720a.opmst10" if BR2_HCODE_P10_LATEST_VERSION
default BR2_HCODE_P10_CUSTOM_VERSION_VALUE \
if BR2_HCODE_P10_CUSTOM_VERSION
diff --git a/openpower/package/hostboot-binaries/Config.in b/openpower/package/hostboot-binaries/Config.in
index 2377b43..485fc4c 100644
--- a/openpower/package/hostboot-binaries/Config.in
+++ b/openpower/package/hostboot-binaries/Config.in
@@ -24,7 +24,7 @@
config BR2_HOSTBOOT_BINARIES_VERSION
string
- default "hw072920a.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+ default "hw080720a.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
default BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
diff --git a/openpower/package/hostboot-p10/Config.in b/openpower/package/hostboot-p10/Config.in
index 73ef027..552f333 100644
--- a/openpower/package/hostboot-p10/Config.in
+++ b/openpower/package/hostboot-p10/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_P10_VERSION
string
- default "24475305e2ffb6ce34de1dc84baba80122f8a55f" if BR2_HOSTBOOT_P10_LATEST_VERSION
+ default "92dfe9198a71f24c27617a5088322e38fc6caac5" if BR2_HOSTBOOT_P10_LATEST_VERSION
default BR2_HOSTBOOT_P10_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_P10_CUSTOM_VERSION
diff --git a/openpower/package/ocmb-explorer-fw/Config.in b/openpower/package/ocmb-explorer-fw/Config.in
index 298855d..8bd223c 100644
--- a/openpower/package/ocmb-explorer-fw/Config.in
+++ b/openpower/package/ocmb-explorer-fw/Config.in
@@ -1,35 +1,21 @@
config BR2_PACKAGE_OCMB_EXPLORER_FW
- bool "ocmb_explorer_fw"
+ bool "ocmb-explorer-fw"
default n
help
Project to stage ocmb explorer fw and binary image releases
if BR2_PACKAGE_OCMB_EXPLORER_FW
-choice
- prompt "OCMB Explorer Binary version"
- default BR2_OCMB_EXPLORER_FW_LATEST_VERSION
-
-config BR2_OCMB_EXPLORER_FW_LATEST_VERSION
- bool "Use latest OCMB_EXPLORER_FW master"
-
-config BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION
- bool "Custom OCMB_EXPLORER_FW version"
-
-endchoice
-
-config BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION_VALUE
- string "Open CAPI Memory Buffer Firmware version"
- depends on BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION
-
config BR2_OCMB_EXPLORER_FW_VERSION
string
- default "v4.0" if BR2_OCMB_EXPLORER_FW_LATEST_VERSION
- default BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION_VALUE \
- if BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION
+ default "v6.0"
-config BR2_OCMB_EXPLORER_FW_URL
+config BR2_OCMB_EXPLORER_FW_SITE
string
- default "https://github.com/open-power/ocmb-explorer-fw"
+ default "https://github.com/open-power/ocmb-explorer-fw/files/4989167"
+
+config BR2_OCMB_EXPLORER_FW_SOURCE
+ string
+ default "FWCL395423BinaryOnly.zip"
endif
diff --git a/openpower/package/ocmb-explorer-fw/ocmb_explorer_fw.mk b/openpower/package/ocmb-explorer-fw/ocmb_explorer_fw.mk
index 9aa4eb1..178a3e5 100644
--- a/openpower/package/ocmb-explorer-fw/ocmb_explorer_fw.mk
+++ b/openpower/package/ocmb-explorer-fw/ocmb_explorer_fw.mk
@@ -6,22 +6,23 @@
OCMB_EXPLORER_FW_VERSION ?= $(call qstrip,$(BR2_OCMB_EXPLORER_FW_VERSION))
-OCMB_EXPLORER_FW_SOURCE ?= $(call qstrip,$(BR2_OCMBFW_FILENAME))
-OCMB_EXPLORER_FW_SITE ?= $(call qstrip,$(BR2_OCMB_EXPLORER_FW_URL))/releases/download/$(BR2_OCMB_EXPLORER_FW_VERSION)
+OCMB_EXPLORER_FW_SOURCE ?= $(call qstrip,$(BR2_OCMB_EXPLORER_FW_SOURCE))
+OCMB_EXPLORER_FW_SITE ?= $(call qstrip,$(BR2_OCMB_EXPLORER_FW_SITE))
OCMB_EXPLORER_FW_LICENSE = Apache-2.0
-OCMB_EXPLORER_FW_LICENSE_FILES = LICENSE
+OCMB_EXPLORER_FW_LICENSE_FILES = LICENSE.pdf
OCMB_EXPLORER_FW_INSTALL_IMAGES = YES
OCMB_EXPLORER_FW_INSTALL_TARGET = NO
# Commands to extract and install the Open Capi Memory Buffer Firmware (OCMBFW)
define OCMB_EXPLORER_FW_INSTALL_IMAGES_CMDS
- $(INSTALL) -D $(@D)/$(OCMB_EXPLORER_FW_SOURCE) $(BINARIES_DIR)/
+ $(INSTALL) -D $(@D)/$(call qstrip,$(BR2_OCMBFW_FILENAME)) $(BINARIES_DIR)/
endef
define OCMB_EXPLORER_FW_EXTRACT_CMDS
- cp $(DL_DIR)/ocmb-explorer-fw/$(OCMB_EXPLORER_FW_SOURCE) $(@D)/
+ $(UNZIP) -d $(@D) $(OCMB_EXPLORER_FW_DL_DIR)/$(OCMB_EXPLORER_FW_SOURCE)
+ mv $(@D)/*LICENSE*.pdf $(@D)/LICENSE.pdf
endef
$(eval $(generic-package))
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 2601887..9b8f60a 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -118,6 +118,10 @@
OCC_BIN_FILENAME=$(BR2_OCC_BIN_FILENAME)
endif
+ifeq ($(BR2_PACKAGE_OCMB_EXPLORER_FW),y)
+ OCMB_EXPLORER_FW_URL=$(call qstrip,$(OCMB_EXPLORER_FW_SITE)/$(OCMB_EXPLORER_FW_SOURCE))
+endif
+
DEVTREE_BLOB_FILENAME = ""
ifeq ($(BR2_OPENPOWER_POWER10),y)
DEVTREE_BLOB_FILENAME = $(DEVTREE_BIN_DIR)/$(BMC_POWER_TARGET_FILENAME)
@@ -155,7 +159,7 @@
-binary_dir $(BINARIES_DIR) \
-bootkernel_filename $(LINUX_IMAGE_NAME) \
-ocmbfw_version $(OCMB_EXPLORER_FW_VERSION) \
- -ocmbfw_url $(BR2_OCMB_EXPLORER_FW_URL) \
+ -ocmbfw_url $(OCMB_EXPLORER_FW_URL) \
-ocmbfw_original_filename $(BINARIES_DIR)/$(BR2_OCMBFW_FILENAME) \
-ocmbfw_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_OCMBFW_PROCESSED_FILENAME) \
-pnor_layout $(@D)/"$(OPENPOWER_RELEASE)"Layouts/$(BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME) \
diff --git a/openpower/package/pdata/Config.in b/openpower/package/pdata/Config.in
index a648f1e..8ec86c4 100644
--- a/openpower/package/pdata/Config.in
+++ b/openpower/package/pdata/Config.in
@@ -32,7 +32,7 @@
config BR2_PDATA_VERSION
string
- default "c2980471efadc5ea4ae3976826912da22a96e4d3" if BR2_PDATA_LATEST_VERSION
+ default "aa9a22edcdb824c6ed4991fb3abb8b2892a68aee" if BR2_PDATA_LATEST_VERSION
default BR2_PDATA_CUSTOM_VERSION_VALUE if BR2_PDATA_CUSTOM_VERSION
endif
diff --git a/openpower/package/sbe-p10/Config.in b/openpower/package/sbe-p10/Config.in
index 62734d4..35d671a 100644
--- a/openpower/package/sbe-p10/Config.in
+++ b/openpower/package/sbe-p10/Config.in
@@ -26,7 +26,7 @@
config BR2_SBE_P10_VERSION
string
- default "18465df23cbdc5fd7a06956a761aa91426beb105" if BR2_SBE_P10_LATEST_VERSION
+ default "20fb8509601cde2642d34817ed195842613cdabd" if BR2_SBE_P10_LATEST_VERSION
default BR2_SBE_P10_CUSTOM_VERSION_VALUE \
if BR2_SBE_P10_CUSTOM_VERSION