summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2013-10-17 16:38:25 +0300
committerAlexandru Gagniuc <mr.nuke.me@gmail.com>2013-12-02 22:28:54 +0100
commitb1b9c93f7c4deb1db7eccfe001d8ef146052d3eb (patch)
tree345ce6994c2912011c583e1fdd100edf4bf6351b
parent161e9cc56b6009068a2b690f0d5d073bbb228acc (diff)
downloadcoreboot-b1b9c93f7c4deb1db7eccfe001d8ef146052d3eb.tar.xz
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@gmail.com> Reviewed-on: http://review.coreboot.org/3977 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
-rw-r--r--src/mainboard/google/butterfly/Kconfig2
-rw-r--r--src/mainboard/google/falco/Kconfig2
-rw-r--r--src/mainboard/google/link/Kconfig2
-rw-r--r--src/mainboard/google/parrot/Kconfig2
-rw-r--r--src/mainboard/google/peppy/Kconfig2
-rw-r--r--src/mainboard/google/pit/Kconfig2
-rw-r--r--src/mainboard/google/slippy/Kconfig2
-rw-r--r--src/mainboard/google/snow/Kconfig2
-rw-r--r--src/mainboard/google/stout/Kconfig2
-rw-r--r--src/mainboard/intel/baskingridge/Kconfig2
-rw-r--r--src/mainboard/intel/emeraldlake2/Kconfig2
-rw-r--r--src/mainboard/intel/wtm2/Kconfig2
-rw-r--r--src/mainboard/samsung/lumpy/Kconfig2
-rw-r--r--src/mainboard/samsung/stumpy/Kconfig2
-rw-r--r--src/vendorcode/google/chromeos/Kconfig20
15 files changed, 26 insertions, 22 deletions
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index e9ad6ef733..78c998af09 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 3a08086d67..3eb67ac84f 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 b74c6044f9..d1e809eed7 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 191e856d19..d8a4e7a3fc 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 5eb8b953e9..1913ef09ce 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 89ffb5b4dd..ae6e69367c 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 a53ac000b1..7ca737ddda 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 91bd66d990..279132df3d 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 a316277f2a..7ee8fd4d43 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 23f2ebebb5..710094e63a 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 fd98485ca5..01082d4142 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 d5b55d8c61..99ed53cf38 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 91dc3b67dd..032b4b5aa2 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 f4f8e4d5eb..e1e0cfa452 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 d5ca2124ea..a564608bee 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