diff options
| -rw-r--r-- | src/build/configs/simics_axone.config | 30 | ||||
| -rw-r--r-- | src/usr/vpd/HBconfig | 13 |
2 files changed, 17 insertions, 26 deletions
diff --git a/src/build/configs/simics_axone.config b/src/build/configs/simics_axone.config index 0b26f13bd..ae799a4f6 100644 --- a/src/build/configs/simics_axone.config +++ b/src/build/configs/simics_axone.config @@ -1,31 +1,9 @@ -# Force DJVPD read/write to use EEPROM layer instead of old-style VPD cache -set DJVPD_READ_FROM_HW -set DJVPD_WRITE_TO_HW -unset DJVPD_READ_FROM_PNOR -unset DJVPD_WRITE_TO_PNOR - -# Force MEMVPD read/write to use EEPROM layer instead of old-style VPD cache -# ( No concept of MEMVPD in Axone so should not matter ) -set MEMVPD_READ_FROM_HW -set MEMVPD_WRITE_TO_HW -unset MEMVPD_READ_FROM_PNOR -unset MEMVPD_WRITE_TO_PNOR - -# Force MVPD read/write to use EEPROM layer instead of old-style VPD cache -set MVPD_READ_FROM_HW -set MVPD_WRITE_TO_HW -unset MVPD_READ_FROM_PNOR -unset MVPD_WRITE_TO_PNOR - -# Force PVPD read/write to use EEPROM layer instead of old-style VPD cache -set PVPD_READ_FROM_HW -set PVPD_WRITE_TO_HW -unset PVPD_READ_FROM_PNOR -unset PVPD_WRITE_TO_PNOR - # Have Planar VPD set HAVE_PVPD +# Don't have any memory buffer VPD +unset HAVE_MBVPD + #set to run cxx testcases during boot unset EARLY_TESTCASES @@ -46,4 +24,4 @@ set CONSOLE unset CONSOLE_OUTPUT_ERRORDISPLAY # OMIs were introduced in Axone and will be in P10 also -set SUPPORT_OMI
\ No newline at end of file +set SUPPORT_OMI diff --git a/src/usr/vpd/HBconfig b/src/usr/vpd/HBconfig index 0d321192c..86979d7fa 100644 --- a/src/usr/vpd/HBconfig +++ b/src/usr/vpd/HBconfig @@ -1,10 +1,12 @@ config MEMVPD_READ_FROM_PNOR default y + default n if SUPPORT_EEPROM_CACHING help Read memory VPD data from PNOR cache config MEMVPD_READ_FROM_HW default n + default y if SUPPORT_EEPROM_CACHING depends on !PALMETTO_PASS1 help Read memory VPD data from HW resources @@ -17,12 +19,14 @@ config MEMVPD_READ config MEMVPD_WRITE_TO_PNOR default y if MEMVPD_READ_FROM_PNOR + default n if SUPPORT_EEPROM_CACHING depends on MEMVPD_READ_FROM_PNOR help Write memory VPD data to PNOR cache config MEMVPD_WRITE_TO_HW default y if MEMVPD_READ_FROM_HW + default y if SUPPORT_EEPROM_CACHING depends on !PALMETTO_PASS1 && MEMVPD_READ_FROM_HW help Write memory VPD data to HW resources @@ -40,6 +44,7 @@ config PVPD_READ_FROM_PNOR config PVPD_READ_FROM_HW default n + default y if SUPPORT_EEPROM_CACHING help Read Planar VPD data from HW resources @@ -51,17 +56,20 @@ config PVPD_WRITE_TO_PNOR config PVPD_WRITE_TO_HW default y if PVPD_READ_FROM_HW + default y if SUPPORT_EEPROM_CACHING depends on PVPD_READ_FROM_HW help Write Planar VPD data to HW resources config MVPD_READ_FROM_PNOR default y + default n if SUPPORT_EEPROM_CACHING help Read Module VPD data from PNOR cache config MVPD_READ_FROM_HW default n + default y if SUPPORT_EEPROM_CACHING help Read Module VPD data from HW resources @@ -73,11 +81,13 @@ config MVPD_READ config MVPD_WRITE_TO_PNOR default y if MVPD_READ_FROM_PNOR + default n if SUPPORT_EEPROM_CACHING help Write Module VPD data to PNOR cache config MVPD_WRITE_TO_HW default y if MVPD_READ_FROM_HW + default y if SUPPORT_EEPROM_CACHING depends on MVPD_READ_FROM_HW help Write Module VPD data to HW resources @@ -90,11 +100,13 @@ config MVPD_WRITE config DJVPD_READ_FROM_PNOR default y + default n if SUPPORT_EEPROM_CACHING help Read Dimm JEDEC VPD/SPD data from PNOR cache config DJVPD_READ_FROM_HW default n + default y if SUPPORT_EEPROM_CACHING help Read Dimm JEDEC VPD/SPD data from HW resources @@ -106,6 +118,7 @@ config DJVPD_READ config DJVPD_WRITE_TO_PNOR default y if DJVPD_READ_FROM_PNOR + default n if SUPPORT_EEPROM_CACHING help Write Dimm JEDEC VPD/SPD data to PNOR cache |
