coreboot-gerrit August 2015

coreboot-gerrit@coreboot.org

1 participants
814 discussions

New patch to review for coreboot: cbfstool/Makefile.inc: Specify output filename in fmd_parser rule
by Alexandru Gagniuc 20 Aug '15

20 Aug '15

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11292 -gerrit commit 518920d6fa93ae0006ed039b7152550eb63af631 Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Thu Aug 20 14:44:48 2015 -0400 cbfstool/Makefile.inc: Specify output filename in fmd_parser rule The fmd_parser.c rule called $(YACC), assuming that the output filename is "y.tab.c". This isn't always the case as illustrated by $ YACC=bison make When the output file is specified, cbfstool compiles with the above, and as a bonus, we kill two useless "cp" invocations. Change-Id: I4e892773f380d99705a2b752bd88e964cf8553eb Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- util/cbfstool/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index 65d5710..7e8142b 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -61,9 +61,7 @@ fmd_scanner.c: fmd_scanner.l fmd_parser.h: fmd_parser.c fmd_parser.c: fmd_parser.y - $(YACC) $(YFLAGS) -d $< - mv -f y.tab.c $*.c - mv -f y.tab.h $*.h + $(YACC) $(YFLAGS) -o "$*.c" -d $< .PHONY: clean clean:

1 0

Patch merged into coreboot/master: mainboard: Get CHROMEOS/MAINBOARD_HAS_CHROMEOS right (again)
by gerrit＠coreboot.org 20 Aug '15

20 Aug '15

the following patch was just integrated into master: commit 43213be11657669a3bd93eb81320558ef1183faf Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Thu Aug 20 12:51:48 2015 -0400 mainboard: Get CHROMEOS/MAINBOARD_HAS_CHROMEOS right (again) CHROMEOS is a user-visible bool. It must not be 'select'ed in Kconfig. That's why we have MAINBOARD_HAS_CHROMEOS. This is the fifth time I find this being used wrong. Why is this confusing/so hard to get right? Change-Id: Icb4629355c63508f5a044b46842524b3d203c2da Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Reviewed-on: http://review.coreboot.org/11290 Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See http://review.coreboot.org/11290 for details. -gerrit

1 0

New patch to review for coreboot: kconfig: Allow KCONFIG_STRICT outside of confdata.c
by Stefan Reinauer 20 Aug '15

20 Aug '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11291 -gerrit commit 0b13cbe24dd1c9a39d782829a2b4240b25ca22b9 Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Aug 20 11:19:34 2015 -0700 kconfig: Allow KCONFIG_STRICT outside of confdata.c To catch dependency errors in symbol.c (such as the ones fixed by I51b4ee326f082c6a656a813ee5772e9c34f5c343) we need to check for global kconfig warnings before saving config files. This patch will produce errors for wrong dependencies and add catching of errors to conf, nconf and mconf. Sorry, gconf users, you will have to wait. Change-Id: Idf7ee406ce3869941af319219aea16fab826df84 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- util/kconfig/conf.c | 10 ++++++++++ util/kconfig/confdata.c | 6 +----- util/kconfig/lkc.h | 3 +++ util/kconfig/mconf.c | 8 ++++++++ util/kconfig/nconf.c | 11 +++++++++++ util/kconfig/symbol.c | 1 + 6 files changed, 34 insertions(+), 5 deletions(-) diff --git a/util/kconfig/conf.c b/util/kconfig/conf.c index fef75fc..c421773 100644 --- a/util/kconfig/conf.c +++ b/util/kconfig/conf.c @@ -17,6 +17,8 @@ #include "lkc.h" +int kconfig_warnings = 0; + static void conf(struct menu *menu); static void check_conf(struct menu *menu); static void xfgets(char *str, int size, FILE *in); @@ -493,6 +495,7 @@ int main(int ac, char **av) const char *progname = av[0]; int opt; const char *name, *defconfig_file = NULL /* gcc uninit */; + char *env; struct stat tmpstat; setlocale(LC_ALL, ""); @@ -681,6 +684,13 @@ int main(int ac, char **av) break; } + env = getenv("KCONFIG_STRICT"); + if (env && *env && kconfig_warnings) { + fprintf(stderr, _("\n*** ERROR: %d warnings encountered, and " + "warnings are errors.\n\n"), kconfig_warnings); + exit(1); + } + if (sync_kconfig) { /* silentoldconfig is used during the build so we shall update autoconf. * All other commands are only used to generate a config. diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c index 5804b29..a39a716 100644 --- a/util/kconfig/confdata.c +++ b/util/kconfig/confdata.c @@ -404,11 +404,7 @@ setsym: if (modules_sym) sym_calc_value(modules_sym); - name = getenv("KCONFIG_STRICT"); - if (name && *name && conf_warnings) { - fprintf(stderr, "\nERROR: %d warnings encountered, and warnings are errors.\n\n", conf_warnings); - return 1; - } + kconfig_warnings += conf_warnings; return 0; } diff --git a/util/kconfig/lkc.h b/util/kconfig/lkc.h index 590ed80..a7600bd 100644 --- a/util/kconfig/lkc.h +++ b/util/kconfig/lkc.h @@ -82,6 +82,9 @@ void zconf_nextfiles(const char *name); int zconf_lineno(void); const char *zconf_curname(void); +/* conf.c */ +extern int kconfig_warnings; + /* confdata.c */ const char *conf_get_configname(void); const char *conf_get_autoconfig_name(void); diff --git a/util/kconfig/mconf.c b/util/kconfig/mconf.c index 1d651c1..b4a0844 100644 --- a/util/kconfig/mconf.c +++ b/util/kconfig/mconf.c @@ -952,6 +952,7 @@ static void conf_save(void) static int handle_exit(void) { int res; + char *env; save_and_exit = 1; reset_subtitle(); @@ -966,6 +967,13 @@ static int handle_exit(void) end_dialog(saved_x, saved_y); + env = getenv("KCONFIG_STRICT"); + if (env && *env && kconfig_warnings) { + fprintf(stderr, _("\n*** ERROR: %d warnings encountered, and " + "warnings are errors.\n\n"), kconfig_warnings); + res = 2; + } + switch (res) { case 0: if (conf_write(filename)) { diff --git a/util/kconfig/nconf.c b/util/kconfig/nconf.c index 984489e..bc845fc 100644 --- a/util/kconfig/nconf.c +++ b/util/kconfig/nconf.c @@ -646,6 +646,8 @@ static const char *set_config_filename(const char *config_filename) static int do_exit(void) { int res; + char *env; + if (!conf_get_changed()) { global_exit = 1; return 0; @@ -661,6 +663,15 @@ static int do_exit(void) return -1; } + env = getenv("KCONFIG_STRICT"); + if (env && *env && kconfig_warnings) { + btn_dialog(main_window, + _("\nWarnings encountered, and warnings are errors.\n\n"), + 1, + "<OK>"); + res = 2; + } + /* if we got here, the user really wants to exit */ switch (res) { case 0: diff --git a/util/kconfig/symbol.c b/util/kconfig/symbol.c index 7caabdb..65ba465 100644 --- a/util/kconfig/symbol.c +++ b/util/kconfig/symbol.c @@ -375,6 +375,7 @@ void sym_calc_value(struct symbol *sym) sym->name); expr_fprint(sym->dir_dep.expr, stderr); fprintf(stderr, ")\n"); + kconfig_warnings++; expr_free(e); } newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);

1 0

New patch to review for coreboot: mainboard: Get CHROMEOS/MAINBOARD_HAS_CHROMEOS right (again)
by Alexandru Gagniuc 20 Aug '15

20 Aug '15

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11290 -gerrit commit 41dbfa55f32bf1210b39ae19cf6c835e77e4cef4 Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Thu Aug 20 12:51:48 2015 -0400 mainboard: Get CHROMEOS/MAINBOARD_HAS_CHROMEOS right (again) CHROMEOS is a user-visible bool. It must not be 'select'ed in Kconfig. That's why we have MAINBOARD_HAS_CHROMEOS. This is the fifth time I find this being used wrong. Why is this confusing/so hard to get right? Change-Id: Icb4629355c63508f5a044b46842524b3d203c2da Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- src/mainboard/google/cyan/Kconfig | 1 - src/mainboard/google/glados/Kconfig | 1 - src/mainboard/intel/kunimitsu/Kconfig | 1 - src/mainboard/intel/sklrvp/Kconfig | 1 - src/mainboard/intel/strago/Kconfig | 1 - 5 files changed, 5 deletions(-) diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index 91f7587..094c629 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -5,7 +5,6 @@ config BOARD_SPECIFIC_OPTIONS select VGA_ROM_RUN if !PAYLOAD_SEABIOS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 - select CHROMEOS select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_MEC diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index c7df2a3..d91aca5 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -4,7 +4,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ROMSIZE_KB_16384 select CACHE_ROM - select CHROMEOS select CHROMEOS_RAMOOPS_DYNAMIC select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig index 78d4081..cb7ce29 100644 --- a/src/mainboard/intel/kunimitsu/Kconfig +++ b/src/mainboard/intel/kunimitsu/Kconfig @@ -4,7 +4,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ROMSIZE_KB_16384 select CACHE_ROM - select CHROMEOS select CHROMEOS_RAMOOPS_DYNAMIC select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC diff --git a/src/mainboard/intel/sklrvp/Kconfig b/src/mainboard/intel/sklrvp/Kconfig index 601efb0..1741469 100644 --- a/src/mainboard/intel/sklrvp/Kconfig +++ b/src/mainboard/intel/sklrvp/Kconfig @@ -4,7 +4,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ROMSIZE_KB_16384 select CACHE_ROM - select CHROMEOS select CHROMEOS_RAMOOPS_DYNAMIC select CHROMEOS_VBNV_CMOS select HAVE_ACPI_RESUME diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index c19761a..599a84a 100755 --- a/src/mainboard/intel/strago/Kconfig +++ b/src/mainboard/intel/strago/Kconfig @@ -5,7 +5,6 @@ config BOARD_SPECIFIC_OPTIONS select VGA_ROM_RUN if !PAYLOAD_SEABIOS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 - select CHROMEOS select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_MEC

1 0

New patch to review for coreboot: crossgcc: Fix x86_64-elf target's -m16 support
by Patrick Georgi 20 Aug '15

20 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11289 -gerrit commit e59ced49f3d19a6aa7a0d4c2c156571e56d3eef3 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Thu Aug 20 17:53:52 2015 +0200 crossgcc: Fix x86_64-elf target's -m16 support It still needs to pass --32 (yes, 32) to the assembler. x86_64-linux does this (through some other config file), x86_64-elf did not. This fixes building SeaBIOS with our x86_64-elf multilib compiler. Change-Id: Ibe2a70e46e64e71c947482be5ec0eaf7f7bf300d Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/crossgcc/patches/gcc-5.2.0_elf_biarch.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/util/crossgcc/patches/gcc-5.2.0_elf_biarch.patch b/util/crossgcc/patches/gcc-5.2.0_elf_biarch.patch index 37240f9..1960816 100644 --- a/util/crossgcc/patches/gcc-5.2.0_elf_biarch.patch +++ b/util/crossgcc/patches/gcc-5.2.0_elf_biarch.patch @@ -74,3 +74,14 @@ diff -urN gcc-4.9.2/gcc/config.gcc gcc-4.9.2/gcc/config.gcc ;; i[34567]86-*-rdos*) tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/rdos.h" +--- gcc-5.2.0/gcc/config/i386/x86-64.h.orig 2015-08-20 17:17:34.555919593 +0200 ++++ gcc-5.2.0/gcc/config/i386/x86-64.h 2015-08-20 17:17:42.615908670 +0200 +@@ -49,7 +49,7 @@ + #define WCHAR_TYPE_SIZE 32 + + #undef ASM_SPEC +-#define ASM_SPEC "%{m32:--32} %{m64:--64} %{mx32:--x32}" ++#define ASM_SPEC "%{m16|m32:--32} %{m64:--64} %{mx32:--x32}" + + #undef ASM_OUTPUT_ALIGNED_BSS + #define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \

1 0

Patch merged into coreboot/master: crossgcc: Update gcc to 5.2.0
by gerrit＠coreboot.org 20 Aug '15

20 Aug '15

the following patch was just integrated into master: commit af473ede1f8ff5fc63609b914570aad21827b2e7 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Fri Jul 17 23:35:54 2015 +0200 crossgcc: Update gcc to 5.2.0 All compilers built, incl. x86_64-elf as multilib and riscv-elf. Change-Id: Iafa61b1d2ffc9c737ab67a417c62417593b69372 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/10975 Tested-by: Raptor Engineering Automated Test Stand <noreply(a)raptorengineeringinc.com> Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See http://review.coreboot.org/10975 for details. -gerrit

1 0

Patch set updated for coreboot: ChromeOS: Fix Kconfig dependencies
by Martin Roth 19 Aug '15

19 Aug '15

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11272 -gerrit commit 52c1bc2853b2ed598a5900d9134b86a1c5043419 Author: Martin Roth <martinroth(a)google.com> Date: Tue Aug 18 14:22:58 2015 -0600 ChromeOS: Fix Kconfig dependencies Add CHROMEOS dependencies to selects for the following Kconfig symbols: CHROMEOS_RAMOOPS_DYNAMIC CHROMEOS_RAMOOPS_NON_ACPI CHROMEOS_VBNV_CMOS CHROMEOS_VBNV_EC CHROMEOS_VBNV_FLASH EC_SOFTWARE_SYNC LID_SWITCH RETURN_FROM_VERSTAGE SEPARATE_VERSTAGE VBOOT_DISABLE_DEV_ON_RECOVERY VBOOT_EC_SLOW_UPDATE VBOOT_OPROM_MATTERS VBOOT_STARTS_IN_BOOTBLOCK WIPEOUT_SUPPORTED This gets rid of these sorts of Kconfig errors: warning: BOARD_SPECIFIC_OPTIONS selects CHROMEOS_VBNV_EC which has unmet direct dependencies (MAINBOARD_HAS_CHROMEOS && CHROMEOS) Note: These two boards would never actually have CHROMEOS enabled: intel/emeraldlake2 has MAINBOARD_HAS_CHROMEOS commented out google/peach_pit doesn't have MAINBOARD_HAS_CHROMEOS Change-Id: I51b4ee326f082c6a656a813ee5772e9c34f5c343 Signed-off-by: Martin Roth <martinroth(a)google.com> --- src/mainboard/google/auron/Kconfig | 6 ++++-- src/mainboard/google/bolt/Kconfig | 4 +++- src/mainboard/google/butterfly/Kconfig | 6 +++--- src/mainboard/google/cosmos/Kconfig | 4 +++- src/mainboard/google/cyan/Kconfig | 6 ++++-- src/mainboard/google/daisy/Kconfig | 2 ++ src/mainboard/google/falco/Kconfig | 4 +++- src/mainboard/google/foster/Kconfig | 4 +++- src/mainboard/google/glados/Kconfig | 12 +++++++----- src/mainboard/google/jecht/Kconfig | 4 +++- src/mainboard/google/link/Kconfig | 2 ++ src/mainboard/google/nyan/Kconfig | 4 +++- src/mainboard/google/nyan_big/Kconfig | 4 +++- src/mainboard/google/nyan_blaze/Kconfig | 4 +++- src/mainboard/google/panther/Kconfig | 2 ++ src/mainboard/google/parrot/Kconfig | 2 ++ src/mainboard/google/peach_pit/Kconfig | 2 ++ src/mainboard/google/peppy/Kconfig | 4 +++- src/mainboard/google/purin/Kconfig | 4 +++- src/mainboard/google/rambi/Kconfig | 4 +++- src/mainboard/google/rush/Kconfig | 4 +++- src/mainboard/google/rush_ryu/Kconfig | 4 +++- src/mainboard/google/samus/Kconfig | 10 ++++++---- src/mainboard/google/slippy/Kconfig | 4 +++- src/mainboard/google/smaug/Kconfig | 6 ++++-- src/mainboard/google/storm/Kconfig | 6 ++++-- src/mainboard/google/stout/Kconfig | 2 ++ src/mainboard/google/veyron_brain/Kconfig | 4 +++- src/mainboard/google/veyron_danger/Kconfig | 6 ++++-- src/mainboard/google/veyron_jerry/Kconfig | 6 ++++-- src/mainboard/google/veyron_mickey/Kconfig | 4 +++- src/mainboard/google/veyron_mighty/Kconfig | 6 ++++-- src/mainboard/google/veyron_minnie/Kconfig | 6 ++++-- src/mainboard/google/veyron_pinky/Kconfig | 6 ++++-- src/mainboard/google/veyron_rialto/Kconfig | 6 ++++-- src/mainboard/google/veyron_romy/Kconfig | 4 +++- src/mainboard/google/veyron_shark/Kconfig | 6 ++++-- src/mainboard/google/veyron_speedy/Kconfig | 6 ++++-- src/mainboard/intel/baskingridge/Kconfig | 2 ++ src/mainboard/intel/emeraldlake2/Kconfig | 2 ++ src/mainboard/intel/kunimitsu/Kconfig | 10 ++++++---- src/mainboard/intel/sklrvp/Kconfig | 6 ++++-- src/mainboard/intel/strago/Kconfig | 6 ++++-- src/mainboard/intel/wtm2/Kconfig | 1 + src/mainboard/samsung/lumpy/Kconfig | 2 ++ src/mainboard/samsung/stumpy/Kconfig | 6 ++++-- src/soc/broadcom/cygnus/Kconfig | 6 ++++-- src/soc/marvell/bg4cd/Kconfig | 4 +++- src/soc/nvidia/tegra210/Kconfig | 4 +++- src/soc/qualcomm/ipq806x/Kconfig | 8 +++++--- src/soc/rockchip/rk3288/Kconfig | 6 ++++-- 51 files changed, 171 insertions(+), 72 deletions(-) diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig index 3a4cb7e..7ad3eaa 100644 --- a/src/mainboard/google/auron/Kconfig +++ b/src/mainboard/google/auron/Kconfig @@ -5,7 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOC_INTEL_BROADWELL select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -14,10 +13,13 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select CHROMEOS_RAMOOPS_DYNAMIC select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select CHROMEOS_RAMOOPS_DYNAMIC + select EC_SOFTWARE_SYNC config VBOOT_RAMSTAGE_INDEX hex diff --git a/src/mainboard/google/bolt/Kconfig b/src/mainboard/google/bolt/Kconfig index 2e37e25..0599d15 100644 --- a/src/mainboard/google/bolt/Kconfig +++ b/src/mainboard/google/bolt/Kconfig @@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -18,8 +17,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index b1a64ee..0c37565 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -15,10 +15,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 - select CHROMEOS_VBNV_CMOS + select SERIRQ_CONTINUOUS_MODE # Workaround for EC/KBC IRQ1. - # Workaround for EC/KBC IRQ1. - select SERIRQ_CONTINUOUS_MODE +config CHROMEOS + select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR string diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig index a6c87b1..70a5e09 100644 --- a/src/mainboard/google/cosmos/Kconfig +++ b/src/mainboard/google/cosmos/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_2048 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_HAS_CHROMEOS @@ -31,6 +30,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH select SPI_FLASH_SPANSION +config CHROMEOS + select CHROMEOS_VBNV_FLASH + config MAINBOARD_DIR string default google/cosmos diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index 91f7587..8648986 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -6,11 +6,9 @@ config BOARD_SPECIFIC_OPTIONS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 select CHROMEOS - select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP - select EC_SOFTWARE_SYNC select ENABLE_BUILTIN_COM1 select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -20,7 +18,11 @@ config BOARD_SPECIFIC_OPTIONS select VBOOT_DYNAMIC_WORK_BUFFER select VIRTUAL_DEV_SWITCH select HAVE_ACPI_RESUME + +config CHROMEOS select LID_SWITCH + select CHROMEOS_VBNV_CMOS + select EC_SOFTWARE_SYNC config DISPLAY_SPD_DATA bool "Display Memory Serial Presence Detect Data" diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig index c69c390..5c3b643 100644 --- a/src/mainboard/google/daisy/Kconfig +++ b/src/mainboard/google/daisy/Kconfig @@ -30,6 +30,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select DRIVER_TI_TPS65090 select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT + +config CHROMEOS select CHROMEOS_VBNV_EC config MAINBOARD_DIR diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig index e029382..cbcd57d 100644 --- a/src/mainboard/google/falco/Kconfig +++ b/src/mainboard/google/falco/Kconfig @@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -21,8 +20,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig index b8fe708..373cb07 100644 --- a/src/mainboard/google/foster/Kconfig +++ b/src/mainboard/google/foster/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_FLASH select SPI_FLASH select SOC_NVIDIA_TEGRA210 select MAINBOARD_HAS_CHROMEOS @@ -32,6 +31,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy select COMMON_CBFS_SPI_WRAPPER select SPI_FLASH_WINBOND +config CHROMEOS + select CHROMEOS_VBNV_FLASH + config MAINBOARD_DIR string default google/foster diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index c7df2a3..fac3cc2 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -5,26 +5,28 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_16384 select CACHE_ROM select CHROMEOS - select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP - select EC_SOFTWARE_SYNC select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE select HAVE_SMI_HANDLER - select LID_SWITCH select MAINBOARD_HAS_CHROMEOS select MARK_GRAPHICS_MEM_WRCOMB select MMCONF_SUPPORT select MONOTONIC_TIMER_MSR select SOC_INTEL_SKYLAKE - select VBOOT_OPROM_MATTERS select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_RAMOOPS_DYNAMIC + select CHROMEOS_VBNV_CMOS + select EC_SOFTWARE_SYNC + select LID_SWITCH + select VBOOT_OPROM_MATTERS + config IRQ_SLOT_COUNT int default 18 diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig index 83b091d..90e9cea 100644 --- a/src/mainboard/google/jecht/Kconfig +++ b/src/mainboard/google/jecht/Kconfig @@ -13,10 +13,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select CHROMEOS_RAMOOPS_DYNAMIC select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select PHYSICAL_REC_SWITCH + select CHROMEOS_RAMOOPS_DYNAMIC config MAINBOARD_DIR string diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index fd3390a..ac06a62 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -15,6 +15,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_LPC_TPM select SERIRQ_CONTINUOUS_MODE select MAINBOARD_HAS_NATIVE_VGA_INIT + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig index d771ca6..bd390e4 100644 --- a/src/mainboard/google/nyan/Kconfig +++ b/src/mainboard/google/nyan/Kconfig @@ -25,14 +25,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select TEGRA124_MODEL_CD570M select MAINBOARD_DO_NATIVE_VGA_INIT select BOARD_ROMSIZE_KB_4096 select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B select VIRTUAL_DEV_SWITCH + +config CHROMEOS select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig index 55ded30..e187a66 100644 --- a/src/mainboard/google/nyan_big/Kconfig +++ b/src/mainboard/google/nyan_big/Kconfig @@ -26,13 +26,15 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select TEGRA124_MODEL_CD570M select MAINBOARD_DO_NATIVE_VGA_INIT select BOARD_ROMSIZE_KB_4096 select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B select VIRTUAL_DEV_SWITCH + +config CHROMEOS + select EC_SOFTWARE_SYNC select CHROMEOS_VBNV_EC config MAINBOARD_DIR diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig index 5316523..29191f2 100644 --- a/src/mainboard/google/nyan_blaze/Kconfig +++ b/src/mainboard/google/nyan_blaze/Kconfig @@ -25,7 +25,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select SOC_NVIDIA_TEGRA124 select TEGRA124_MODEL_CD570M select MAINBOARD_HAS_CHROMEOS @@ -34,6 +33,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B select VIRTUAL_DEV_SWITCH + +config CHROMEOS + select EC_SOFTWARE_SYNC select CHROMEOS_VBNV_EC config MAINBOARD_DIR diff --git a/src/mainboard/google/panther/Kconfig b/src/mainboard/google/panther/Kconfig index 6fb6c5f..85bc1ff 100644 --- a/src/mainboard/google/panther/Kconfig +++ b/src/mainboard/google/panther/Kconfig @@ -17,6 +17,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select PHYSICAL_REC_SWITCH select CHROMEOS_VBNV_CMOS diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index 9cf390a..56ebf86 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -14,6 +14,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS # Workaround for EC/KBC IRQ1. diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig index 3a94dec..016ecb9 100644 --- a/src/mainboard/google/peach_pit/Kconfig +++ b/src/mainboard/google/peach_pit/Kconfig @@ -28,6 +28,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select DRIVER_PARADE_PS8625 + +config CHROMEOS select CHROMEOS_VBNV_EC config MAINBOARD_DIR diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig index b507953..66203ce 100644 --- a/src/mainboard/google/peppy/Kconfig +++ b/src/mainboard/google/peppy/Kconfig @@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -23,8 +22,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_DP select INTEL_DDI select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/purin/Kconfig b/src/mainboard/google/purin/Kconfig index be6d050..67aaca5 100644 --- a/src/mainboard/google/purin/Kconfig +++ b/src/mainboard/google/purin/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_2048 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_HAS_CHROMEOS @@ -33,6 +32,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_STMICRO # required for the reference board BCM958305K select SPI_ATOMIC_SEQUENCING +config CHROMEOS + select CHROMEOS_VBNV_FLASH + config MAINBOARD_DIR string default google/purin diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index 45c3ece..9459675 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -4,7 +4,6 @@ config BOARD_SPECIFIC_OPTIONS def_bool y select SOC_INTEL_BAYTRAIL select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select ENABLE_BUILTIN_COM1 select BOARD_ROMSIZE_KB_8192 @@ -15,8 +14,11 @@ config BOARD_SPECIFIC_OPTIONS select MAINBOARD_HAS_LPC_TPM select VGA_ROM_RUN if !PAYLOAD_SEABIOS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig index cee8afa..573bff9 100644 --- a/src/mainboard/google/rush/Kconfig +++ b/src/mainboard/google/rush/Kconfig @@ -24,7 +24,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SOC_NVIDIA_TEGRA132 @@ -33,7 +32,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select VIRTUAL_DEV_SWITCH select BOARD_ROMSIZE_KB_4096 select ARM64_USE_SPINTABLE + +config CHROMEOS select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig index a91b9ea..6205f2d 100644 --- a/src/mainboard/google/rush_ryu/Kconfig +++ b/src/mainboard/google/rush_ryu/Kconfig @@ -25,7 +25,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_I2C select EC_GOOGLE_CHROMEEC_I2C_PROTO3 - select EC_SOFTWARE_SYNC select MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SOC_NVIDIA_TEGRA132 @@ -34,7 +33,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_8192 select VIRTUAL_DEV_SWITCH select ARM64_USE_SPINTABLE + +config CHROMEOS select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/samus/Kconfig b/src/mainboard/google/samus/Kconfig index 0b4d74d..e45b22f 100644 --- a/src/mainboard/google/samus/Kconfig +++ b/src/mainboard/google/samus/Kconfig @@ -5,9 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOC_INTEL_BROADWELL select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC - select VBOOT_EC_SLOW_UPDATE - select VBOOT_OPROM_MATTERS select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -16,10 +13,15 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select CHROMEOS_RAMOOPS_DYNAMIC select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC + select VBOOT_EC_SLOW_UPDATE + select VBOOT_OPROM_MATTERS + select CHROMEOS_RAMOOPS_DYNAMIC config MAINBOARD_DIR string diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index ba83683..8f9f518 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -20,8 +19,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_DP select INTEL_DDI select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig index 29dae4f..0fe9f68 100644 --- a/src/mainboard/google/smaug/Kconfig +++ b/src/mainboard/google/smaug/Kconfig @@ -23,12 +23,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_16384 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_I2C select EC_GOOGLE_CHROMEEC_I2C_PROTO3 - select EC_SOFTWARE_SYNC select MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SPI_FLASH_WINBOND @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select VIRTUAL_DEV_SWITCH select RAM_CODE_SUPPORT +config CHROMEOS + select CHROMEOS_VBNV_FLASH + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/smaug diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig index 55cc5ba..404ab4d 100644 --- a/src/mainboard/google/storm/Kconfig +++ b/src/mainboard/google/storm/Kconfig @@ -31,12 +31,14 @@ config BOARD_SPECIFIC_OPTIONS select SPI_FLASH select SPI_FLASH_SPANSION select SPI_FLASH_STMICRO - select VBOOT_DISABLE_DEV_ON_RECOVERY select VIRTUAL_DEV_SWITCH - select WIPEOUT_SUPPORTED select DRIVERS_UART select CONSOLE_CBMEM_DUMP_TO_UART +config CHROMEOS + select VBOOT_DISABLE_DEV_ON_RECOVERY + select WIPEOUT_SUPPORTED + config BOARD_VARIANT_AP148 bool "pick this to build an image for ap148" default n diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig index eca83da..3f73295 100644 --- a/src/mainboard/google/stout/Kconfig +++ b/src/mainboard/google/stout/Kconfig @@ -15,6 +15,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig index e76496b..eb70f3a 100644 --- a/src/mainboard/google/veyron_brain/Kconfig +++ b/src/mainboard/google/veyron_brain/Kconfig @@ -27,14 +27,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH + +config CHROMEOS select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH config MAINBOARD_DIR string diff --git a/src/mainboard/google/veyron_danger/Kconfig b/src/mainboard/google/veyron_danger/Kconfig index e2128eb..8160046 100644 --- a/src/mainboard/google/veyron_danger/Kconfig +++ b/src/mainboard/google/veyron_danger/Kconfig @@ -23,18 +23,20 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND +config CHROMEOS + select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH + config MAINBOARD_DIR string default google/veyron_danger diff --git a/src/mainboard/google/veyron_jerry/Kconfig b/src/mainboard/google/veyron_jerry/Kconfig index 3e65e67..566e0a9 100644 --- a/src/mainboard/google/veyron_jerry/Kconfig +++ b/src/mainboard/google/veyron_jerry/Kconfig @@ -22,11 +22,9 @@ if BOARD_GOOGLE_VEYRON_JERRY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_jerry diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig index 9233a91..3c90dcc 100644 --- a/src/mainboard/google/veyron_mickey/Kconfig +++ b/src/mainboard/google/veyron_mickey/Kconfig @@ -27,14 +27,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH + +config CHROMEOS select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH config MAINBOARD_DIR string diff --git a/src/mainboard/google/veyron_mighty/Kconfig b/src/mainboard/google/veyron_mighty/Kconfig index 90cdbb5..8d22da7 100644 --- a/src/mainboard/google/veyron_mighty/Kconfig +++ b/src/mainboard/google/veyron_mighty/Kconfig @@ -22,11 +22,9 @@ if BOARD_GOOGLE_VEYRON_MIGHTY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_mighty diff --git a/src/mainboard/google/veyron_minnie/Kconfig b/src/mainboard/google/veyron_minnie/Kconfig index a2d4846..930a1ba 100644 --- a/src/mainboard/google/veyron_minnie/Kconfig +++ b/src/mainboard/google/veyron_minnie/Kconfig @@ -23,11 +23,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_minnie diff --git a/src/mainboard/google/veyron_pinky/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig index 4b0d471..818b525 100644 --- a/src/mainboard/google/veyron_pinky/Kconfig +++ b/src/mainboard/google/veyron_pinky/Kconfig @@ -22,11 +22,9 @@ if BOARD_GOOGLE_VEYRON_PINKY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_pinky diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig index 0061bfa..a038184 100644 --- a/src/mainboard/google/veyron_rialto/Kconfig +++ b/src/mainboard/google/veyron_rialto/Kconfig @@ -23,12 +23,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH @@ -36,6 +34,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH + config MAINBOARD_DIR string default google/veyron_rialto diff --git a/src/mainboard/google/veyron_romy/Kconfig b/src/mainboard/google/veyron_romy/Kconfig index b7f05d7..1570cee 100644 --- a/src/mainboard/google/veyron_romy/Kconfig +++ b/src/mainboard/google/veyron_romy/Kconfig @@ -27,14 +27,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH + +config CHROMEOS select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH config MAINBOARD_DIR string diff --git a/src/mainboard/google/veyron_shark/Kconfig b/src/mainboard/google/veyron_shark/Kconfig index 0cefbc6..01068bf 100644 --- a/src/mainboard/google/veyron_shark/Kconfig +++ b/src/mainboard/google/veyron_shark/Kconfig @@ -23,11 +23,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_shark diff --git a/src/mainboard/google/veyron_speedy/Kconfig b/src/mainboard/google/veyron_speedy/Kconfig index d4003dc..882571c 100644 --- a/src/mainboard/google/veyron_speedy/Kconfig +++ b/src/mainboard/google/veyron_speedy/Kconfig @@ -23,11 +23,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_speedy diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig index f916138..47aca1a 100644 --- a/src/mainboard/intel/baskingridge/Kconfig +++ b/src/mainboard/intel/baskingridge/Kconfig @@ -13,6 +13,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig index 74b8270..90b40ac 100644 --- a/src/mainboard/intel/emeraldlake2/Kconfig +++ b/src/mainboard/intel/emeraldlake2/Kconfig @@ -12,6 +12,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select INTEL_INT15 #select MAINBOARD_HAS_CHROMEOS + +config CHROMEOS #select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig index 78d4081..7c08497 100644 --- a/src/mainboard/intel/kunimitsu/Kconfig +++ b/src/mainboard/intel/kunimitsu/Kconfig @@ -5,8 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_16384 select CACHE_ROM select CHROMEOS - select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_MEC @@ -15,15 +13,19 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE select HAVE_SMI_HANDLER - select LID_SWITCH select MAINBOARD_HAS_CHROMEOS select MARK_GRAPHICS_MEM_WRCOMB select MMCONF_SUPPORT select MONOTONIC_TIMER_MSR select SOC_INTEL_SKYLAKE - select VBOOT_OPROM_MATTERS select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_RAMOOPS_DYNAMIC + select CHROMEOS_VBNV_CMOS + select LID_SWITCH + select VBOOT_OPROM_MATTERS + config IRQ_SLOT_COUNT int default 18 diff --git a/src/mainboard/intel/sklrvp/Kconfig b/src/mainboard/intel/sklrvp/Kconfig index 601efb0..f1d4e84 100644 --- a/src/mainboard/intel/sklrvp/Kconfig +++ b/src/mainboard/intel/sklrvp/Kconfig @@ -5,8 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_16384 select CACHE_ROM select CHROMEOS - select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -19,7 +17,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOC_INTEL_SKYLAKE select VBOOT_DYNAMIC_WORK_BUFFER select VIRTUAL_DEV_SWITCH + +config CHROMEOS select LID_SWITCH + select CHROMEOS_RAMOOPS_DYNAMIC + select CHROMEOS_VBNV_CMOS config IRQ_SLOT_COUNT int diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index c19761a..b6da5ec 100755 --- a/src/mainboard/intel/strago/Kconfig +++ b/src/mainboard/intel/strago/Kconfig @@ -6,11 +6,9 @@ config BOARD_SPECIFIC_OPTIONS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 select CHROMEOS - select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP - select EC_SOFTWARE_SYNC select ENABLE_BUILTIN_COM1 select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES @@ -20,7 +18,11 @@ config BOARD_SPECIFIC_OPTIONS select SOC_INTEL_BRASWELL select VBOOT_DYNAMIC_WORK_BUFFER select VIRTUAL_DEV_SWITCH + +config CHROMEOS select LID_SWITCH + select CHROMEOS_VBNV_CMOS + select EC_SOFTWARE_SYNC config DISPLAY_SPD_DATA diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig index b8f616a..e739efa 100644 --- a/src/mainboard/intel/wtm2/Kconfig +++ b/src/mainboard/intel/wtm2/Kconfig @@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select INTEL_INT15 +config CHROMEOS select CHROMEOS_RAMOOPS_DYNAMIC select CHROMEOS_VBNV_CMOS diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index fed4610..e144545 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -20,6 +20,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select DRIVERS_GENERIC_IOAPIC select INTEL_INT15 select HAVE_MRC + +config CHROMEOS select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig index f749c39..874dd6c 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -12,14 +12,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_BD82X6X select SUPERIO_ITE_IT8772F - select PHYSICAL_REC_SWITCH # LPC47N207 selected for external LPC card # not on board, should be made selectable. select SUPERIO_SMSC_LPC47N207 select HAVE_MRC + select INTEL_INT15 + +config CHROMEOS + select PHYSICAL_REC_SWITCH select CHROMEOS_VBNV_CMOS - select INTEL_INT15 config MAINBOARD_DIR string default samsung/stumpy diff --git a/src/soc/broadcom/cygnus/Kconfig b/src/soc/broadcom/cygnus/Kconfig index 7ab305c..75df786 100644 --- a/src/soc/broadcom/cygnus/Kconfig +++ b/src/soc/broadcom/cygnus/Kconfig @@ -29,12 +29,14 @@ config SOC_BROADCOM_CYGNUS select HAVE_MONOTONIC_TIMER select HAVE_UART_SPECIAL select HAS_PRECBMEM_TIMESTAMP_REGION - select SEPARATE_VERSTAGE - select RETURN_FROM_VERSTAGE select GENERIC_GPIO_LIB if SOC_BROADCOM_CYGNUS +config CHROMEOS + select SEPARATE_VERSTAGE + select RETURN_FROM_VERSTAGE + config BOOTBLOCK_CPU_INIT string default "soc/broadcom/cygnus/bootblock.c" diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig index 930645e..45a2abb 100644 --- a/src/soc/marvell/bg4cd/Kconfig +++ b/src/soc/marvell/bg4cd/Kconfig @@ -29,10 +29,12 @@ config SOC_MARVELL_BG4CD select GENERIC_UDELAY select HAVE_MONOTONIC_TIMER select GENERIC_GPIO_LIB - select VBOOT_STARTS_IN_BOOTBLOCK if SOC_MARVELL_BG4CD +config CHROMEOS + select VBOOT_STARTS_IN_BOOTBLOCK + config BOOTBLOCK_CPU_INIT string default "soc/marvell/bg4cd/bootblock.c" diff --git a/src/soc/nvidia/tegra210/Kconfig b/src/soc/nvidia/tegra210/Kconfig index 7aff588..f899803 100644 --- a/src/soc/nvidia/tegra210/Kconfig +++ b/src/soc/nvidia/tegra210/Kconfig @@ -16,11 +16,13 @@ config SOC_NVIDIA_TEGRA210 select ARM_BOOTBLOCK_CUSTOM select ARM64_USE_ARM_TRUSTED_FIRMWARE select HAS_PRECBMEM_TIMESTAMP_REGION - select CHROMEOS_RAMOOPS_NON_ACPI select GENERIC_GPIO_LIB if SOC_NVIDIA_TEGRA210 +config CHROMEOS + select CHROMEOS_RAMOOPS_NON_ACPI + config MAINBOARD_DO_DSI_INIT bool "Use dsi graphics interface" depends on MAINBOARD_DO_NATIVE_VGA_INIT diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig index 9a1e4f9..dd60d63 100644 --- a/src/soc/qualcomm/ipq806x/Kconfig +++ b/src/soc/qualcomm/ipq806x/Kconfig @@ -6,16 +6,18 @@ config SOC_QC_IPQ806X select ARCH_ROMSTAGE_ARMV7 select ARCH_RAMSTAGE_ARMV7 select BOOTBLOCK_CONSOLE - select CHROMEOS_VBNV_FLASH select HAS_PRECBMEM_TIMESTAMP_REGION select HAVE_UART_SPECIAL select SPI_ATOMIC_SEQUENCING select GENERIC_GPIO_LIB - select SEPARATE_VERSTAGE - select RETURN_FROM_VERSTAGE if SOC_QC_IPQ806X +config CHROMEOS + select CHROMEOS_VBNV_FLASH + select SEPARATE_VERSTAGE + select RETURN_FROM_VERSTAGE + config MBN_ENCAPSULATION depends on USE_BLOBS bool "bootblock encapsulation for ipq8064" diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig index 1800b16..bc484e3 100644 --- a/src/soc/rockchip/rk3288/Kconfig +++ b/src/soc/rockchip/rk3288/Kconfig @@ -32,12 +32,14 @@ config SOC_ROCKCHIP_RK3288 select UNCOMPRESSED_RAMSTAGE select GENERIC_GPIO_LIB select RTC + +if SOC_ROCKCHIP_RK3288 + +config CHROMEOS select VBOOT_STARTS_IN_BOOTBLOCK select SEPARATE_VERSTAGE select RETURN_FROM_VERSTAGE -if SOC_ROCKCHIP_RK3288 - config BOOTBLOCK_CPU_INIT string default "soc/rockchip/rk3288/bootblock.c"

1 0

Patch set updated for coreboot: ChromeOS: Fix Kconfig dependencies
by Martin Roth 19 Aug '15

19 Aug '15

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11272 -gerrit commit c529d7da44d38b61fa308aea7b3d1d08434cd0a9 Author: Martin Roth <martinroth(a)google.com> Date: Tue Aug 18 14:22:58 2015 -0600 ChromeOS: Fix Kconfig dependencies Add CHROMEOS dependencies to selects for the following Kconfig symbols: CHROMEOS_RAMOOPS_DYNAMIC CHROMEOS_RAMOOPS_NON_ACPI CHROMEOS_VBNV_CMOS CHROMEOS_VBNV_EC CHROMEOS_VBNV_FLASH EC_SOFTWARE_SYNC LID_SWITCH RETURN_FROM_VERSTAGE SEPARATE_VERSTAGE VBOOT_DISABLE_DEV_ON_RECOVERY VBOOT_EC_SLOW_UPDATE VBOOT_OPROM_MATTERS VBOOT_STARTS_IN_BOOTBLOCK WIPEOUT_SUPPORTED This gets rid of these sorts of Kconfig errors: warning: BOARD_SPECIFIC_OPTIONS selects CHROMEOS_VBNV_EC which has unmet direct dependencies (MAINBOARD_HAS_CHROMEOS && CHROMEOS) Note: These two boards would never actually have CHROMEOS enabled: intel/emeraldlake2 has MAINBOARD_HAS_CHROMEOS commented out google/peach_pit doesn't have MAINBOARD_HAS_CHROMEOS Change-Id: I51b4ee326f082c6a656a813ee5772e9c34f5c343 Signed-off-by: Martin Roth <martinroth(a)google.com> --- src/mainboard/google/auron/Kconfig | 6 ++++-- src/mainboard/google/bolt/Kconfig | 4 +++- src/mainboard/google/butterfly/Kconfig | 6 +++--- src/mainboard/google/cosmos/Kconfig | 4 +++- src/mainboard/google/cyan/Kconfig | 6 ++++-- src/mainboard/google/daisy/Kconfig | 2 ++ src/mainboard/google/falco/Kconfig | 4 +++- src/mainboard/google/foster/Kconfig | 4 +++- src/mainboard/google/glados/Kconfig | 12 +++++++----- src/mainboard/google/jecht/Kconfig | 4 +++- src/mainboard/google/link/Kconfig | 2 ++ src/mainboard/google/nyan/Kconfig | 4 +++- src/mainboard/google/nyan_big/Kconfig | 4 +++- src/mainboard/google/nyan_blaze/Kconfig | 4 +++- src/mainboard/google/panther/Kconfig | 2 ++ src/mainboard/google/parrot/Kconfig | 2 ++ src/mainboard/google/peach_pit/Kconfig | 2 ++ src/mainboard/google/peppy/Kconfig | 4 +++- src/mainboard/google/purin/Kconfig | 4 +++- src/mainboard/google/rambi/Kconfig | 4 +++- src/mainboard/google/rush/Kconfig | 6 ++++-- src/mainboard/google/rush_ryu/Kconfig | 4 +++- src/mainboard/google/samus/Kconfig | 10 ++++++---- src/mainboard/google/slippy/Kconfig | 4 +++- src/mainboard/google/smaug/Kconfig | 6 ++++-- src/mainboard/google/storm/Kconfig | 6 ++++-- src/mainboard/google/stout/Kconfig | 2 ++ src/mainboard/google/veyron_brain/Kconfig | 4 +++- src/mainboard/google/veyron_danger/Kconfig | 6 ++++-- src/mainboard/google/veyron_jerry/Kconfig | 6 ++++-- src/mainboard/google/veyron_mickey/Kconfig | 4 +++- src/mainboard/google/veyron_mighty/Kconfig | 6 ++++-- src/mainboard/google/veyron_minnie/Kconfig | 6 ++++-- src/mainboard/google/veyron_pinky/Kconfig | 6 ++++-- src/mainboard/google/veyron_rialto/Kconfig | 6 ++++-- src/mainboard/google/veyron_romy/Kconfig | 4 +++- src/mainboard/google/veyron_shark/Kconfig | 6 ++++-- src/mainboard/google/veyron_speedy/Kconfig | 6 ++++-- src/mainboard/intel/baskingridge/Kconfig | 2 ++ src/mainboard/intel/emeraldlake2/Kconfig | 2 ++ src/mainboard/intel/kunimitsu/Kconfig | 10 ++++++---- src/mainboard/intel/sklrvp/Kconfig | 6 ++++-- src/mainboard/intel/strago/Kconfig | 6 ++++-- src/mainboard/intel/wtm2/Kconfig | 1 + src/mainboard/samsung/lumpy/Kconfig | 2 ++ src/mainboard/samsung/stumpy/Kconfig | 6 ++++-- src/soc/broadcom/cygnus/Kconfig | 6 ++++-- src/soc/marvell/bg4cd/Kconfig | 4 +++- src/soc/nvidia/tegra210/Kconfig | 4 +++- src/soc/qualcomm/ipq806x/Kconfig | 8 +++++--- src/soc/rockchip/rk3288/Kconfig | 6 ++++-- 51 files changed, 172 insertions(+), 73 deletions(-) diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig index 3a4cb7e..7ad3eaa 100644 --- a/src/mainboard/google/auron/Kconfig +++ b/src/mainboard/google/auron/Kconfig @@ -5,7 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOC_INTEL_BROADWELL select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -14,10 +13,13 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select CHROMEOS_RAMOOPS_DYNAMIC select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select CHROMEOS_RAMOOPS_DYNAMIC + select EC_SOFTWARE_SYNC config VBOOT_RAMSTAGE_INDEX hex diff --git a/src/mainboard/google/bolt/Kconfig b/src/mainboard/google/bolt/Kconfig index 2e37e25..0599d15 100644 --- a/src/mainboard/google/bolt/Kconfig +++ b/src/mainboard/google/bolt/Kconfig @@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -18,8 +17,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index b1a64ee..0c37565 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -15,10 +15,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 - select CHROMEOS_VBNV_CMOS + select SERIRQ_CONTINUOUS_MODE # Workaround for EC/KBC IRQ1. - # Workaround for EC/KBC IRQ1. - select SERIRQ_CONTINUOUS_MODE +config CHROMEOS + select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR string diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig index a6c87b1..70a5e09 100644 --- a/src/mainboard/google/cosmos/Kconfig +++ b/src/mainboard/google/cosmos/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_2048 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_HAS_CHROMEOS @@ -31,6 +30,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH select SPI_FLASH_SPANSION +config CHROMEOS + select CHROMEOS_VBNV_FLASH + config MAINBOARD_DIR string default google/cosmos diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index 91f7587..8648986 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -6,11 +6,9 @@ config BOARD_SPECIFIC_OPTIONS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 select CHROMEOS - select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP - select EC_SOFTWARE_SYNC select ENABLE_BUILTIN_COM1 select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -20,7 +18,11 @@ config BOARD_SPECIFIC_OPTIONS select VBOOT_DYNAMIC_WORK_BUFFER select VIRTUAL_DEV_SWITCH select HAVE_ACPI_RESUME + +config CHROMEOS select LID_SWITCH + select CHROMEOS_VBNV_CMOS + select EC_SOFTWARE_SYNC config DISPLAY_SPD_DATA bool "Display Memory Serial Presence Detect Data" diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig index c69c390..5c3b643 100644 --- a/src/mainboard/google/daisy/Kconfig +++ b/src/mainboard/google/daisy/Kconfig @@ -30,6 +30,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select DRIVER_TI_TPS65090 select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT + +config CHROMEOS select CHROMEOS_VBNV_EC config MAINBOARD_DIR diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig index e029382..cbcd57d 100644 --- a/src/mainboard/google/falco/Kconfig +++ b/src/mainboard/google/falco/Kconfig @@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -21,8 +20,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig index b8fe708..373cb07 100644 --- a/src/mainboard/google/foster/Kconfig +++ b/src/mainboard/google/foster/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_FLASH select SPI_FLASH select SOC_NVIDIA_TEGRA210 select MAINBOARD_HAS_CHROMEOS @@ -32,6 +31,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy select COMMON_CBFS_SPI_WRAPPER select SPI_FLASH_WINBOND +config CHROMEOS + select CHROMEOS_VBNV_FLASH + config MAINBOARD_DIR string default google/foster diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index c7df2a3..fac3cc2 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -5,26 +5,28 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_16384 select CACHE_ROM select CHROMEOS - select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP - select EC_SOFTWARE_SYNC select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE select HAVE_SMI_HANDLER - select LID_SWITCH select MAINBOARD_HAS_CHROMEOS select MARK_GRAPHICS_MEM_WRCOMB select MMCONF_SUPPORT select MONOTONIC_TIMER_MSR select SOC_INTEL_SKYLAKE - select VBOOT_OPROM_MATTERS select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_RAMOOPS_DYNAMIC + select CHROMEOS_VBNV_CMOS + select EC_SOFTWARE_SYNC + select LID_SWITCH + select VBOOT_OPROM_MATTERS + config IRQ_SLOT_COUNT int default 18 diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig index 83b091d..90e9cea 100644 --- a/src/mainboard/google/jecht/Kconfig +++ b/src/mainboard/google/jecht/Kconfig @@ -13,10 +13,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select CHROMEOS_RAMOOPS_DYNAMIC select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select PHYSICAL_REC_SWITCH + select CHROMEOS_RAMOOPS_DYNAMIC config MAINBOARD_DIR string diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index fd3390a..ac06a62 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -15,6 +15,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_LPC_TPM select SERIRQ_CONTINUOUS_MODE select MAINBOARD_HAS_NATIVE_VGA_INIT + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig index d771ca6..bd390e4 100644 --- a/src/mainboard/google/nyan/Kconfig +++ b/src/mainboard/google/nyan/Kconfig @@ -25,14 +25,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select TEGRA124_MODEL_CD570M select MAINBOARD_DO_NATIVE_VGA_INIT select BOARD_ROMSIZE_KB_4096 select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B select VIRTUAL_DEV_SWITCH + +config CHROMEOS select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig index 55ded30..e187a66 100644 --- a/src/mainboard/google/nyan_big/Kconfig +++ b/src/mainboard/google/nyan_big/Kconfig @@ -26,13 +26,15 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select TEGRA124_MODEL_CD570M select MAINBOARD_DO_NATIVE_VGA_INIT select BOARD_ROMSIZE_KB_4096 select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B select VIRTUAL_DEV_SWITCH + +config CHROMEOS + select EC_SOFTWARE_SYNC select CHROMEOS_VBNV_EC config MAINBOARD_DIR diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig index 5316523..29191f2 100644 --- a/src/mainboard/google/nyan_blaze/Kconfig +++ b/src/mainboard/google/nyan_blaze/Kconfig @@ -25,7 +25,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select SOC_NVIDIA_TEGRA124 select TEGRA124_MODEL_CD570M select MAINBOARD_HAS_CHROMEOS @@ -34,6 +33,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B select VIRTUAL_DEV_SWITCH + +config CHROMEOS + select EC_SOFTWARE_SYNC select CHROMEOS_VBNV_EC config MAINBOARD_DIR diff --git a/src/mainboard/google/panther/Kconfig b/src/mainboard/google/panther/Kconfig index 6fb6c5f..85bc1ff 100644 --- a/src/mainboard/google/panther/Kconfig +++ b/src/mainboard/google/panther/Kconfig @@ -17,6 +17,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select PHYSICAL_REC_SWITCH select CHROMEOS_VBNV_CMOS diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index 9cf390a..56ebf86 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -14,6 +14,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS # Workaround for EC/KBC IRQ1. diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig index 3a94dec..016ecb9 100644 --- a/src/mainboard/google/peach_pit/Kconfig +++ b/src/mainboard/google/peach_pit/Kconfig @@ -28,6 +28,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select DRIVER_PARADE_PS8625 + +config CHROMEOS select CHROMEOS_VBNV_EC config MAINBOARD_DIR diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig index b507953..66203ce 100644 --- a/src/mainboard/google/peppy/Kconfig +++ b/src/mainboard/google/peppy/Kconfig @@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -23,8 +22,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_DP select INTEL_DDI select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/purin/Kconfig b/src/mainboard/google/purin/Kconfig index be6d050..67aaca5 100644 --- a/src/mainboard/google/purin/Kconfig +++ b/src/mainboard/google/purin/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_2048 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_HAS_CHROMEOS @@ -33,6 +32,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_STMICRO # required for the reference board BCM958305K select SPI_ATOMIC_SEQUENCING +config CHROMEOS + select CHROMEOS_VBNV_FLASH + config MAINBOARD_DIR string default google/purin diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index 45c3ece..9459675 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -4,7 +4,6 @@ config BOARD_SPECIFIC_OPTIONS def_bool y select SOC_INTEL_BAYTRAIL select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select ENABLE_BUILTIN_COM1 select BOARD_ROMSIZE_KB_8192 @@ -15,8 +14,11 @@ config BOARD_SPECIFIC_OPTIONS select MAINBOARD_HAS_LPC_TPM select VGA_ROM_RUN if !PAYLOAD_SEABIOS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig index cee8afa..8bb2098 100644 --- a/src/mainboard/google/rush/Kconfig +++ b/src/mainboard/google/rush/Kconfig @@ -24,7 +24,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SOC_NVIDIA_TEGRA132 @@ -33,7 +32,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select VIRTUAL_DEV_SWITCH select BOARD_ROMSIZE_KB_4096 select ARM64_USE_SPINTABLE - select CHROMEOS_VBNV_EC + +config CHROMEOS + select CHROMEOS_VBNV_EC if CHROMEOS + select EC_SOFTWARE_SYNC if CHROMEOS config MAINBOARD_DIR string diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig index a91b9ea..6205f2d 100644 --- a/src/mainboard/google/rush_ryu/Kconfig +++ b/src/mainboard/google/rush_ryu/Kconfig @@ -25,7 +25,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_I2C select EC_GOOGLE_CHROMEEC_I2C_PROTO3 - select EC_SOFTWARE_SYNC select MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SOC_NVIDIA_TEGRA132 @@ -34,7 +33,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_8192 select VIRTUAL_DEV_SWITCH select ARM64_USE_SPINTABLE + +config CHROMEOS select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/samus/Kconfig b/src/mainboard/google/samus/Kconfig index 0b4d74d..e45b22f 100644 --- a/src/mainboard/google/samus/Kconfig +++ b/src/mainboard/google/samus/Kconfig @@ -5,9 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOC_INTEL_BROADWELL select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC - select VBOOT_EC_SLOW_UPDATE - select VBOOT_OPROM_MATTERS select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -16,10 +13,15 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select CHROMEOS_RAMOOPS_DYNAMIC select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC + select VBOOT_EC_SLOW_UPDATE + select VBOOT_OPROM_MATTERS + select CHROMEOS_RAMOOPS_DYNAMIC config MAINBOARD_DIR string diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index ba83683..8f9f518 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -20,8 +19,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_DP select INTEL_DDI select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig index 29dae4f..0fe9f68 100644 --- a/src/mainboard/google/smaug/Kconfig +++ b/src/mainboard/google/smaug/Kconfig @@ -23,12 +23,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_16384 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_I2C select EC_GOOGLE_CHROMEEC_I2C_PROTO3 - select EC_SOFTWARE_SYNC select MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SPI_FLASH_WINBOND @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select VIRTUAL_DEV_SWITCH select RAM_CODE_SUPPORT +config CHROMEOS + select CHROMEOS_VBNV_FLASH + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/smaug diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig index 55cc5ba..404ab4d 100644 --- a/src/mainboard/google/storm/Kconfig +++ b/src/mainboard/google/storm/Kconfig @@ -31,12 +31,14 @@ config BOARD_SPECIFIC_OPTIONS select SPI_FLASH select SPI_FLASH_SPANSION select SPI_FLASH_STMICRO - select VBOOT_DISABLE_DEV_ON_RECOVERY select VIRTUAL_DEV_SWITCH - select WIPEOUT_SUPPORTED select DRIVERS_UART select CONSOLE_CBMEM_DUMP_TO_UART +config CHROMEOS + select VBOOT_DISABLE_DEV_ON_RECOVERY + select WIPEOUT_SUPPORTED + config BOARD_VARIANT_AP148 bool "pick this to build an image for ap148" default n diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig index eca83da..3f73295 100644 --- a/src/mainboard/google/stout/Kconfig +++ b/src/mainboard/google/stout/Kconfig @@ -15,6 +15,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig index e76496b..eb70f3a 100644 --- a/src/mainboard/google/veyron_brain/Kconfig +++ b/src/mainboard/google/veyron_brain/Kconfig @@ -27,14 +27,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH + +config CHROMEOS select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH config MAINBOARD_DIR string diff --git a/src/mainboard/google/veyron_danger/Kconfig b/src/mainboard/google/veyron_danger/Kconfig index e2128eb..8160046 100644 --- a/src/mainboard/google/veyron_danger/Kconfig +++ b/src/mainboard/google/veyron_danger/Kconfig @@ -23,18 +23,20 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND +config CHROMEOS + select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH + config MAINBOARD_DIR string default google/veyron_danger diff --git a/src/mainboard/google/veyron_jerry/Kconfig b/src/mainboard/google/veyron_jerry/Kconfig index 3e65e67..566e0a9 100644 --- a/src/mainboard/google/veyron_jerry/Kconfig +++ b/src/mainboard/google/veyron_jerry/Kconfig @@ -22,11 +22,9 @@ if BOARD_GOOGLE_VEYRON_JERRY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_jerry diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig index 9233a91..3c90dcc 100644 --- a/src/mainboard/google/veyron_mickey/Kconfig +++ b/src/mainboard/google/veyron_mickey/Kconfig @@ -27,14 +27,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH + +config CHROMEOS select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH config MAINBOARD_DIR string diff --git a/src/mainboard/google/veyron_mighty/Kconfig b/src/mainboard/google/veyron_mighty/Kconfig index 90cdbb5..8ee9126 100644 --- a/src/mainboard/google/veyron_mighty/Kconfig +++ b/src/mainboard/google/veyron_mighty/Kconfig @@ -22,11 +22,9 @@ if BOARD_GOOGLE_VEYRON_MIGHTY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC if CHROMEOS + select EC_SOFTWARE_SYNC if CHROMEOS + config MAINBOARD_DIR string default google/veyron_mighty diff --git a/src/mainboard/google/veyron_minnie/Kconfig b/src/mainboard/google/veyron_minnie/Kconfig index a2d4846..930a1ba 100644 --- a/src/mainboard/google/veyron_minnie/Kconfig +++ b/src/mainboard/google/veyron_minnie/Kconfig @@ -23,11 +23,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_minnie diff --git a/src/mainboard/google/veyron_pinky/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig index 4b0d471..818b525 100644 --- a/src/mainboard/google/veyron_pinky/Kconfig +++ b/src/mainboard/google/veyron_pinky/Kconfig @@ -22,11 +22,9 @@ if BOARD_GOOGLE_VEYRON_PINKY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_pinky diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig index 0061bfa..a038184 100644 --- a/src/mainboard/google/veyron_rialto/Kconfig +++ b/src/mainboard/google/veyron_rialto/Kconfig @@ -23,12 +23,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH @@ -36,6 +34,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH + config MAINBOARD_DIR string default google/veyron_rialto diff --git a/src/mainboard/google/veyron_romy/Kconfig b/src/mainboard/google/veyron_romy/Kconfig index b7f05d7..1570cee 100644 --- a/src/mainboard/google/veyron_romy/Kconfig +++ b/src/mainboard/google/veyron_romy/Kconfig @@ -27,14 +27,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH + +config CHROMEOS select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH config MAINBOARD_DIR string diff --git a/src/mainboard/google/veyron_shark/Kconfig b/src/mainboard/google/veyron_shark/Kconfig index 0cefbc6..01068bf 100644 --- a/src/mainboard/google/veyron_shark/Kconfig +++ b/src/mainboard/google/veyron_shark/Kconfig @@ -23,11 +23,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_shark diff --git a/src/mainboard/google/veyron_speedy/Kconfig b/src/mainboard/google/veyron_speedy/Kconfig index d4003dc..882571c 100644 --- a/src/mainboard/google/veyron_speedy/Kconfig +++ b/src/mainboard/google/veyron_speedy/Kconfig @@ -23,11 +23,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_speedy diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig index f916138..47aca1a 100644 --- a/src/mainboard/intel/baskingridge/Kconfig +++ b/src/mainboard/intel/baskingridge/Kconfig @@ -13,6 +13,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig index 74b8270..90b40ac 100644 --- a/src/mainboard/intel/emeraldlake2/Kconfig +++ b/src/mainboard/intel/emeraldlake2/Kconfig @@ -12,6 +12,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select INTEL_INT15 #select MAINBOARD_HAS_CHROMEOS + +config CHROMEOS #select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig index 78d4081..7c08497 100644 --- a/src/mainboard/intel/kunimitsu/Kconfig +++ b/src/mainboard/intel/kunimitsu/Kconfig @@ -5,8 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_16384 select CACHE_ROM select CHROMEOS - select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_MEC @@ -15,15 +13,19 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE select HAVE_SMI_HANDLER - select LID_SWITCH select MAINBOARD_HAS_CHROMEOS select MARK_GRAPHICS_MEM_WRCOMB select MMCONF_SUPPORT select MONOTONIC_TIMER_MSR select SOC_INTEL_SKYLAKE - select VBOOT_OPROM_MATTERS select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_RAMOOPS_DYNAMIC + select CHROMEOS_VBNV_CMOS + select LID_SWITCH + select VBOOT_OPROM_MATTERS + config IRQ_SLOT_COUNT int default 18 diff --git a/src/mainboard/intel/sklrvp/Kconfig b/src/mainboard/intel/sklrvp/Kconfig index 601efb0..f1d4e84 100644 --- a/src/mainboard/intel/sklrvp/Kconfig +++ b/src/mainboard/intel/sklrvp/Kconfig @@ -5,8 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_16384 select CACHE_ROM select CHROMEOS - select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -19,7 +17,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOC_INTEL_SKYLAKE select VBOOT_DYNAMIC_WORK_BUFFER select VIRTUAL_DEV_SWITCH + +config CHROMEOS select LID_SWITCH + select CHROMEOS_RAMOOPS_DYNAMIC + select CHROMEOS_VBNV_CMOS config IRQ_SLOT_COUNT int diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index c19761a..b6da5ec 100755 --- a/src/mainboard/intel/strago/Kconfig +++ b/src/mainboard/intel/strago/Kconfig @@ -6,11 +6,9 @@ config BOARD_SPECIFIC_OPTIONS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 select CHROMEOS - select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP - select EC_SOFTWARE_SYNC select ENABLE_BUILTIN_COM1 select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES @@ -20,7 +18,11 @@ config BOARD_SPECIFIC_OPTIONS select SOC_INTEL_BRASWELL select VBOOT_DYNAMIC_WORK_BUFFER select VIRTUAL_DEV_SWITCH + +config CHROMEOS select LID_SWITCH + select CHROMEOS_VBNV_CMOS + select EC_SOFTWARE_SYNC config DISPLAY_SPD_DATA diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig index b8f616a..e739efa 100644 --- a/src/mainboard/intel/wtm2/Kconfig +++ b/src/mainboard/intel/wtm2/Kconfig @@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select INTEL_INT15 +config CHROMEOS select CHROMEOS_RAMOOPS_DYNAMIC select CHROMEOS_VBNV_CMOS diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index fed4610..e144545 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -20,6 +20,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select DRIVERS_GENERIC_IOAPIC select INTEL_INT15 select HAVE_MRC + +config CHROMEOS select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig index f749c39..874dd6c 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -12,14 +12,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_BD82X6X select SUPERIO_ITE_IT8772F - select PHYSICAL_REC_SWITCH # LPC47N207 selected for external LPC card # not on board, should be made selectable. select SUPERIO_SMSC_LPC47N207 select HAVE_MRC + select INTEL_INT15 + +config CHROMEOS + select PHYSICAL_REC_SWITCH select CHROMEOS_VBNV_CMOS - select INTEL_INT15 config MAINBOARD_DIR string default samsung/stumpy diff --git a/src/soc/broadcom/cygnus/Kconfig b/src/soc/broadcom/cygnus/Kconfig index 7ab305c..75df786 100644 --- a/src/soc/broadcom/cygnus/Kconfig +++ b/src/soc/broadcom/cygnus/Kconfig @@ -29,12 +29,14 @@ config SOC_BROADCOM_CYGNUS select HAVE_MONOTONIC_TIMER select HAVE_UART_SPECIAL select HAS_PRECBMEM_TIMESTAMP_REGION - select SEPARATE_VERSTAGE - select RETURN_FROM_VERSTAGE select GENERIC_GPIO_LIB if SOC_BROADCOM_CYGNUS +config CHROMEOS + select SEPARATE_VERSTAGE + select RETURN_FROM_VERSTAGE + config BOOTBLOCK_CPU_INIT string default "soc/broadcom/cygnus/bootblock.c" diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig index 930645e..45a2abb 100644 --- a/src/soc/marvell/bg4cd/Kconfig +++ b/src/soc/marvell/bg4cd/Kconfig @@ -29,10 +29,12 @@ config SOC_MARVELL_BG4CD select GENERIC_UDELAY select HAVE_MONOTONIC_TIMER select GENERIC_GPIO_LIB - select VBOOT_STARTS_IN_BOOTBLOCK if SOC_MARVELL_BG4CD +config CHROMEOS + select VBOOT_STARTS_IN_BOOTBLOCK + config BOOTBLOCK_CPU_INIT string default "soc/marvell/bg4cd/bootblock.c" diff --git a/src/soc/nvidia/tegra210/Kconfig b/src/soc/nvidia/tegra210/Kconfig index 7aff588..f899803 100644 --- a/src/soc/nvidia/tegra210/Kconfig +++ b/src/soc/nvidia/tegra210/Kconfig @@ -16,11 +16,13 @@ config SOC_NVIDIA_TEGRA210 select ARM_BOOTBLOCK_CUSTOM select ARM64_USE_ARM_TRUSTED_FIRMWARE select HAS_PRECBMEM_TIMESTAMP_REGION - select CHROMEOS_RAMOOPS_NON_ACPI select GENERIC_GPIO_LIB if SOC_NVIDIA_TEGRA210 +config CHROMEOS + select CHROMEOS_RAMOOPS_NON_ACPI + config MAINBOARD_DO_DSI_INIT bool "Use dsi graphics interface" depends on MAINBOARD_DO_NATIVE_VGA_INIT diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig index 9a1e4f9..dd60d63 100644 --- a/src/soc/qualcomm/ipq806x/Kconfig +++ b/src/soc/qualcomm/ipq806x/Kconfig @@ -6,16 +6,18 @@ config SOC_QC_IPQ806X select ARCH_ROMSTAGE_ARMV7 select ARCH_RAMSTAGE_ARMV7 select BOOTBLOCK_CONSOLE - select CHROMEOS_VBNV_FLASH select HAS_PRECBMEM_TIMESTAMP_REGION select HAVE_UART_SPECIAL select SPI_ATOMIC_SEQUENCING select GENERIC_GPIO_LIB - select SEPARATE_VERSTAGE - select RETURN_FROM_VERSTAGE if SOC_QC_IPQ806X +config CHROMEOS + select CHROMEOS_VBNV_FLASH + select SEPARATE_VERSTAGE + select RETURN_FROM_VERSTAGE + config MBN_ENCAPSULATION depends on USE_BLOBS bool "bootblock encapsulation for ipq8064" diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig index 1800b16..bc484e3 100644 --- a/src/soc/rockchip/rk3288/Kconfig +++ b/src/soc/rockchip/rk3288/Kconfig @@ -32,12 +32,14 @@ config SOC_ROCKCHIP_RK3288 select UNCOMPRESSED_RAMSTAGE select GENERIC_GPIO_LIB select RTC + +if SOC_ROCKCHIP_RK3288 + +config CHROMEOS select VBOOT_STARTS_IN_BOOTBLOCK select SEPARATE_VERSTAGE select RETURN_FROM_VERSTAGE -if SOC_ROCKCHIP_RK3288 - config BOOTBLOCK_CPU_INIT string default "soc/rockchip/rk3288/bootblock.c"

1 0

Patch set updated for coreboot: ChromeOS: Fix Kconfig dependencies
by Martin Roth 19 Aug '15

19 Aug '15

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11272 -gerrit commit 009d254b6bddf061c624ac2838f8340fa94661a1 Author: Martin Roth <martinroth(a)google.com> Date: Tue Aug 18 14:22:58 2015 -0600 ChromeOS: Fix Kconfig dependencies Add CHROMEOS dependencies to selects for the following Kconfig symbols: CHROMEOS_RAMOOPS_DYNAMIC CHROMEOS_RAMOOPS_NON_ACPI CHROMEOS_VBNV_CMOS CHROMEOS_VBNV_EC CHROMEOS_VBNV_FLASH EC_SOFTWARE_SYNC LID_SWITCH RETURN_FROM_VERSTAGE SEPARATE_VERSTAGE VBOOT_DISABLE_DEV_ON_RECOVERY VBOOT_EC_SLOW_UPDATE VBOOT_OPROM_MATTERS VBOOT_STARTS_IN_BOOTBLOCK WIPEOUT_SUPPORTED This gets rid of these sorts of Kconfig errors: warning: BOARD_SPECIFIC_OPTIONS selects CHROMEOS_VBNV_EC which has unmet direct dependencies (MAINBOARD_HAS_CHROMEOS && CHROMEOS) Note: These two boards would never actually have CHROMEOS enabled: intel/emeraldlake2 has MAINBOARD_HAS_CHROMEOS commented out google/peach_pit doesn't have MAINBOARD_HAS_CHROMEOS Change-Id: I51b4ee326f082c6a656a813ee5772e9c34f5c343 Signed-off-by: Martin Roth <martinroth(a)google.com> --- src/mainboard/google/auron/Kconfig | 6 ++++-- src/mainboard/google/bolt/Kconfig | 4 +++- src/mainboard/google/butterfly/Kconfig | 6 +++--- src/mainboard/google/cosmos/Kconfig | 4 +++- src/mainboard/google/cyan/Kconfig | 6 ++++-- src/mainboard/google/daisy/Kconfig | 2 ++ src/mainboard/google/falco/Kconfig | 4 +++- src/mainboard/google/foster/Kconfig | 4 +++- src/mainboard/google/glados/Kconfig | 12 +++++++----- src/mainboard/google/jecht/Kconfig | 4 +++- src/mainboard/google/link/Kconfig | 2 ++ src/mainboard/google/nyan/Kconfig | 4 +++- src/mainboard/google/nyan_big/Kconfig | 4 +++- src/mainboard/google/nyan_blaze/Kconfig | 4 +++- src/mainboard/google/panther/Kconfig | 2 ++ src/mainboard/google/parrot/Kconfig | 2 ++ src/mainboard/google/peach_pit/Kconfig | 2 ++ src/mainboard/google/peppy/Kconfig | 4 +++- src/mainboard/google/purin/Kconfig | 4 +++- src/mainboard/google/rambi/Kconfig | 4 +++- src/mainboard/google/rush/Kconfig | 6 ++++-- src/mainboard/google/rush_ryu/Kconfig | 4 +++- src/mainboard/google/samus/Kconfig | 10 ++++++---- src/mainboard/google/slippy/Kconfig | 4 +++- src/mainboard/google/smaug/Kconfig | 6 ++++-- src/mainboard/google/storm/Kconfig | 6 ++++-- src/mainboard/google/stout/Kconfig | 2 ++ src/mainboard/google/veyron_brain/Kconfig | 4 +++- src/mainboard/google/veyron_danger/Kconfig | 6 ++++-- src/mainboard/google/veyron_jerry/Kconfig | 6 ++++-- src/mainboard/google/veyron_mickey/Kconfig | 4 +++- src/mainboard/google/veyron_mighty/Kconfig | 6 ++++-- src/mainboard/google/veyron_minnie/Kconfig | 6 ++++-- src/mainboard/google/veyron_pinky/Kconfig | 6 ++++-- src/mainboard/google/veyron_rialto/Kconfig | 6 ++++-- src/mainboard/google/veyron_romy/Kconfig | 4 +++- src/mainboard/google/veyron_shark/Kconfig | 6 ++++-- src/mainboard/google/veyron_speedy/Kconfig | 6 ++++-- src/mainboard/intel/baskingridge/Kconfig | 2 ++ src/mainboard/intel/emeraldlake2/Kconfig | 2 ++ src/mainboard/intel/kunimitsu/Kconfig | 10 ++++++---- src/mainboard/intel/sklrvp/Kconfig | 6 ++++-- src/mainboard/intel/strago/Kconfig | 6 ++++-- src/mainboard/intel/wtm2/Kconfig | 1 + src/mainboard/samsung/lumpy/Kconfig | 2 ++ src/mainboard/samsung/stumpy/Kconfig | 4 +++- src/soc/broadcom/cygnus/Kconfig | 6 ++++-- src/soc/marvell/bg4cd/Kconfig | 4 +++- src/soc/nvidia/tegra210/Kconfig | 4 +++- src/soc/qualcomm/ipq806x/Kconfig | 8 +++++--- src/soc/rockchip/rk3288/Kconfig | 6 ++++-- 51 files changed, 171 insertions(+), 72 deletions(-) diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig index 3a4cb7e..7ad3eaa 100644 --- a/src/mainboard/google/auron/Kconfig +++ b/src/mainboard/google/auron/Kconfig @@ -5,7 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOC_INTEL_BROADWELL select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -14,10 +13,13 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select CHROMEOS_RAMOOPS_DYNAMIC select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select CHROMEOS_RAMOOPS_DYNAMIC + select EC_SOFTWARE_SYNC config VBOOT_RAMSTAGE_INDEX hex diff --git a/src/mainboard/google/bolt/Kconfig b/src/mainboard/google/bolt/Kconfig index 2e37e25..0599d15 100644 --- a/src/mainboard/google/bolt/Kconfig +++ b/src/mainboard/google/bolt/Kconfig @@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -18,8 +17,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index b1a64ee..0c37565 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -15,10 +15,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 - select CHROMEOS_VBNV_CMOS + select SERIRQ_CONTINUOUS_MODE # Workaround for EC/KBC IRQ1. - # Workaround for EC/KBC IRQ1. - select SERIRQ_CONTINUOUS_MODE +config CHROMEOS + select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR string diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig index a6c87b1..70a5e09 100644 --- a/src/mainboard/google/cosmos/Kconfig +++ b/src/mainboard/google/cosmos/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_2048 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_HAS_CHROMEOS @@ -31,6 +30,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH select SPI_FLASH_SPANSION +config CHROMEOS + select CHROMEOS_VBNV_FLASH + config MAINBOARD_DIR string default google/cosmos diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index 91f7587..8648986 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -6,11 +6,9 @@ config BOARD_SPECIFIC_OPTIONS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 select CHROMEOS - select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP - select EC_SOFTWARE_SYNC select ENABLE_BUILTIN_COM1 select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -20,7 +18,11 @@ config BOARD_SPECIFIC_OPTIONS select VBOOT_DYNAMIC_WORK_BUFFER select VIRTUAL_DEV_SWITCH select HAVE_ACPI_RESUME + +config CHROMEOS select LID_SWITCH + select CHROMEOS_VBNV_CMOS + select EC_SOFTWARE_SYNC config DISPLAY_SPD_DATA bool "Display Memory Serial Presence Detect Data" diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig index c69c390..5c3b643 100644 --- a/src/mainboard/google/daisy/Kconfig +++ b/src/mainboard/google/daisy/Kconfig @@ -30,6 +30,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select DRIVER_TI_TPS65090 select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT + +config CHROMEOS select CHROMEOS_VBNV_EC config MAINBOARD_DIR diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig index e029382..cbcd57d 100644 --- a/src/mainboard/google/falco/Kconfig +++ b/src/mainboard/google/falco/Kconfig @@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -21,8 +20,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig index b8fe708..373cb07 100644 --- a/src/mainboard/google/foster/Kconfig +++ b/src/mainboard/google/foster/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_FLASH select SPI_FLASH select SOC_NVIDIA_TEGRA210 select MAINBOARD_HAS_CHROMEOS @@ -32,6 +31,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy select COMMON_CBFS_SPI_WRAPPER select SPI_FLASH_WINBOND +config CHROMEOS + select CHROMEOS_VBNV_FLASH + config MAINBOARD_DIR string default google/foster diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index c7df2a3..fac3cc2 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -5,26 +5,28 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_16384 select CACHE_ROM select CHROMEOS - select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP - select EC_SOFTWARE_SYNC select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE select HAVE_SMI_HANDLER - select LID_SWITCH select MAINBOARD_HAS_CHROMEOS select MARK_GRAPHICS_MEM_WRCOMB select MMCONF_SUPPORT select MONOTONIC_TIMER_MSR select SOC_INTEL_SKYLAKE - select VBOOT_OPROM_MATTERS select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_RAMOOPS_DYNAMIC + select CHROMEOS_VBNV_CMOS + select EC_SOFTWARE_SYNC + select LID_SWITCH + select VBOOT_OPROM_MATTERS + config IRQ_SLOT_COUNT int default 18 diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig index 83b091d..90e9cea 100644 --- a/src/mainboard/google/jecht/Kconfig +++ b/src/mainboard/google/jecht/Kconfig @@ -13,10 +13,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select CHROMEOS_RAMOOPS_DYNAMIC select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select PHYSICAL_REC_SWITCH + select CHROMEOS_RAMOOPS_DYNAMIC config MAINBOARD_DIR string diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index fd3390a..ac06a62 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -15,6 +15,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_LPC_TPM select SERIRQ_CONTINUOUS_MODE select MAINBOARD_HAS_NATIVE_VGA_INIT + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig index d771ca6..bd390e4 100644 --- a/src/mainboard/google/nyan/Kconfig +++ b/src/mainboard/google/nyan/Kconfig @@ -25,14 +25,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select TEGRA124_MODEL_CD570M select MAINBOARD_DO_NATIVE_VGA_INIT select BOARD_ROMSIZE_KB_4096 select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B select VIRTUAL_DEV_SWITCH + +config CHROMEOS select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig index 55ded30..e187a66 100644 --- a/src/mainboard/google/nyan_big/Kconfig +++ b/src/mainboard/google/nyan_big/Kconfig @@ -26,13 +26,15 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select TEGRA124_MODEL_CD570M select MAINBOARD_DO_NATIVE_VGA_INIT select BOARD_ROMSIZE_KB_4096 select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B select VIRTUAL_DEV_SWITCH + +config CHROMEOS + select EC_SOFTWARE_SYNC select CHROMEOS_VBNV_EC config MAINBOARD_DIR diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig index 5316523..29191f2 100644 --- a/src/mainboard/google/nyan_blaze/Kconfig +++ b/src/mainboard/google/nyan_blaze/Kconfig @@ -25,7 +25,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select SOC_NVIDIA_TEGRA124 select TEGRA124_MODEL_CD570M select MAINBOARD_HAS_CHROMEOS @@ -34,6 +33,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B select VIRTUAL_DEV_SWITCH + +config CHROMEOS + select EC_SOFTWARE_SYNC select CHROMEOS_VBNV_EC config MAINBOARD_DIR diff --git a/src/mainboard/google/panther/Kconfig b/src/mainboard/google/panther/Kconfig index 6fb6c5f..85bc1ff 100644 --- a/src/mainboard/google/panther/Kconfig +++ b/src/mainboard/google/panther/Kconfig @@ -17,6 +17,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select PHYSICAL_REC_SWITCH select CHROMEOS_VBNV_CMOS diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index 9cf390a..56ebf86 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -14,6 +14,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS # Workaround for EC/KBC IRQ1. diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig index 3a94dec..016ecb9 100644 --- a/src/mainboard/google/peach_pit/Kconfig +++ b/src/mainboard/google/peach_pit/Kconfig @@ -28,6 +28,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select DRIVER_PARADE_PS8625 + +config CHROMEOS select CHROMEOS_VBNV_EC config MAINBOARD_DIR diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig index b507953..66203ce 100644 --- a/src/mainboard/google/peppy/Kconfig +++ b/src/mainboard/google/peppy/Kconfig @@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -23,8 +22,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_DP select INTEL_DDI select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/purin/Kconfig b/src/mainboard/google/purin/Kconfig index be6d050..67aaca5 100644 --- a/src/mainboard/google/purin/Kconfig +++ b/src/mainboard/google/purin/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_2048 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_HAS_CHROMEOS @@ -33,6 +32,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_STMICRO # required for the reference board BCM958305K select SPI_ATOMIC_SEQUENCING +config CHROMEOS + select CHROMEOS_VBNV_FLASH + config MAINBOARD_DIR string default google/purin diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index 45c3ece..9459675 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -4,7 +4,6 @@ config BOARD_SPECIFIC_OPTIONS def_bool y select SOC_INTEL_BAYTRAIL select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select ENABLE_BUILTIN_COM1 select BOARD_ROMSIZE_KB_8192 @@ -15,8 +14,11 @@ config BOARD_SPECIFIC_OPTIONS select MAINBOARD_HAS_LPC_TPM select VGA_ROM_RUN if !PAYLOAD_SEABIOS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig index cee8afa..8bb2098 100644 --- a/src/mainboard/google/rush/Kconfig +++ b/src/mainboard/google/rush/Kconfig @@ -24,7 +24,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SOC_NVIDIA_TEGRA132 @@ -33,7 +32,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select VIRTUAL_DEV_SWITCH select BOARD_ROMSIZE_KB_4096 select ARM64_USE_SPINTABLE - select CHROMEOS_VBNV_EC + +config CHROMEOS + select CHROMEOS_VBNV_EC if CHROMEOS + select EC_SOFTWARE_SYNC if CHROMEOS config MAINBOARD_DIR string diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig index a91b9ea..6205f2d 100644 --- a/src/mainboard/google/rush_ryu/Kconfig +++ b/src/mainboard/google/rush_ryu/Kconfig @@ -25,7 +25,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_I2C select EC_GOOGLE_CHROMEEC_I2C_PROTO3 - select EC_SOFTWARE_SYNC select MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SOC_NVIDIA_TEGRA132 @@ -34,7 +33,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_8192 select VIRTUAL_DEV_SWITCH select ARM64_USE_SPINTABLE + +config CHROMEOS select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/samus/Kconfig b/src/mainboard/google/samus/Kconfig index 0b4d74d..e45b22f 100644 --- a/src/mainboard/google/samus/Kconfig +++ b/src/mainboard/google/samus/Kconfig @@ -5,9 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOC_INTEL_BROADWELL select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC - select VBOOT_EC_SLOW_UPDATE - select VBOOT_OPROM_MATTERS select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -16,10 +13,15 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select CHROMEOS_RAMOOPS_DYNAMIC select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC + select VBOOT_EC_SLOW_UPDATE + select VBOOT_OPROM_MATTERS + select CHROMEOS_RAMOOPS_DYNAMIC config MAINBOARD_DIR string diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index ba83683..8f9f518 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -20,8 +19,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_DP select INTEL_DDI select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS select LID_SWITCH + select EC_SOFTWARE_SYNC config MAINBOARD_DIR string diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig index 29dae4f..0fe9f68 100644 --- a/src/mainboard/google/smaug/Kconfig +++ b/src/mainboard/google/smaug/Kconfig @@ -23,12 +23,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_16384 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_I2C select EC_GOOGLE_CHROMEEC_I2C_PROTO3 - select EC_SOFTWARE_SYNC select MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SPI_FLASH_WINBOND @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select VIRTUAL_DEV_SWITCH select RAM_CODE_SUPPORT +config CHROMEOS + select CHROMEOS_VBNV_FLASH + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/smaug diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig index 55cc5ba..404ab4d 100644 --- a/src/mainboard/google/storm/Kconfig +++ b/src/mainboard/google/storm/Kconfig @@ -31,12 +31,14 @@ config BOARD_SPECIFIC_OPTIONS select SPI_FLASH select SPI_FLASH_SPANSION select SPI_FLASH_STMICRO - select VBOOT_DISABLE_DEV_ON_RECOVERY select VIRTUAL_DEV_SWITCH - select WIPEOUT_SUPPORTED select DRIVERS_UART select CONSOLE_CBMEM_DUMP_TO_UART +config CHROMEOS + select VBOOT_DISABLE_DEV_ON_RECOVERY + select WIPEOUT_SUPPORTED + config BOARD_VARIANT_AP148 bool "pick this to build an image for ap148" default n diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig index eca83da..3f73295 100644 --- a/src/mainboard/google/stout/Kconfig +++ b/src/mainboard/google/stout/Kconfig @@ -15,6 +15,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig index e76496b..eb70f3a 100644 --- a/src/mainboard/google/veyron_brain/Kconfig +++ b/src/mainboard/google/veyron_brain/Kconfig @@ -27,14 +27,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH + +config CHROMEOS select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH config MAINBOARD_DIR string diff --git a/src/mainboard/google/veyron_danger/Kconfig b/src/mainboard/google/veyron_danger/Kconfig index e2128eb..8160046 100644 --- a/src/mainboard/google/veyron_danger/Kconfig +++ b/src/mainboard/google/veyron_danger/Kconfig @@ -23,18 +23,20 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND +config CHROMEOS + select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH + config MAINBOARD_DIR string default google/veyron_danger diff --git a/src/mainboard/google/veyron_jerry/Kconfig b/src/mainboard/google/veyron_jerry/Kconfig index 3e65e67..566e0a9 100644 --- a/src/mainboard/google/veyron_jerry/Kconfig +++ b/src/mainboard/google/veyron_jerry/Kconfig @@ -22,11 +22,9 @@ if BOARD_GOOGLE_VEYRON_JERRY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_jerry diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig index 9233a91..3c90dcc 100644 --- a/src/mainboard/google/veyron_mickey/Kconfig +++ b/src/mainboard/google/veyron_mickey/Kconfig @@ -27,14 +27,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH + +config CHROMEOS select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH config MAINBOARD_DIR string diff --git a/src/mainboard/google/veyron_mighty/Kconfig b/src/mainboard/google/veyron_mighty/Kconfig index 90cdbb5..8ee9126 100644 --- a/src/mainboard/google/veyron_mighty/Kconfig +++ b/src/mainboard/google/veyron_mighty/Kconfig @@ -22,11 +22,9 @@ if BOARD_GOOGLE_VEYRON_MIGHTY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC if CHROMEOS + select EC_SOFTWARE_SYNC if CHROMEOS + config MAINBOARD_DIR string default google/veyron_mighty diff --git a/src/mainboard/google/veyron_minnie/Kconfig b/src/mainboard/google/veyron_minnie/Kconfig index a2d4846..930a1ba 100644 --- a/src/mainboard/google/veyron_minnie/Kconfig +++ b/src/mainboard/google/veyron_minnie/Kconfig @@ -23,11 +23,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_minnie diff --git a/src/mainboard/google/veyron_pinky/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig index 4b0d471..818b525 100644 --- a/src/mainboard/google/veyron_pinky/Kconfig +++ b/src/mainboard/google/veyron_pinky/Kconfig @@ -22,11 +22,9 @@ if BOARD_GOOGLE_VEYRON_PINKY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_pinky diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig index 0061bfa..a038184 100644 --- a/src/mainboard/google/veyron_rialto/Kconfig +++ b/src/mainboard/google/veyron_rialto/Kconfig @@ -23,12 +23,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH @@ -36,6 +34,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH + config MAINBOARD_DIR string default google/veyron_rialto diff --git a/src/mainboard/google/veyron_romy/Kconfig b/src/mainboard/google/veyron_romy/Kconfig index b7f05d7..1570cee 100644 --- a/src/mainboard/google/veyron_romy/Kconfig +++ b/src/mainboard/google/veyron_romy/Kconfig @@ -27,14 +27,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH + +config CHROMEOS select CHROMEOS_VBNV_FLASH + select PHYSICAL_REC_SWITCH config MAINBOARD_DIR string diff --git a/src/mainboard/google/veyron_shark/Kconfig b/src/mainboard/google/veyron_shark/Kconfig index 0cefbc6..01068bf 100644 --- a/src/mainboard/google/veyron_shark/Kconfig +++ b/src/mainboard/google/veyron_shark/Kconfig @@ -23,11 +23,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_shark diff --git a/src/mainboard/google/veyron_speedy/Kconfig b/src/mainboard/google/veyron_speedy/Kconfig index d4003dc..882571c 100644 --- a/src/mainboard/google/veyron_speedy/Kconfig +++ b/src/mainboard/google/veyron_speedy/Kconfig @@ -23,11 +23,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT @@ -38,6 +36,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_VBNV_EC + select EC_SOFTWARE_SYNC + config MAINBOARD_DIR string default google/veyron_speedy diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig index f916138..47aca1a 100644 --- a/src/mainboard/intel/baskingridge/Kconfig +++ b/src/mainboard/intel/baskingridge/Kconfig @@ -13,6 +13,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 + +config CHROMEOS select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig index 74b8270..90b40ac 100644 --- a/src/mainboard/intel/emeraldlake2/Kconfig +++ b/src/mainboard/intel/emeraldlake2/Kconfig @@ -12,6 +12,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select INTEL_INT15 #select MAINBOARD_HAS_CHROMEOS + +config CHROMEOS #select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig index 78d4081..7c08497 100644 --- a/src/mainboard/intel/kunimitsu/Kconfig +++ b/src/mainboard/intel/kunimitsu/Kconfig @@ -5,8 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_16384 select CACHE_ROM select CHROMEOS - select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_MEC @@ -15,15 +13,19 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE select HAVE_SMI_HANDLER - select LID_SWITCH select MAINBOARD_HAS_CHROMEOS select MARK_GRAPHICS_MEM_WRCOMB select MMCONF_SUPPORT select MONOTONIC_TIMER_MSR select SOC_INTEL_SKYLAKE - select VBOOT_OPROM_MATTERS select VIRTUAL_DEV_SWITCH +config CHROMEOS + select CHROMEOS_RAMOOPS_DYNAMIC + select CHROMEOS_VBNV_CMOS + select LID_SWITCH + select VBOOT_OPROM_MATTERS + config IRQ_SLOT_COUNT int default 18 diff --git a/src/mainboard/intel/sklrvp/Kconfig b/src/mainboard/intel/sklrvp/Kconfig index 601efb0..f1d4e84 100644 --- a/src/mainboard/intel/sklrvp/Kconfig +++ b/src/mainboard/intel/sklrvp/Kconfig @@ -5,8 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_16384 select CACHE_ROM select CHROMEOS - select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -19,7 +17,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOC_INTEL_SKYLAKE select VBOOT_DYNAMIC_WORK_BUFFER select VIRTUAL_DEV_SWITCH + +config CHROMEOS select LID_SWITCH + select CHROMEOS_RAMOOPS_DYNAMIC + select CHROMEOS_VBNV_CMOS config IRQ_SLOT_COUNT int diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index c19761a..b6da5ec 100755 --- a/src/mainboard/intel/strago/Kconfig +++ b/src/mainboard/intel/strago/Kconfig @@ -6,11 +6,9 @@ config BOARD_SPECIFIC_OPTIONS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 select CHROMEOS - select CHROMEOS_VBNV_CMOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP - select EC_SOFTWARE_SYNC select ENABLE_BUILTIN_COM1 select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES @@ -20,7 +18,11 @@ config BOARD_SPECIFIC_OPTIONS select SOC_INTEL_BRASWELL select VBOOT_DYNAMIC_WORK_BUFFER select VIRTUAL_DEV_SWITCH + +config CHROMEOS select LID_SWITCH + select CHROMEOS_VBNV_CMOS + select EC_SOFTWARE_SYNC config DISPLAY_SPD_DATA diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig index b8f616a..e739efa 100644 --- a/src/mainboard/intel/wtm2/Kconfig +++ b/src/mainboard/intel/wtm2/Kconfig @@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select INTEL_INT15 +config CHROMEOS select CHROMEOS_RAMOOPS_DYNAMIC select CHROMEOS_VBNV_CMOS diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index fed4610..e144545 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -20,6 +20,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select DRIVERS_GENERIC_IOAPIC select INTEL_INT15 select HAVE_MRC + +config CHROMEOS select CHROMEOS_VBNV_CMOS config MAINBOARD_DIR diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig index f749c39..4bc4823 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -12,11 +12,13 @@ config BOARD_SPECIFIC_OPTIONS # dummy select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_BD82X6X select SUPERIO_ITE_IT8772F - select PHYSICAL_REC_SWITCH # LPC47N207 selected for external LPC card # not on board, should be made selectable. select SUPERIO_SMSC_LPC47N207 select HAVE_MRC + +config CHROMEOS + select PHYSICAL_REC_SWITCH select CHROMEOS_VBNV_CMOS select INTEL_INT15 diff --git a/src/soc/broadcom/cygnus/Kconfig b/src/soc/broadcom/cygnus/Kconfig index 7ab305c..75df786 100644 --- a/src/soc/broadcom/cygnus/Kconfig +++ b/src/soc/broadcom/cygnus/Kconfig @@ -29,12 +29,14 @@ config SOC_BROADCOM_CYGNUS select HAVE_MONOTONIC_TIMER select HAVE_UART_SPECIAL select HAS_PRECBMEM_TIMESTAMP_REGION - select SEPARATE_VERSTAGE - select RETURN_FROM_VERSTAGE select GENERIC_GPIO_LIB if SOC_BROADCOM_CYGNUS +config CHROMEOS + select SEPARATE_VERSTAGE + select RETURN_FROM_VERSTAGE + config BOOTBLOCK_CPU_INIT string default "soc/broadcom/cygnus/bootblock.c" diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig index 930645e..45a2abb 100644 --- a/src/soc/marvell/bg4cd/Kconfig +++ b/src/soc/marvell/bg4cd/Kconfig @@ -29,10 +29,12 @@ config SOC_MARVELL_BG4CD select GENERIC_UDELAY select HAVE_MONOTONIC_TIMER select GENERIC_GPIO_LIB - select VBOOT_STARTS_IN_BOOTBLOCK if SOC_MARVELL_BG4CD +config CHROMEOS + select VBOOT_STARTS_IN_BOOTBLOCK + config BOOTBLOCK_CPU_INIT string default "soc/marvell/bg4cd/bootblock.c" diff --git a/src/soc/nvidia/tegra210/Kconfig b/src/soc/nvidia/tegra210/Kconfig index 7aff588..f899803 100644 --- a/src/soc/nvidia/tegra210/Kconfig +++ b/src/soc/nvidia/tegra210/Kconfig @@ -16,11 +16,13 @@ config SOC_NVIDIA_TEGRA210 select ARM_BOOTBLOCK_CUSTOM select ARM64_USE_ARM_TRUSTED_FIRMWARE select HAS_PRECBMEM_TIMESTAMP_REGION - select CHROMEOS_RAMOOPS_NON_ACPI select GENERIC_GPIO_LIB if SOC_NVIDIA_TEGRA210 +config CHROMEOS + select CHROMEOS_RAMOOPS_NON_ACPI + config MAINBOARD_DO_DSI_INIT bool "Use dsi graphics interface" depends on MAINBOARD_DO_NATIVE_VGA_INIT diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig index 9a1e4f9..dd60d63 100644 --- a/src/soc/qualcomm/ipq806x/Kconfig +++ b/src/soc/qualcomm/ipq806x/Kconfig @@ -6,16 +6,18 @@ config SOC_QC_IPQ806X select ARCH_ROMSTAGE_ARMV7 select ARCH_RAMSTAGE_ARMV7 select BOOTBLOCK_CONSOLE - select CHROMEOS_VBNV_FLASH select HAS_PRECBMEM_TIMESTAMP_REGION select HAVE_UART_SPECIAL select SPI_ATOMIC_SEQUENCING select GENERIC_GPIO_LIB - select SEPARATE_VERSTAGE - select RETURN_FROM_VERSTAGE if SOC_QC_IPQ806X +config CHROMEOS + select CHROMEOS_VBNV_FLASH + select SEPARATE_VERSTAGE + select RETURN_FROM_VERSTAGE + config MBN_ENCAPSULATION depends on USE_BLOBS bool "bootblock encapsulation for ipq8064" diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig index 1800b16..bc484e3 100644 --- a/src/soc/rockchip/rk3288/Kconfig +++ b/src/soc/rockchip/rk3288/Kconfig @@ -32,12 +32,14 @@ config SOC_ROCKCHIP_RK3288 select UNCOMPRESSED_RAMSTAGE select GENERIC_GPIO_LIB select RTC + +if SOC_ROCKCHIP_RK3288 + +config CHROMEOS select VBOOT_STARTS_IN_BOOTBLOCK select SEPARATE_VERSTAGE select RETURN_FROM_VERSTAGE -if SOC_ROCKCHIP_RK3288 - config BOOTBLOCK_CPU_INIT string default "soc/rockchip/rk3288/bootblock.c"

1 0

Patch merged into coreboot/master: libpayload: Fix default_memmove() implementation
by gerrit＠coreboot.org 19 Aug '15

19 Aug '15

the following patch was just integrated into master: commit f58746bd33f28bc7625e4fd6b166b6f977253c7d Author: Nico Huber <nico.huber(a)secunet.com> Date: Wed Aug 19 17:22:26 2015 +0200 libpayload: Fix default_memmove() implementation If I wanted to fill the whole memory address space with one byte, I wouldn't try it that subtle. With size_t beeing unsigned the loop condition >= 0 was always true. Change-Id: Idee6a4901f6697093c88bda354b5e43066c0d948 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: http://review.coreboot.org/11286 Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> Tested-by: build bot (Jenkins) See http://review.coreboot.org/11286 for details. -gerrit

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit August 2015