summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaptor Engineering Development Team <support@raptorengineering.com>2018-01-03 09:18:41 -0600
committerRaptor Engineering Development Team <support@raptorengineering.com>2019-04-17 05:22:04 +0000
commit92ad2f3f8dea3ad0d1ffe89270977070cf4ef8bd (patch)
treebfe46272d3896884dfbdb4ebe1cae7337eeaac1e
parenta41dd5bc070d8dec897907d86686c317fca44a47 (diff)
downloadblackbird-op-build-92ad2f3f8dea3ad0d1ffe89270977070cf4ef8bd.tar.gz
blackbird-op-build-92ad2f3f8dea3ad0d1ffe89270977070cf4ef8bd.zip
Remove capp-ucode package to avoid any chance of external CAPI µcode binaries inadvertently being used
-rw-r--r--openpower/package/capp-ucode/Config.in10
-rw-r--r--openpower/package/capp-ucode/capp-ucode.mk21
-rw-r--r--openpower/package/openpower-pnor/Config.in4
-rw-r--r--openpower/package/openpower-pnor/openpower-pnor.mk3
4 files changed, 2 insertions, 36 deletions
diff --git a/openpower/package/capp-ucode/Config.in b/openpower/package/capp-ucode/Config.in
deleted file mode 100644
index d4324194..00000000
--- a/openpower/package/capp-ucode/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_CAPP_UCODE
- bool "capp_capp"
- default y if (BR2_OPENPOWER_PLATFORM)
- help
- Microcode for CAPP hardware
-
-config BR2_CAPP_UCODE_BIN_FILENAME
- string "Name of CAPP UCODE image file"
- help
- String used to define name of the CAPP UCODE binary image file
diff --git a/openpower/package/capp-ucode/capp-ucode.mk b/openpower/package/capp-ucode/capp-ucode.mk
deleted file mode 100644
index 7ddc573b..00000000
--- a/openpower/package/capp-ucode/capp-ucode.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#
-# capp-ucode.mk
-#
-################################################################################
-CAPP_UCODE_VERSION ?= p9-dd2-v4
-CAPP_UCODE_SITE ?= $(call github,open-power,capp-ucode,$(CAPP_UCODE_VERSION))
-CAPP_UCODE_LICENSE = Apache-2.0
-CAPP_UCODE_LICENSE_FILES = NOTICES
-
-CAPP_UCODE_INSTALL_IMAGES = YES
-
-define CAPP_UCODE_BUILD_CMDS
- cd $(@D) && ./build.sh
-endef
-
-define CAPP_UCODE_INSTALL_IMAGES_CMDS
- $(INSTALL) $(@D)/cappucode.bin $(BINARIES_DIR)
-endef
-
-$(eval $(generic-package))
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 2fe0b9d7..7d481e6c 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -6,9 +6,7 @@ config BR2_PACKAGE_OPENPOWER_PNOR
select BR2_PACKAGE_HOSTBOOT_BINARIES
select BR2_PACKAGE_SKIBOOT
select BR2_PACKAGE_OPENPOWER_FFS
- select BR2_PACKAGE_OCC if !BR2_OPENPOWER_POWER8
- select BR2_PACKAGE_OCC_P8 if BR2_OPENPOWER_POWER8
- select BR2_PACKAGE_CAPP_UCODE
+ select BR2_PACKAGE_OCC
select BR2_PACKAGE_IMA_CATALOG
select BR2_PACKAGE_HOST_OPENPOWER_VPNOR
select BR2_PACKAGE_MACHINE_XML
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index cba13e16..80787cbb 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -119,8 +119,7 @@ define OPENPOWER_PNOR_INSTALL_IMAGES_CMDS
-sbe_binary_dir $(SBE_BINARY_DIR) \
-sbec_binary_filename $(BR2_HOSTBOOT_BINARY_SBEC_FILENAME) \
-wink_binary_filename $(BR2_HOSTBOOT_BINARY_WINK_FILENAME) \
- -occ_binary_filename $(OCC_STAGING_DIR)/$(OCC_BIN_FILENAME) \
- -capp_binary_filename $(BINARIES_DIR)/$(BR2_CAPP_UCODE_BIN_FILENAME) \
+ -occ_binary_filename $(OCC_STAGING_DIR)/$(BR2_OCC_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) \
OpenPOWER on IntegriCloud