diff options
| author | Stephen Glancy <sglancy@us.ibm.com> | 2019-05-10 12:17:08 -0400 |
|---|---|---|
| committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2019-06-03 16:57:04 -0500 |
| commit | ec840df7fcaf92bfe8d89bc2b2ece72a53b22f4e (patch) | |
| tree | 9d3459c0bae0c2e0b5d48a3da7edaa738b4144b8 /src/usr | |
| parent | ddfd90ead9c505048f671d1f377c70619ee3a6d6 (diff) | |
| download | blackbird-hostboot-ec840df7fcaf92bfe8d89bc2b2ece72a53b22f4e.tar.gz blackbird-hostboot-ec840df7fcaf92bfe8d89bc2b2ece72a53b22f4e.zip | |
Adds explorer CCS specialization
Change-Id: I859140b161f6a465d68883021465318b328d4a0d
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77260
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: Mark Pizzutillo <mark.pizzutillo@ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77273
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/errldisplay/makefile | 3 | ||||
| -rwxr-xr-x | src/usr/fapi2/fapi2.mk | 2 | ||||
| -rwxr-xr-x | src/usr/fapi2/platCreateHwpErrParser.pl | 3 | ||||
| -rw-r--r-- | src/usr/isteps/mss/makefile | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/usr/errldisplay/makefile b/src/usr/errldisplay/makefile index b094bfc63..a2fe4c9e4 100644 --- a/src/usr/errldisplay/makefile +++ b/src/usr/errldisplay/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2013,2017 +# Contributors Listed Below - COPYRIGHT 2013,2019 # [+] Google Inc. # [+] International Business Machines Corp. # @@ -48,3 +48,4 @@ EXTRAINCDIR += ${GENDIR}/plugins/prdf/ EXTRAINCDIR += ${ROOTPATH}/src/usr/diag/prdf/plugins/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/centaur/common/include/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/ocmb/explorer/common/include/ diff --git a/src/usr/fapi2/fapi2.mk b/src/usr/fapi2/fapi2.mk index 5f0d84f07..44220ce07 100755 --- a/src/usr/fapi2/fapi2.mk +++ b/src/usr/fapi2/fapi2.mk @@ -59,6 +59,7 @@ EXTRAINCDIR += ${HWP_PATH_2}/hwp/memory/lib/shared/ EXTRAINCDIR += ${HWP_PATH_2}/hwp/memory/lib/utils/ EXTRAINCDIR += ${HWP_PATH_2}/vpd_accessors/ EXTRAINCDIR += ${ROOTPATH}/src/usr/scom/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/ocmb/explorer/common/include/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/common/utils/ include ${ROOTPATH}/src/build/mkrules/verbose.rules.mk @@ -134,7 +135,6 @@ FAPI2_ERROR_XML += $(wildcard \ FAPI2_ERROR_XML += $(wildcard \ $(ROOTPATH)/src/import/chips/ocmb/common/procedures/xml/error_info/*.xml) - # Attribute XML files. FAPI2_ATTR_XML += $(wildcard \ $(ROOTPATH)/src/import/hwpf/fapi2/xml/attribute_info/*.xml) diff --git a/src/usr/fapi2/platCreateHwpErrParser.pl b/src/usr/fapi2/platCreateHwpErrParser.pl index 618459e30..e54f26a13 100755 --- a/src/usr/fapi2/platCreateHwpErrParser.pl +++ b/src/usr/fapi2/platCreateHwpErrParser.pl @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2018 +# Contributors Listed Below - COPYRIGHT 2015,2019 # [+] Google Inc. # [+] International Business Machines Corp. # @@ -225,6 +225,7 @@ print EDISFILE "#include <p9_perv_scom_addresses.H>\n"; print EDISFILE "#include <p9_quad_scom_addresses.H>\n"; print EDISFILE "#include <p9_xbus_scom_addresses.H>\n"; print EDISFILE "#include <cen_gen_scom_addresses.H>\n"; +print EDISFILE "#include <explorer_scom_addresses.H>\n"; print EDISFILE "#include <centaur_misc_constants.H>\n"; print EDISFILE "namespace fapi2\n"; print EDISFILE "{\n\n"; diff --git a/src/usr/isteps/mss/makefile b/src/usr/isteps/mss/makefile index 854901790..aa5cf933a 100644 --- a/src/usr/isteps/mss/makefile +++ b/src/usr/isteps/mss/makefile @@ -85,6 +85,7 @@ MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/fir/ MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/mcbist/ MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/phy/ MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/ecc/ +MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/ccs/ MSS_LIB += ${GEMINI_PROCEDURES_PATH}/hwp/memory/ MSS_LIB += ${GEMINI_PROCEDURES_PATH}/hwp/memory/lib/ @@ -186,7 +187,6 @@ endef $(call BUILD_GENERATED) - # Generate pmic_accessors header file GENERATED = gen_pmic_accessors COMMAND = gen_accessors.pl @@ -208,7 +208,6 @@ endef $(call BUILD_GENERATED) - # Add common and generated parts to object list. MSS_PATH := $(PROCEDURES_PATH)/hwp/memory/lib |
