Update p10 Rainier config and OCC version handling
- Update p10 Rainier config to remove unneeded options, clarify
existing settings
- Update occ-p10 package to modernize version handling
Signed-off-by: Nick Bofferding <bofferdn@us.ibm.com>
diff --git a/openpower/configs/hostboot/rainier.config b/openpower/configs/hostboot/rainier.config
index 8459ec6..d89b3e5 100755
--- a/openpower/configs/hostboot/rainier.config
+++ b/openpower/configs/hostboot/rainier.config
@@ -3,8 +3,8 @@
unset SFC_IS_AST2400
set PNORDD_IS_IPMI
unset PNORDD_IS_SFC
-set ALLOW_MICRON_PNOR
-set ALLOW_MACRONIX_PNOR
+unset ALLOW_MICRON_PNOR
+unset ALLOW_MACRONIX_PNOR
# VPD options - Enable EECACHE
set MVPD_READ_FROM_HW
@@ -22,18 +22,18 @@
unset MEMVPD_READ_FROM_PNOR
unset MEMVPD_WRITE_TO_PNOR
+# PLDM will be read via PLDM which is not supported yet
#set PVPD_READ_FROM_HW
#set PVPD_WRITE_TO_HW
#unset PVPD_READ_FROM_PNOR
#unset PVPD_WRITE_TO_PNOR
-unset CDIMM_FORMAT_FOR_CVPD
-
# gpio config
set GPIODD
unset PALMETTO_VDDR
-# Enable Consecutive SBE Updates
+# Disable SBE updates until it is supported
+# TODO: Re-enable SBE Updates when supported
unset SBE_UPDATE_CONSECUTIVE
unset SBE_UPDATE_INDEPENDENT
unset SBE_UPDATE_SEQUENTIAL
@@ -60,16 +60,20 @@
unset PNOR_TWO_SIDE_SUPPORT
set BMC_BT_LPC_IPMI
+
+# AXONE configs must be set until those flags are reworked in Hostboot
set AXONE
set AXONE_BRINGUP
set SUPPORT_EEPROM_CACHING
-# Enable Checkstop Analysis for both
-# Runtime and IPLtime scenarios
+# Disable checkstop analysis for IPL and runtime scenarios
unset IPLTIME_CHECKSTOP_ANALYSIS
+unset ENABLE_CHECKSTOP_ANALYSIS
# set for trace debug to console
set CONSOLE_OUTPUT_TRACE
+
+# TODO Re-enable when able to compile
#set CONSOLE_OUTPUT_FFDCDISPLAY
# Terminate Hostboot when errors occur in manufacturing mode