diff --git a/src/mainboard/gizmosphere/gizmo/Kconfig b/src/mainboard/gizmosphere/gizmo/Kconfig index 1dab547f8c..731a94e3f2 100755 --- a/src/mainboard/gizmosphere/gizmo/Kconfig +++ b/src/mainboard/gizmosphere/gizmo/Kconfig @@ -38,6 +38,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select DDR3_SOLDERED_DOWN select EARLY_CBMEM_INIT select CHROMEOS + select CHROMEOS_VBNV_CMOS config GFXUMA bool diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig index bb98de793a..adba43760f 100644 --- a/src/mainboard/google/beltino/Kconfig +++ b/src/mainboard/google/beltino/Kconfig @@ -15,6 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MMCONF_SUPPORT select HAVE_SMI_HANDLER select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select CACHE_ROM select MARK_GRAPHICS_MEM_WRCOMB diff --git a/src/mainboard/google/bolt/Kconfig b/src/mainboard/google/bolt/Kconfig index d155048dc2..0307a10d32 100644 --- a/src/mainboard/google/bolt/Kconfig +++ b/src/mainboard/google/bolt/Kconfig @@ -16,6 +16,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MMCONF_SUPPORT select HAVE_SMI_HANDLER select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select CACHE_ROM select MARK_GRAPHICS_MEM_WRCOMB diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index 49e8fa8b4b..f643428ea1 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -15,6 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select GFXUMA select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select EARLY_CBMEM_INIT diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig index e464a868b5..ef73db52d3 100644 --- a/src/mainboard/google/daisy/Kconfig +++ b/src/mainboard/google/daisy/Kconfig @@ -28,6 +28,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_4096 select DRIVER_MAXIM_MAX77686 select CHROMEOS + select CHROMEOS_VBNV_EC select DRIVER_TI_TPS65090 select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig index dd34ec8b1a..6542dc37e8 100644 --- a/src/mainboard/google/falco/Kconfig +++ b/src/mainboard/google/falco/Kconfig @@ -16,6 +16,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MMCONF_SUPPORT select HAVE_SMI_HANDLER select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select CACHE_ROM select MARK_GRAPHICS_MEM_WRCOMB diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index 26096b011f..264c59fc6d 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -15,6 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select GFXUMA select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select SERIRQ_CONTINUOUS_MODE select MAINBOARD_HAS_NATIVE_VGA_INIT diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig index 264bbe8142..ddd2f8a869 100644 --- a/src/mainboard/google/nyan/Kconfig +++ b/src/mainboard/google/nyan/Kconfig @@ -22,6 +22,7 @@ if BOARD_GOOGLE_NYAN config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select CHROMEOS + select CHROMEOS_VBNV_EC select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI select EC_SOFTWARE_SYNC diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig index e4021aa3e2..394433b334 100644 --- a/src/mainboard/google/nyan_big/Kconfig +++ b/src/mainboard/google/nyan_big/Kconfig @@ -23,6 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_SUPPORT select CHROMEOS + select CHROMEOS_VBNV_EC select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI select EC_SOFTWARE_SYNC diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig index 0b57f3c326..0c3526d3ee 100644 --- a/src/mainboard/google/nyan_blaze/Kconfig +++ b/src/mainboard/google/nyan_blaze/Kconfig @@ -23,6 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_SUPPORT select CHROMEOS + select CHROMEOS_VBNV_EC select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI select EC_SOFTWARE_SYNC diff --git a/src/mainboard/google/panther/Kconfig b/src/mainboard/google/panther/Kconfig index 5b0481d354..048fee20d6 100644 --- a/src/mainboard/google/panther/Kconfig +++ b/src/mainboard/google/panther/Kconfig @@ -15,6 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MMCONF_SUPPORT select HAVE_SMI_HANDLER select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select CACHE_ROM select MARK_GRAPHICS_MEM_WRCOMB diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index 8c6f116f6b..2986cf73c3 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -15,6 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select GFXUMA select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select EARLY_CBMEM_INIT diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig index 1b3ea21b6e..97beb67d35 100644 --- a/src/mainboard/google/peach_pit/Kconfig +++ b/src/mainboard/google/peach_pit/Kconfig @@ -27,6 +27,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select EC_GOOGLE_CHROMEEC_SPI select BOARD_ROMSIZE_KB_4096 select CHROMEOS + select CHROMEOS_VBNV_EC select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select DRIVER_PARADE_PS8625 diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig index b1c2e40ec7..676e7945ca 100644 --- a/src/mainboard/google/peppy/Kconfig +++ b/src/mainboard/google/peppy/Kconfig @@ -16,6 +16,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MMCONF_SUPPORT select HAVE_SMI_HANDLER select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select CACHE_ROM select MARK_GRAPHICS_MEM_WRCOMB diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index c4ad780343..2018373204 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -12,6 +12,7 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_OPTION_TABLE select HAVE_ACPI_RESUME select CHROMEOS + select CHROMEOS_VBNV_CMOS select ALWAYS_LOAD_OPROM config VBOOT_RAMSTAGE_INDEX diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig index 7c5c3aaaa4..b0c2b1c551 100644 --- a/src/mainboard/google/rush/Kconfig +++ b/src/mainboard/google/rush/Kconfig @@ -23,6 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_SUPPORT select CHROMEOS + select CHROMEOS_VBNV_EC select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI select EC_SOFTWARE_SYNC diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig index 5eb21f4281..dfb3ceaa02 100644 --- a/src/mainboard/google/rush_ryu/Kconfig +++ b/src/mainboard/google/rush_ryu/Kconfig @@ -23,6 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_SUPPORT select CHROMEOS + select CHROMEOS_VBNV_EC select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_I2C select EC_GOOGLE_CHROMEEC_I2C_PROTO3 diff --git a/src/mainboard/google/samus/Kconfig b/src/mainboard/google/samus/Kconfig index 07d41802ea..d9034d6009 100644 --- a/src/mainboard/google/samus/Kconfig +++ b/src/mainboard/google/samus/Kconfig @@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MMCONF_SUPPORT select HAVE_SMI_HANDLER select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select CACHE_ROM select MARK_GRAPHICS_MEM_WRCOMB diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index 7a0d3b41fc..d8d840b4aa 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -16,6 +16,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MMCONF_SUPPORT select HAVE_SMI_HANDLER select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select CACHE_ROM select MARK_GRAPHICS_MEM_WRCOMB diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig index fb4eb6a6eb..de39c66277 100644 --- a/src/mainboard/google/stout/Kconfig +++ b/src/mainboard/google/stout/Kconfig @@ -14,6 +14,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select GFXUMA select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB config MAINBOARD_DIR diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig index e65001f054..22b52faaae 100755 --- a/src/mainboard/google/veyron/Kconfig +++ b/src/mainboard/google/veyron/Kconfig @@ -22,6 +22,7 @@ if BOARD_GOOGLE_VEYRON config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select CHROMEOS + select CHROMEOS_VBNV_EC select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI select SOC_ROCKCHIP_RK3288 diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig index 9807c93b93..076f63eb03 100644 --- a/src/mainboard/intel/baskingridge/Kconfig +++ b/src/mainboard/intel/baskingridge/Kconfig @@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MMCONF_SUPPORT select HAVE_SMI_HANDLER select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select LAPIC_MONOTONIC_TIMER diff --git a/src/mainboard/intel/bayleybay/Kconfig b/src/mainboard/intel/bayleybay/Kconfig index f5a6cd3e7c..98bdf0e591 100644 --- a/src/mainboard/intel/bayleybay/Kconfig +++ b/src/mainboard/intel/bayleybay/Kconfig @@ -9,6 +9,7 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_OPTION_TABLE select HAVE_ACPI_RESUME select CHROMEOS + select CHROMEOS_VBNV_CMOS select MARK_GRAPHICS_MEM_WRCOMB config MAINBOARD_DIR diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig index 6dfbf48df0..9217aa66b6 100644 --- a/src/mainboard/intel/emeraldlake2/Kconfig +++ b/src/mainboard/intel/emeraldlake2/Kconfig @@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MMCONF_SUPPORT select GFXUMA #select CHROMEOS + #select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select EARLY_CBMEM_INIT diff --git a/src/mainboard/intel/pearlvalley/Kconfig b/src/mainboard/intel/pearlvalley/Kconfig index c22e330e8b..dd3f1b0d1e 100644 --- a/src/mainboard/intel/pearlvalley/Kconfig +++ b/src/mainboard/intel/pearlvalley/Kconfig @@ -10,6 +10,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MMCONF_SUPPORT select HAVE_SMI_HANDLER select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select CACHE_ROM select MARK_GRAPHICS_MEM_WRCOMB diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig index 40ba37fb98..5d5b147fed 100644 --- a/src/mainboard/intel/wtm2/Kconfig +++ b/src/mainboard/intel/wtm2/Kconfig @@ -10,6 +10,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MMCONF_SUPPORT select HAVE_SMI_HANDLER select CHROMEOS + select CHROMEOS_VBNV_CMOS select EXTERNAL_MRC_BLOB select CACHE_ROM select MARK_GRAPHICS_MEM_WRCOMB diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index 497284ee48..b0776cd481 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -4,6 +4,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ROMSIZE_KB_8192 select CHROMEOS + select CHROMEOS_VBNV_CMOS select CPU_INTEL_SOCKET_RPGA989 select EC_SMSC_MEC1308 select EXTERNAL_MRC_BLOB diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig index dd296cf862..20d4ba0e66 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -4,6 +4,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ROMSIZE_KB_8192 select CHROMEOS + select CHROMEOS_VBNV_CMOS select CPU_INTEL_SOCKET_RPGA989 select EXTERNAL_MRC_BLOB select GFXUMA diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index b9cd436e15..aa64d31e98 100644 --- a/src/vendorcode/google/chromeos/Kconfig +++ b/src/vendorcode/google/chromeos/Kconfig @@ -44,6 +44,16 @@ config VBNV_SIZE CMOS storage size for VbNv data. This value must match cmos.layout in the mainboard directory. +config CHROMEOS_VBNV_CMOS + def_bool n + help + VBNV is stored in CMOS + +config CHROMEOS_VBNV_EC + def_bool n + help + VBNV is stored in EC + config CHROMEOS_RAMOOPS bool "Reserve space for Chrome OS ramoops" default y diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index 7f531268f6..3905a48708 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -19,12 +19,10 @@ romstage-y += chromeos.c ramstage-y += chromeos.c -romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vbnv_cmos.c -ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += vbnv_cmos.c -romstage-$(CONFIG_ARCH_ROMSTAGE_ARM) += vbnv_ec.c -ramstage-$(CONFIG_ARCH_RAMSTAGE_ARM) += vbnv_ec.c -romstage-$(CONFIG_ARCH_ROMSTAGE_ARM64) += vbnv_ec.c -ramstage-$(CONFIG_ARCH_RAMSTAGE_ARM64) += vbnv_ec.c +romstage-$(CONFIG_CHROMEOS_VBNV_CMOS) += vbnv_cmos.c +ramstage-$(CONFIG_CHROMEOS_VBNV_CMOS) += vbnv_cmos.c +romstage-$(CONFIG_CHROMEOS_VBNV_EC) += vbnv_ec.c +ramstage-$(CONFIG_CHROMEOS_VBNV_EC) += vbnv_ec.c romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vboot.c ramstage-$(CONFIG_ELOG) += elog.c ramstage-y += gnvs.c