Backport upstream GIT hash 3f0e29c5 to current talos-op-build

Redirect repository to Raptor Computing Systems GIT server

6 files changed, 18 insertions, 14 deletions

diff --git a/openpower/package/Config.in b/openpower/package/Config.in
index 6dcd2347..4e85d298 100755
--- a/openpower/package/Config.in
+++ b/openpower/package/Config.in
@@ -7,6 +7,7 @@ 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/hcode/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
index e02ae0db..f498923a 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -5,14 +5,14 @@ config BR2_PACKAGE_HCODE
         help
             Project to build the hcode firmware codebase
 
-if BR2_PACKAGE_HCODE
-
 config BR2_HCODE_INCLUDE_IONV
         bool "Enables packaging of the NVIDIA GPU image into the final hw image"
-        default y
+        default n
         help
             Boolean used to flag whether to include NVIDIA GPU binary
 
+if BR2_PACKAGE_HCODE
+
 choice
 	prompt "HCODE version"
 	default BR2_HCODE_LATEST_VERSION
diff --git a/openpower/package/hcode/hcode.mk b/openpower/package/hcode/hcode.mk
index f35a363c..b6ad765e 100644
--- a/openpower/package/hcode/hcode.mk
+++ b/openpower/package/hcode/hcode.mk
@@ -4,15 +4,16 @@
 #
 ################################################################################
 
-HCODE_VERSION = $(call qstrip,$(BR2_HCODE_VERSION))
-HCODE_SITE = $(call github,open-power,hcode,$(HCODE_VERSION))
+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 hostboot-binaries
+HCODE_DEPENDENCIES = host-binutils host-ppe42-gcc
 
 HW_IMAGE_BIN_PATH=output/images/hw_image
 HW_IMAGE_BIN=p9n.hw_image.bin
@@ -26,9 +27,8 @@ HCODE_ENV_VARS= CONFIG_FILE=$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/hcode/$(BR2_HC
 	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=$(STAGING_DIR)/hostboot_binaries __EKB_PREFIX=$(CXXPATH) \
-	CONFIG_IONV_FILE_LOCATION=$(STAGING_DIR)/hostboot_binaries/$(BR2_HOSTBOOT_BINARY_IONV_FILENAME) \
-	CONFIG_INCLUDE_IONV=$(BR2_HCODE_INCLUDE_IONV)
+	RINGFILEPATH=$(@D)/rings/ __EKB_PREFIX=$(CXXPATH) \
+	CONFIG_INCLUDE_IONV=0
 
 define HCODE_INSTALL_IMAGES_CMDS
 	mkdir -p $(STAGING_DIR)/hcode
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 7d481e6c..e17c9e1e 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -7,6 +7,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 f036e8a6..37dc7a95 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -16,6 +16,10 @@ ifeq ($(BR2_OPENPOWER_POWER9),y)
 OPENPOWER_PNOR_DEPENDENCIES += hcode
 endif
 
+ifeq ($(BR2_OPENPOWER_POWER9),y)
+OPENPOWER_PNOR_DEPENDENCIES += hcode
+endif
+
 ifeq ($(BR2_PACKAGE_IMA_CATALOG),y)
 OPENPOWER_PNOR_DEPENDENCIES += ima-catalog
 endif
@@ -57,10 +61,8 @@ OPENPOWER_PNOR_INSTALL_IMAGES = YES
 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
-
+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
diff --git a/openpower/package/sbe/Config.in b/openpower/package/sbe/Config.in
index c799ed0c..1bd11f52 100644
--- a/openpower/package/sbe/Config.in
+++ b/openpower/package/sbe/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_SBE
         bool "sbe"
         default y if (BR2_OPENPOWER_PLATFORM && BR2_OPENPOWER_POWER9)
         select BR2_CPP
-        depends on BR2_PACKAGE_HCODE
+	depends on BR2_PACKAGE_HCODE
         help
             Project to build the sbe firmware codebase