[coreboot-gerrit] Patch set updated for coreboot: 7ff34ce Add option to disable ChromeOS
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Mon Dec 2 18:42:13 CET 2013
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3977
-gerrit
commit 7ff34cec146b2c8653de1e86050cd9b45df5181c
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Thu Oct 17 16:38:25 2013 +0300
Add option to disable ChromeOS
Those building Chromebook firmware from coreboot git might be more
interested in building without ChromeOS extras.
Change-Id: I2f176d059fd45bf4eb02cc0f3f1dcc353095d0ce
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/mainboard/google/butterfly/Kconfig | 2 +-
src/mainboard/google/falco/Kconfig | 2 +-
src/mainboard/google/link/Kconfig | 2 +-
src/mainboard/google/parrot/Kconfig | 2 +-
src/mainboard/google/peppy/Kconfig | 2 +-
src/mainboard/google/pit/Kconfig | 2 +-
src/mainboard/google/slippy/Kconfig | 2 +-
src/mainboard/google/snow/Kconfig | 2 +-
src/mainboard/google/stout/Kconfig | 2 +-
src/mainboard/intel/baskingridge/Kconfig | 2 +-
src/mainboard/intel/emeraldlake2/Kconfig | 2 +-
src/mainboard/intel/wtm2/Kconfig | 2 +-
src/mainboard/samsung/lumpy/Kconfig | 2 +-
src/mainboard/samsung/stumpy/Kconfig | 2 +-
src/vendorcode/google/chromeos/Kconfig | 20 ++++++++++++--------
15 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index e9ad6ef..78c998a 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME
select HAVE_SMI_HANDLER
select GFXUMA
- select CHROMEOS
+ select MAINBOARD_HAS_CHROMEOS
select EARLY_CBMEM_INIT
# Workaround for EC/KBC IRQ1.
diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig
index 3a08086..3eb67ac 100644
--- a/src/mainboard/google/falco/Kconfig
+++ b/src/mainboard/google/falco/Kconfig
@@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME
select MMCONF_SUPPORT
select HAVE_SMI_HANDLER
- select CHROMEOS
+ select MAINBOARD_HAS_CHROMEOS
select EXTERNAL_MRC_BLOB
select CACHE_ROM
select MARK_GRAPHICS_MEM_WRCOMB
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index b74c604..d1e809e 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME
select HAVE_SMI_HANDLER
select GFXUMA
- select CHROMEOS
+ select MAINBOARD_HAS_CHROMEOS
select SERIRQ_CONTINUOUS_MODE
select MAINBOARD_HAS_NATIVE_VGA_INIT
select EARLY_CBMEM_INIT
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index 191e856..d8a4e7a 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME
select HAVE_SMI_HANDLER
select GFXUMA
- select CHROMEOS
+ select MAINBOARD_HAS_CHROMEOS
select EARLY_CBMEM_INIT
# Workaround for EC/KBC IRQ1.
diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig
index 5eb8b95..1913ef0 100644
--- a/src/mainboard/google/peppy/Kconfig
+++ b/src/mainboard/google/peppy/Kconfig
@@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME
select MMCONF_SUPPORT
select HAVE_SMI_HANDLER
- select CHROMEOS
+ select MAINBOARD_HAS_CHROMEOS
select EXTERNAL_MRC_BLOB
select CACHE_ROM
select MARK_GRAPHICS_MEM_WRCOMB
diff --git a/src/mainboard/google/pit/Kconfig b/src/mainboard/google/pit/Kconfig
index 89ffb5b..ae6e693 100644
--- a/src/mainboard/google/pit/Kconfig
+++ b/src/mainboard/google/pit/Kconfig
@@ -27,7 +27,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
select BOARD_ROMSIZE_KB_4096
- select CHROMEOS
+ select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_DO_NATIVE_VGA_INIT
select HAVE_INIT_TIMER
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index a53ac00..7ca737d 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME
select MMCONF_SUPPORT
select HAVE_SMI_HANDLER
- select CHROMEOS
+ select MAINBOARD_HAS_CHROMEOS
select EXTERNAL_MRC_BLOB
select CACHE_ROM
select MARK_GRAPHICS_MEM_WRCOMB
diff --git a/src/mainboard/google/snow/Kconfig b/src/mainboard/google/snow/Kconfig
index 91bd66d..279132d 100644
--- a/src/mainboard/google/snow/Kconfig
+++ b/src/mainboard/google/snow/Kconfig
@@ -28,7 +28,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select EC_GOOGLE_CHROMEEC_I2C
select BOARD_ROMSIZE_KB_4096
select DRIVER_MAXIM_MAX77686
- select CHROMEOS
+ select MAINBOARD_HAS_CHROMEOS
select DRIVER_TI_TPS65090
select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_DO_NATIVE_VGA_INIT
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index a316277..7ee8fd4 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME
select HAVE_SMI_HANDLER
select GFXUMA
- select CHROMEOS
+ select MAINBOARD_HAS_CHROMEOS
config MAINBOARD_DIR
string
diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig
index 23f2ebe..710094e 100644
--- a/src/mainboard/intel/baskingridge/Kconfig
+++ b/src/mainboard/intel/baskingridge/Kconfig
@@ -11,7 +11,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_OPTION_TABLE
select HAVE_ACPI_RESUME
select HAVE_SMI_HANDLER
- select CHROMEOS
+ select MAINBOARD_HAS_CHROMEOS
select LAPIC_MONOTONIC_TIMER
config MAINBOARD_DIR
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index fd98485..01082d4 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_OPTION_TABLE
select HAVE_ACPI_RESUME
select GFXUMA
- #select CHROMEOS
+ #select MAINBOARD_HAS_CHROMEOS
select EARLY_CBMEM_INIT
config MAINBOARD_DIR
diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig
index d5b55d8..99ed53c 100644
--- a/src/mainboard/intel/wtm2/Kconfig
+++ b/src/mainboard/intel/wtm2/Kconfig
@@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_OPTION_TABLE
select HAVE_ACPI_RESUME
select HAVE_SMI_HANDLER
- select CHROMEOS
+ select MAINBOARD_HAS_CHROMEOS
select CACHE_ROM
select MARK_GRAPHICS_MEM_WRCOMB
select MAINBOARD_HAS_NATIVE_VGA_INIT
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 91dc3b6..032b4b5 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -4,7 +4,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select ARCH_X86
select BOARD_ROMSIZE_KB_8192
- select CHROMEOS
+ select MAINBOARD_HAS_CHROMEOS
select CPU_INTEL_SOCKET_RPGA989
select EC_SMSC_MEC1308
select GFXUMA
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index f4f8e4d..e1e0cfa 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -4,7 +4,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select ARCH_X86
select BOARD_ROMSIZE_KB_8192
- select CHROMEOS
+ select MAINBOARD_HAS_CHROMEOS
select CPU_INTEL_SOCKET_RPGA989
select GFXUMA
select HAVE_ACPI_RESUME
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
index d5ca212..a564608 100644
--- a/src/vendorcode/google/chromeos/Kconfig
+++ b/src/vendorcode/google/chromeos/Kconfig
@@ -16,17 +16,22 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
+config MAINBOARD_HAS_CHROMEOS
+ def_bool n
+
+menu "ChromeOS"
+ depends on MAINBOARD_HAS_CHROMEOS
+
config CHROMEOS
- bool
- default n
+ bool "Build for ChromeOS"
+ default y
select TPM
help
Enable ChromeOS specific features like the GPIO sub table in
the coreboot table. NOTE: Enabling this option on an unsupported
board will most likely break your build.
-menu "ChromeOS"
- depends on CHROMEOS
+if CHROMEOS
config VBNV_OFFSET
hex
@@ -66,12 +71,9 @@ config FLASHMAP_OFFSET
help
Offset of flash map in firmware image
-endmenu
-
config VBOOT_VERIFY_FIRMWARE
bool "Verify firmware with vboot."
default n
- depends on CHROMEOS
help
Enabling VBOOT_VERIFY_FIRMWARE will use vboot to verify the ramstage
and boot loader.
@@ -111,8 +113,10 @@ config VBOOT_RAMSTAGE_INDEX
config NO_TPM_RESUME
bool
default n
- depends on CHROMEOS
help
On some boards the TPM stays powered up in S3. On those
boards, booting Windows will break if the TPM resume command
is sent during an S3 resume.
+
+endif
+endmenu
More information about the coreboot-gerrit
mailing list