From a7ba1d1f6b7fc901bcf06c6fcfe21b5b36da3106 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 1 Jul 2014 11:13:09 -0500 Subject: Simplify config options for Palmetto Change-Id: I0567d30105368f0a560d0bad346216dc8752557f Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11917 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III --- src/usr/devtree/HBconfig | 2 +- src/usr/hwpf/hwp/dmi_training/HBconfig | 2 +- src/usr/hwpf/plat/HBconfig | 4 ++-- src/usr/vpd/HBconfig | 21 +++++++++++++-------- 4 files changed, 17 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/usr/devtree/HBconfig b/src/usr/devtree/HBconfig index 2b06856b5..9b103c80a 100644 --- a/src/usr/devtree/HBconfig +++ b/src/usr/devtree/HBconfig @@ -1,6 +1,6 @@ config DISABLE_HOSTBOOT_RUNTIME - default n + default y if !HAVE_MBVPD help Disable the Hostboot Runtime (HBRT) diff --git a/src/usr/hwpf/hwp/dmi_training/HBconfig b/src/usr/hwpf/hwp/dmi_training/HBconfig index a86ff477b..75f7cee6f 100644 --- a/src/usr/hwpf/hwp/dmi_training/HBconfig +++ b/src/usr/hwpf/hwp/dmi_training/HBconfig @@ -1,5 +1,5 @@ config NO_DMI_EREPAIR - default n + default y if !HAVE_MBVPD help Do not apply erepair information on the DMI bus during boot diff --git a/src/usr/hwpf/plat/HBconfig b/src/usr/hwpf/plat/HBconfig index 40fdc8ed5..2d9d4ba6c 100644 --- a/src/usr/hwpf/plat/HBconfig +++ b/src/usr/hwpf/plat/HBconfig @@ -1,4 +1,4 @@ config VPD_GETMACRO_USE_EFF_ATTR - default n + default y if !HAVE_MBVPD help - Use EFF attribute in VPD GETMACRO \ No newline at end of file + Use EFF attribute in VPD GETMACRO diff --git a/src/usr/vpd/HBconfig b/src/usr/vpd/HBconfig index 83223a37d..76aeb7192 100644 --- a/src/usr/vpd/HBconfig +++ b/src/usr/vpd/HBconfig @@ -6,18 +6,19 @@ config CVPD_READ_FROM_PNOR config CVPD_READ_FROM_HW default y if !CVPD_READ_FROM_PNOR - depends on !CVPD_READ_FROM_PNOR + depends on !PALMETTO_PASS1 && !CVPD_READ_FROM_PNOR help Read Centaur VPD data from HW resources config CVPD_WRITE_TO_PNOR - default y + default y if CVPD_READ_FROM_PNOR + depends on CVPD_READ_FROM_PNOR help Write Centaur VPD data to PNOR cache config CVPD_WRITE_TO_HW - default n - depends on !PALMETTO_PASS1 + default y if CVPD_READ_FROM_HW + depends on !PALMETTO_PASS1 && CVPD_READ_FROM_HW help Write Centaur VPD data to HW resources @@ -34,12 +35,14 @@ config MVPD_READ_FROM_HW Read Module VPD data from HW resources config MVPD_WRITE_TO_PNOR - default y + default y if MVPD_READ_FROM_PNOR + depends on MVPD_READ_FROM_PNOR help Write Module VPD data to PNOR cache config MVPD_WRITE_TO_HW - default n + default y if MVPD_READ_FROM_HW + depends on MVPD_READ_FROM_HW help Write Module VPD data to HW resources @@ -56,12 +59,14 @@ config DJVPD_READ_FROM_HW Read Dimm JEDEC VPD/SPD data from HW resources config DJVPD_WRITE_TO_PNOR - default y + default y if DJVPD_READ_FROM_PNOR + depends on DJVPD_READ_FROM_PNOR help Write Dimm JEDEC VPD/SPD data to PNOR cache config DJVPD_WRITE_TO_HW - default n + default y if DJVPD_READ_FROM_HW + depends on DJVPD_READ_FROM_HW help Write Dimm JEDEC VPD/SPD data to HW resources -- cgit v1.2.3