diff options
| author | Zane Shelley <zshelle@us.ibm.com> | 2016-06-03 13:58:24 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-06-09 11:58:09 -0400 |
| commit | 287cc1f9d01a1ee7f2387330ac0293d5c34d26e0 (patch) | |
| tree | 2ff576e403bad229e0ac11a93c78f03b72655b33 /src | |
| parent | 14bab8ccd59097e17d16a145eb041de31a3c6dd0 (diff) | |
| download | talos-hostboot-287cc1f9d01a1ee7f2387330ac0293d5c34d26e0.tar.gz talos-hostboot-287cc1f9d01a1ee7f2387330ac0293d5c34d26e0.zip | |
PRD: enable PRD in HBRT as default config
Change-Id: I82bf9334ab43508dbe2229ba74b83d48464af8f8
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25358
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile | 6 | ||||
| -rw-r--r-- | src/usr/diag/HBconfig | 2 | ||||
| -rw-r--r-- | src/usr/diag/attn/runtime/test/makefile | 4 | ||||
| -rw-r--r-- | src/usr/diag/prdf/runtime/test/makefile | 1 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/makefile b/src/makefile index 42925be89..6a37a245a 100644 --- a/src/makefile +++ b/src/makefile @@ -265,7 +265,7 @@ RUNTIME_MODULES += scom_rt RUNTIME_MODULES += vpd_rt RUNTIME_MODULES += i2c_rt RUNTIME_MODULES += $(if $(CONFIG_HTMGT),htmgt_rt) -RUNTIME_MODULES += $(if $(CONFIG_HBRT_PRD),bus_training_rt) +#RUNTIME_MODULES += $(if $(CONFIG_HBRT_PRD),bus_training_rt) @RTC 136120 runtime lane repair support RUNTIME_MODULES += $(if $(CONFIG_HBRT_PRD),attn_rt) RUNTIME_MODULES += $(if $(CONFIG_HBRT_PRD),prdf_rt) RUNTIME_MODULES += $(if $(CONFIG_BMC_IPMI),ipmi_rt) @@ -303,14 +303,18 @@ hbicore_LDFILE = kernel.ld # for PRDR_RULE_TABLE_TARGETS include ${ROOTPATH}/src/usr/diag/prdf/common/rule/prdf_rule.mk +hbicore_DATA_MODULES += ${prd_rule_prf_targets} + hbicore_test_OBJECTS += ${hbicore_OBJECTS} hbicore_test_MODULES += ${hbicore_MODULES} hbicore_test_EXTENDED_MODULES += ${hbicore_EXTENDED_MODULES} hbicore_test_EXTENDED_MODULES += ${TESTCASE_MODULES} +hbicore_test_DATA_MODULES += ${hbicore_DATA_MODULES} hbicore_test_DATA_MODULES += testdata ifndef SKIP_BINARY_FILES hbicore_test_DATA_MODULES += secureboot_signed_container endif + hbicore_test_LDFILE = kernel.ld hbirt_OBJECTS += ${RUNTIME_OBJECTS} diff --git a/src/usr/diag/HBconfig b/src/usr/diag/HBconfig index 1d00bdc6b..3bf6f2a98 100644 --- a/src/usr/diag/HBconfig +++ b/src/usr/diag/HBconfig @@ -1,5 +1,5 @@ config HBRT_PRD - default n + default y help Enable HBRT PRD. diff --git a/src/usr/diag/attn/runtime/test/makefile b/src/usr/diag/attn/runtime/test/makefile index 0ad9e4845..4f1e7a6f4 100644 --- a/src/usr/diag/attn/runtime/test/makefile +++ b/src/usr/diag/attn/runtime/test/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2014 +# Contributors Listed Below - COPYRIGHT 2014,2016 # [+] International Business Machines Corp. # # @@ -35,6 +35,6 @@ OBJS += attnfakereg.o MODULE = testattn_rt -TESTS = *.H +#TESTS = *.H @RTC 155588 re-enable after cleaning up for P9 include ${ROOTPATH}/config.mk diff --git a/src/usr/diag/prdf/runtime/test/makefile b/src/usr/diag/prdf/runtime/test/makefile index 5521573e6..0eb277fe8 100644 --- a/src/usr/diag/prdf/runtime/test/makefile +++ b/src/usr/diag/prdf/runtime/test/makefile @@ -34,7 +34,6 @@ include ../../test/prdf_hb_common_test.mk #------------------------------------------------------------------------------ # objects #------------------------------------------------------------------------------ -TESTS += prdfTest_MbaSp.H include $(ROOTPATH)/config.mk |
