diff options
| author | Elizabeth Liner <eliner@us.ibm.com> | 2017-05-15 18:03:21 -0500 |
|---|---|---|
| committer | Elizabeth Liner <eliner@us.ibm.com> | 2017-06-01 09:23:32 -0500 |
| commit | d1a29c1612624e6253bde3ea1bc6bdb2aa54aa5d (patch) | |
| tree | 9a640876408f083a028e8938bf41ec1e738633ef /openpower/package/openpower-pnor | |
| parent | d50c8f12f8b717b1e110d3ea0864b39752d57207 (diff) | |
| download | talos-op-build-d1a29c1612624e6253bde3ea1bc6bdb2aa54aa5d.tar.gz talos-op-build-d1a29c1612624e6253bde3ea1bc6bdb2aa54aa5d.zip | |
Adding wofdata support for op-build packages
Diffstat (limited to 'openpower/package/openpower-pnor')
| -rw-r--r-- | openpower/package/openpower-pnor/Config.in | 10 | ||||
| -rw-r--r-- | openpower/package/openpower-pnor/openpower-pnor.mk | 5 |
2 files changed, 14 insertions, 1 deletions
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in index a94f72c9..438ea959 100644 --- a/openpower/package/openpower-pnor/Config.in +++ b/openpower/package/openpower-pnor/Config.in @@ -65,6 +65,16 @@ config BR2_HOSTBOOT_BINARY_WINK_FILENAME help String used to define name of winkle hostboot binary file +config BR2_WOFDATA_FILENAME + string "Name of wofdata original file" + help + String used to define name of wofdata original file + +config BR2_WOFDATA_BINARY_FILENAME + string "Name of wofdata binary file" + help + String used to define name of wofdata binary ecc'd file + config BR2_IMA_CATALOG_FILENAME string "Name of IMA catalog binary" help diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk index 95c831f4..2f64253d 100644 --- a/openpower/package/openpower-pnor/openpower-pnor.mk +++ b/openpower/package/openpower-pnor/openpower-pnor.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENPOWER_PNOR_VERSION ?= 86474de814334341cc6146174b6aee9afe0e5547 +OPENPOWER_PNOR_VERSION ?= 3ab2d5d3f0c030bd68a4b431ac128004d54f7511 OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION)) OPENPOWER_PNOR_LICENSE = Apache-2.0 @@ -44,6 +44,7 @@ HOSTBOOT_BINARY_DIR = $(STAGING_DIR)/hostboot_binaries/ SBE_BINARY_DIR = $(STAGING_DIR)/sbe_binaries/ 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 # 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 @@ -73,6 +74,7 @@ define OPENPOWER_PNOR_INSTALL_IMAGES_CMDS -capp_binary_filename $(BINARIES_DIR)/$(BR2_CAPP_UCODE_BIN_FILENAME) \ -ima_catalog_binary_filename $(BINARIES_DIR)/$(BR2_IMA_CATALOG_FILENAME) \ -openpower_version_filename $(OPENPOWER_PNOR_VERSION_FILE) \ + -wof_binary_filename $(OPENPOWER_MRW_SCRATCH_DIR)/$(BR2_WOFDATA_FILENAME) \ -payload $(BINARIES_DIR)/$(BR2_SKIBOOT_LID_NAME) \ $(if ($(BR2_OPENPOWER_PNOR_XZ_ENABLED),y),-xz_compression) @@ -91,6 +93,7 @@ define OPENPOWER_PNOR_INSTALL_IMAGES_CMDS -wink_binary_filename $(BR2_HOSTBOOT_BINARY_WINK_FILENAME) \ -occ_binary_filename $(OCC_STAGING_DIR)/$(BR2_OCC_BIN_FILENAME) \ -targeting_binary_filename $(BR2_OPENPOWER_TARGETING_ECC_FILENAME) \ + -wofdata_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_WOFDATA_BINARY_FILENAME) \ -openpower_version_filename $(OPENPOWER_PNOR_VERSION_FILE) $(INSTALL) $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME) $(BINARIES_DIR) |
