diff options
author | Raptor Engineering Development Team <support@raptorengineering.com> | 2018-04-15 15:55:53 -0500 |
---|---|---|
committer | Raptor Engineering Development Team <support@raptorengineering.com> | 2018-04-15 22:53:36 -0500 |
commit | dc593f64b39039c98ca299d88c0f0b2f10787507 (patch) | |
tree | 169d75b063862a2e741a9f6dd8b58e3e87e77aca /openpower/package | |
parent | 5fb61e6d2a9ffe8f2b8fa7083e6771df21b3e567 (diff) | |
download | talos-op-build-dc593f64b39039c98ca299d88c0f0b2f10787507.tar.gz talos-op-build-dc593f64b39039c98ca299d88c0f0b2f10787507.zip |
Backport upstream GIT hash 3f0e29c5 to current talos-op-build
Redirect repository to Raptor Computing Systems GIT server
Diffstat (limited to 'openpower/package')
-rwxr-xr-x | openpower/package/Config.in | 1 | ||||
-rw-r--r-- | openpower/package/hcode/Config.in | 13 | ||||
-rw-r--r-- | openpower/package/hcode/hcode.mk | 42 | ||||
-rw-r--r-- | openpower/package/openpower-pnor/Config.in | 1 | ||||
-rw-r--r-- | openpower/package/openpower-pnor/openpower-pnor.mk | 6 | ||||
-rw-r--r-- | openpower/package/sbe/Config.in | 1 | ||||
-rw-r--r-- | openpower/package/sbe/sbe.mk | 2 |
7 files changed, 65 insertions, 1 deletions
diff --git a/openpower/package/Config.in b/openpower/package/Config.in index 29305c97..a3512ed6 100755 --- a/openpower/package/Config.in +++ b/openpower/package/Config.in @@ -7,6 +7,7 @@ source "$BR2_EXTERNAL_OP_BUILD_PATH/package/openpower-pnor/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/petitboot/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/p8-pore-binutils/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/occ/Config.in" +source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hcode/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/skiboot/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/libflash/Config.in" source "$BR2_EXTERNAL_OP_BUILD_PATH/package/loadkeys/Config.in" diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in new file mode 100644 index 00000000..096732fa --- /dev/null +++ b/openpower/package/hcode/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_HCODE + bool "hcode" + default y if (BR2_OPENPOWER_PLATFORM && BR2_OPENPOWER_POWER9) + select BR2_CPP + help + Project to build the hcode firmware codebase + +config BR2_HCODE_INCLUDE_IONV + bool "Enables packaging of the NVIDIA GPU image into the final hw image" + default n + help + Boolean used to flag whether to include NVIDIA GPU binary + diff --git a/openpower/package/hcode/hcode.mk b/openpower/package/hcode/hcode.mk new file mode 100644 index 00000000..b6ad765e --- /dev/null +++ b/openpower/package/hcode/hcode.mk @@ -0,0 +1,42 @@ +################################################################################ +# +# HCODE +# +################################################################################ + +HCODE_VERSION ?= 33d1676fd0eb0d2d5d8c91abcb9adb52d3130a48 +HCODE_SITE ?= https://scm.raptorcs.com/scm/git/talos-hcode +HCODE_SITE_METHOD = git + +HCODE_LICENSE = Apache-2.0 + +HCODE_INSTALL_IMAGES = YES +HCODE_INSTALL_TARGET = NO + +HCODE_DEPENDENCIES = host-binutils host-ppe42-gcc + +HW_IMAGE_BIN_PATH=output/images/hw_image +HW_IMAGE_BIN=p9n.hw_image.bin +HCODE_IMAGE_BIN = p9n.ref_image.bin + +CROSS_COMPILER_PATH=$(PPE42_GCC_BIN) +PPE_TOOL_PATH ?= $(CROSS_COMPILER_PATH) +PPE_PREFIX ?= $(PPE_TOOL_PATH)/bin/powerpc-eabi- + +HCODE_ENV_VARS= CONFIG_FILE=$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/hcode/$(BR2_HCODE_CONFIG_FILE) \ + LD_LIBRARY_PATH=$(HOST_DIR)/usr/lib OPENPOWER_BUILD=1\ + CROSS_COMPILER_PATH=$(PPE42_GCC_BIN) PPE_TOOL_PATH=$(CROSS_COMPILER_PATH) \ + PPE_PREFIX=$(CROSS_COMPILER_PATH)/bin/powerpc-eabi- \ + RINGFILEPATH=$(@D)/rings/ __EKB_PREFIX=$(CXXPATH) \ + CONFIG_INCLUDE_IONV=0 + +define HCODE_INSTALL_IMAGES_CMDS + mkdir -p $(STAGING_DIR)/hcode + $(INSTALL) $(@D)/$(HW_IMAGE_BIN_PATH)/$(HW_IMAGE_BIN) $(STAGING_DIR)/hcode/$(HCODE_IMAGE_BIN) +endef + +define HCODE_BUILD_CMDS + $(HCODE_ENV_VARS) bash -c 'cd $(@D) && source ./env.bash && $(MAKE) ' +endef + +$(eval $(generic-package)) diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in index 9508e43e..6876da06 100644 --- a/openpower/package/openpower-pnor/Config.in +++ b/openpower/package/openpower-pnor/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_OPENPOWER_PNOR select BR2_PACKAGE_SKIBOOT select BR2_PACKAGE_OPENPOWER_FFS select BR2_PACKAGE_OCC + select BR2_PACKAGE_HCODE 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 cd11c6e3..142e83ff 100644 --- a/openpower/package/openpower-pnor/openpower-pnor.mk +++ b/openpower/package/openpower-pnor/openpower-pnor.mk @@ -12,6 +12,10 @@ OPENPOWER_PNOR_LICENSE = Apache-2.0 OPENPOWER_PNOR_LICENSE_FILES = LICENSE OPENPOWER_PNOR_DEPENDENCIES = hostboot machine-xml skiboot host-openpower-ffs occ +ifeq ($(BR2_OPENPOWER_POWER9),y) +OPENPOWER_PNOR_DEPENDENCIES += hcode +endif + ifeq ($(BR2_PACKAGE_IMA_CATALOG),y) OPENPOWER_PNOR_DEPENDENCIES += ima-catalog endif @@ -58,6 +62,7 @@ OPENPOWER_PNOR_INSTALL_TARGET = NO HOSTBOOT_IMAGE_DIR=$(STAGING_DIR)/hostboot_build_images/ HOSTBOOT_BINARY_DIR = $(STAGING_DIR)/hostboot_binaries/ +HCODE_STAGING_DIR = $(STAGING_DIR)/hcode/ SBE_BINARY_DIR = $(STAGING_DIR)/sbe_binaries/ OPENPOWER_PNOR_SCRATCH_DIR = $(STAGING_DIR)/openpower_pnor_scratch/ OPENPOWER_VERSION_DIR = $(STAGING_DIR)/openpower_version @@ -93,6 +98,7 @@ define OPENPOWER_PNOR_INSTALL_IMAGES_CMDS -hb_image_dir $(HOSTBOOT_IMAGE_DIR) \ -scratch_dir $(OPENPOWER_PNOR_SCRATCH_DIR) \ -hb_binary_dir $(HOSTBOOT_BINARY_DIR) \ + -hcode_dir $(HCODE_STAGING_DIR) \ -targeting_binary_filename $(BR2_OPENPOWER_TARGETING_ECC_FILENAME) \ -targeting_binary_source $(BR2_OPENPOWER_TARGETING_BIN_FILENAME) \ -sbe_binary_filename $(BR2_HOSTBOOT_BINARY_SBE_FILENAME) \ diff --git a/openpower/package/sbe/Config.in b/openpower/package/sbe/Config.in index cd9e84f7..d7b25491 100644 --- a/openpower/package/sbe/Config.in +++ b/openpower/package/sbe/Config.in @@ -2,5 +2,6 @@ config BR2_PACKAGE_SBE bool "sbe" default y if (BR2_OPENPOWER_PLATFORM && BR2_OPENPOWER_POWER9) select BR2_CPP + depends on BR2_PACKAGE_HCODE help Project to build the sbe firmware codebase diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk index 67eaa8ce..c088d337 100644 --- a/openpower/package/sbe/sbe.mk +++ b/openpower/package/sbe/sbe.mk @@ -9,7 +9,7 @@ SBE_SITE ?= https://scm.raptorcs.com/scm/git/talos-sbe SBE_SITE_METHOD = git SBE_LICENSE = Apache-2.0 -SBE_DEPENDENCIES = host-ppe42-gcc +SBE_DEPENDENCIES = host-ppe42-gcc hcode SBE_INSTALL_IMAGES = YES SBE_INSTALL_TARGET = NO |