summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/makefile6
-rw-r--r--src/usr/diag/HBconfig2
-rw-r--r--src/usr/diag/attn/runtime/test/makefile4
-rw-r--r--src/usr/diag/prdf/runtime/test/makefile1
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
OpenPOWER on IntegriCloud