Add support for IMA-CATALOG package
diff --git a/openpower/package/Config.in b/openpower/package/Config.in
index db58166..dc12184 100755
--- a/openpower/package/Config.in
+++ b/openpower/package/Config.in
@@ -20,3 +20,4 @@
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/ppe42-binutils/Config.in"
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/ppe42-gcc/Config.in"
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/zaius-xml/Config.in"
+source "$BR2_EXTERNAL_OP_BUILD_PATH/package/ima-catalog/Config.in"
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index ca9062e..f031832 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -17,7 +17,6 @@
$(INSTALL) -D $(@D)/$(BR2_HOSTBOOT_BINARY_WINK_FILENAME) $(STAGING_DIR)/hostboot_binaries/
$(INSTALL) -D $(@D)/$(BR2_HOSTBOOT_BINARY_SBEC_FILENAME) $(STAGING_DIR)/hostboot_binaries/
$(INSTALL) -D $(@D)/$(BR2_HOSTBOOT_BINARY_SBE_FILENAME) $(STAGING_DIR)/hostboot_binaries/
- $(INSTALL) -D $(@D)/$(BR2_IMA_CATALOG_FILENAME) $(STAGING_DIR)/hostboot_binaries/
endef
$(eval $(generic-package))
diff --git a/openpower/package/ima-catalog/Config.in b/openpower/package/ima-catalog/Config.in
new file mode 100644
index 0000000..98d02c5
--- /dev/null
+++ b/openpower/package/ima-catalog/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_IMA_CATALOG
+ bool "ima_catalog"
+ default y if (BR2_OPENPOWER_PLATFORM)
+ help
+ Event Catalog for In Memory Accumulation(IMA) hardware
+
+config BR2_IMA_CATALOG_DTS
+ string "Catalog DTS file to select"
+ help
+ String used to define the CATALOG dts file to select
+
+config BR2_IMA_CATALOG_FILENAME
+ string "Name of Catalog Binary file"
+ help
+ String used to define name of the CATALOG binary image file
diff --git a/openpower/package/ima-catalog/ima-catalog.mk b/openpower/package/ima-catalog/ima-catalog.mk
new file mode 100644
index 0000000..05707fc
--- /dev/null
+++ b/openpower/package/ima-catalog/ima-catalog.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# ima-catalog.mk
+#
+################################################################################
+IMA_CATALOG_VERSION ?= a85e932d8aa769818f00a2185c306ec55251e70b
+IMA_CATALOG_SITE ?= $(call github,open-power,ima-catalog,$(IMA_CATALOG_VERSION))
+IMA_CATALOG_LICENSE = Apache-2.0
+IMA_CATALOG_DEPENDENCIES = host-dtc host-xz
+
+IMA_CATALOG_INSTALL_IMAGES = YES
+IMA_CATALOG_INSTALL_TARGET = NO
+
+define IMA_CATALOG_BUILD_CMDS
+ cd $(@D) && ./build.sh $(HOST_DIR)/usr/bin/ $(BR2_IMA_CATALOG_DTS)
+endef
+
+define IMA_CATALOG_INSTALL_IMAGES_CMDS
+ $(INSTALL) $(@D)/$(BR2_IMA_CATALOG_FILENAME) $(BINARIES_DIR)
+endef
+
+$(eval $(generic-package))
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 3750609..38e425a 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -7,6 +7,7 @@
select BR2_PACKAGE_OPENPOWER_FFS
select BR2_PACKAGE_OCC
select BR2_PACKAGE_CAPP_UCODE
+ select BRZ_PACKAGE_IMA_CATALOG
select BR2_PACKAGE_ZAIUS_XML if (BR2_OPENPOWER_XML_PACKAGE = "zaius-xml")
select BR2_PACKAGE_WITHERSPOON_XML if (BR2_OPENPOWER_XML_PACKAGE = "witherspoon-xml")
select BR2_PACKAGE_BARRELEYE_XML if (BR2_OPENPOWER_XML_PACKAGE = "barreleye-xml")
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 70e96a9..be5e4dd 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -8,7 +8,7 @@
# make doesn't care for quotes in the dependencies.
XML_PACKAGE=$(subst $\",,$(BR2_OPENPOWER_XML_PACKAGE))
-OPENPOWER_PNOR_VERSION ?= bf4b7288c38e772f5d71207dc2ed44edd2900571
+OPENPOWER_PNOR_VERSION ?= 36eb2ad2b83a1b959527777cda334de879ba5478
OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
OPENPOWER_PNOR_LICENSE = Apache-2.0
@@ -64,7 +64,7 @@
-wink_binary_filename $(BR2_HOSTBOOT_BINARY_WINK_FILENAME) \
-occ_binary_filename $(OCC_STAGING_DIR)/$(BR2_OCC_BIN_FILENAME) \
-capp_binary_filename $(BINARIES_DIR)/$(BR2_CAPP_UCODE_BIN_FILENAME) \
- -ima_catalog_filename $(BR2_IMA_CATALOG_FILENAME) \
+ -ima_catalog_binary_filename $(BINARIES_DIR)/$(BR2_IMA_CATALOG_FILENAME) \
-openpower_version_filename $(OPENPOWER_PNOR_VERSION_FILE) \
-payload $(BINARIES_DIR)/$(BR2_SKIBOOT_LID_NAME) \
$(if ($(BR2_OPENPOWER_PNOR_XZ_ENABLED),y),-xz_compression)
@@ -83,7 +83,6 @@
-sbec_binary_filename $(BR2_HOSTBOOT_BINARY_SBEC_FILENAME) \
-wink_binary_filename $(BR2_HOSTBOOT_BINARY_WINK_FILENAME) \
-occ_binary_filename $(OCC_STAGING_DIR)/$(BR2_OCC_BIN_FILENAME) \
- -ima_catalog_filename $(BR2_IMA_CATALOG_ECC_FILENAME) \
-targeting_binary_filename $(BR2_OPENPOWER_TARGETING_ECC_FILENAME) \
-openpower_version_filename $(OPENPOWER_PNOR_VERSION_FILE)