Update witherspoon.config with bring-up options
diff --git a/openpower/configs/hostboot/witherspoon.config b/openpower/configs/hostboot/witherspoon.config
index 91e3ba5..ff2a828 100755
--- a/openpower/configs/hostboot/witherspoon.config
+++ b/openpower/configs/hostboot/witherspoon.config
@@ -1,48 +1,45 @@
# The Serial Flash Controller is the AST2400 BMC.
-set SFC_IS_AST2400
+set SFC_IS_AST2500
unset BMC_DOES_SFC_INIT
unset SFC_IS_IBM_DPSS
set ALLOW_MICRON_PNOR
set ALLOW_MACRONIX_PNOR
# VPD options.
-unset MVPD_READ_FROM_HW
-unset MVPD_WRITE_TO_HW
+set MVPD_READ_FROM_HW
+set MVPD_WRITE_TO_HW
set MVPD_READ_FROM_PNOR
set MVPD_WRITE_TO_PNOR
-unset DJVPD_READ_FROM_HW
+set DJVPD_READ_FROM_HW
unset DJVPD_WRITE_TO_HW
set DJVPD_READ_FROM_PNOR
set DJVPD_WRITE_TO_PNOR
-unset CVPD_READ_FROM_HW
-unset CVPD_WRITE_TO_HW
+set CVPD_READ_FROM_HW
+set CVPD_WRITE_TO_HW
set CVPD_READ_FROM_PNOR
set CVPD_WRITE_TO_PNOR
-unset PVPD_READ_FROM_HW
-unset PVPD_WRITE_TO_HW
-unset PVPD_READ_FROM_PNOR
-unset PVPD_WRITE_TO_PNOR
-unset SKIP_RESTRICT_EX_UNITS
-set CDIMM_FORMAT_FOR_CVPD
+set PVPD_READ_FROM_HW
+set PVPD_WRITE_TO_HW
+set PVPD_READ_FROM_PNOR
+set PVPD_WRITE_TO_PNOR
+unset CDIMM_FORMAT_FOR_CVPD
# gpio config
-unset GPIODD
+set GPIODD
unset PALMETTO_VDDR
# Enable SBE updates
unset SBE_UPDATE_INDEPENDENT
-set SBE_UPDATE_SEQUENTIAL
+unset SBE_UPDATE_SEQUENTIAL
+set NO_SBE_UPDATES
-set PCIE_HOTPLUG_CONTROLLER
+unset PCIE_HOTPLUG_CONTROLLER
# turn on console output
set CONSOLE
set BMC_AST2500
-# Enable Kingston dimm voltage workaround
-unset KINGSTON_1_35_VOLT
-
-unset DISABLE_HOSTBOOT_RUNTIME
+set DISABLE_HOSTBOOT_RUNTIME
# Compile in hostboot runtime PRD
set HBRT_PRD
@@ -63,3 +60,7 @@
# set for trace debug to console
unset CONSOLE_OUTPUT_TRACE
+
+unset CONFIG_SECUREBOOT
+unset CONFIG_TPMDD
+unset CONFIG_TPM_NUVOTON