diff options
| author | Bill Hoffa <wghoffa@us.ibm.com> | 2017-10-03 07:58:12 -0500 |
|---|---|---|
| committer | Bill Hoffa <wghoffa@us.ibm.com> | 2017-10-03 12:37:55 -0500 |
| commit | 11a23f2d343a6fe40d1d8bb73fb34b5cbcf52a91 (patch) | |
| tree | d3547148077aa662881609f74b492b221bd0c49a /openpower/package/occ | |
| parent | 448ee6f5e34e51adcc69da9989cfb4adc0544324 (diff) | |
| download | talos-op-build-11a23f2d343a6fe40d1d8bb73fb34b5cbcf52a91.tar.gz talos-op-build-11a23f2d343a6fe40d1d8bb73fb34b5cbcf52a91.zip | |
Update OCC Make Process to use GPU Binaries
- Update hostboot_binaries to point to latest commit containing
occ gpu gpe binary
- Add Config variables to conditionally compile occ using gpu
gpe binary if enabled
- Update OCC Makefile to use config vars
Diffstat (limited to 'openpower/package/occ')
| -rw-r--r-- | openpower/package/occ/Config.in | 12 | ||||
| -rw-r--r-- | openpower/package/occ/occ.mk | 11 |
2 files changed, 20 insertions, 3 deletions
diff --git a/openpower/package/occ/Config.in b/openpower/package/occ/Config.in index 29b5eb4f..1d77dfff 100644 --- a/openpower/package/occ/Config.in +++ b/openpower/package/occ/Config.in @@ -9,3 +9,15 @@ config BR2_OCC_BIN_FILENAME string "Name of OCC image file" help String used to define name of the OCC binary image file + +config BR2_OCC_GPU_BIN_BUILD + bool "Enables Compilation of GPU Binary Image" + default n + help + Boolean used to flag whether to compile OCC GPU binary + +config BR2_OCC_GPU_GPE_BIN_FILENAME + string "Name of OCC GPU GPE Binary file" + help + String used to define name of the OCC GPUE GPE binary image file + diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk index 65fd28a6..92f60b38 100644 --- a/openpower/package/occ/occ.mk +++ b/openpower/package/occ/occ.mk @@ -23,7 +23,7 @@ OCC_STAGING_DIR = $(STAGING_DIR)/occ OCC_IMAGE_BIN_PATH = $(if $(BR2_OPENPOWER_POWER9),obj/image.bin,src/image.bin) OCC_DEPENDENCIES_P8 = host-binutils host-p8-pore-binutils -OCC_DEPENDENCIES_P9 = host-binutils host-ppe42-gcc +OCC_DEPENDENCIES_P9 = host-binutils host-ppe42-gcc hostboot-binaries OCC_DEPENDENCIES ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_DEPENDENCIES_P9),$(OCC_DEPENDENCIES_P8)) define OCC_APPLY_PATCHES @@ -50,8 +50,13 @@ define OCC_BUILD_CMDS_P8 make combineImage endef define OCC_BUILD_CMDS_P9 - cd $(@D)/src && \ - make PPE_TOOL_PATH=$(PPE42_GCC_BIN) OCC_OP_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) LD_LIBRARY_PATH=$(HOST_DIR)/usr/lib all + if ["$(BR2_OCC_GPU_BIN_BUILD)" == "y" ]; then \ + cd $(@D)/src && \ + make PPE_TOOL_PATH=$(PPE42_GCC_BIN) OCC_OP_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) LD_LIBRARY_PATH=$(HOST_DIR)/usr/lib GPE1_BIN_IMAGE_PATH=$(STAGING_DIR)/hostboot_build_images/ OPOCC_GPU_SUPPORT=1 all; \ + else \ + cd $(@D)/src && \ + make PPE_TOOL_PATH=$(PPE42_GCC_BIN) OCC_OP_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) LD_LIBRARY_PATH=$(HOST_DIR)/usr/lib all; \ + fi; endef OCC_BUILD_CMDS ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_BUILD_CMDS_P9),$(OCC_BUILD_CMDS_P8)) |
