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>
This commit is contained in:
Kyösti Mälkki 2013-10-17 16:38:25 +03:00 committed by Alexandru Gagniuc
parent 161e9cc56b
commit b1b9c93f7c
15 changed files with 26 additions and 22 deletions

View File

@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select GFXUMA select GFXUMA
select CHROMEOS select MAINBOARD_HAS_CHROMEOS
select EARLY_CBMEM_INIT select EARLY_CBMEM_INIT
# Workaround for EC/KBC IRQ1. # Workaround for EC/KBC IRQ1.

View File

@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select MMCONF_SUPPORT select MMCONF_SUPPORT
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select CHROMEOS select MAINBOARD_HAS_CHROMEOS
select EXTERNAL_MRC_BLOB select EXTERNAL_MRC_BLOB
select CACHE_ROM select CACHE_ROM
select MARK_GRAPHICS_MEM_WRCOMB select MARK_GRAPHICS_MEM_WRCOMB

View File

@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select GFXUMA select GFXUMA
select CHROMEOS select MAINBOARD_HAS_CHROMEOS
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT
select EARLY_CBMEM_INIT select EARLY_CBMEM_INIT

View File

@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select GFXUMA select GFXUMA
select CHROMEOS select MAINBOARD_HAS_CHROMEOS
select EARLY_CBMEM_INIT select EARLY_CBMEM_INIT
# Workaround for EC/KBC IRQ1. # Workaround for EC/KBC IRQ1.

View File

@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select MMCONF_SUPPORT select MMCONF_SUPPORT
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select CHROMEOS select MAINBOARD_HAS_CHROMEOS
select EXTERNAL_MRC_BLOB select EXTERNAL_MRC_BLOB
select CACHE_ROM select CACHE_ROM
select MARK_GRAPHICS_MEM_WRCOMB select MARK_GRAPHICS_MEM_WRCOMB

View File

@ -27,7 +27,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI select EC_GOOGLE_CHROMEEC_SPI
select BOARD_ROMSIZE_KB_4096 select BOARD_ROMSIZE_KB_4096
select CHROMEOS select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT
select HAVE_INIT_TIMER select HAVE_INIT_TIMER

View File

@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select MMCONF_SUPPORT select MMCONF_SUPPORT
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select CHROMEOS select MAINBOARD_HAS_CHROMEOS
select EXTERNAL_MRC_BLOB select EXTERNAL_MRC_BLOB
select CACHE_ROM select CACHE_ROM
select MARK_GRAPHICS_MEM_WRCOMB select MARK_GRAPHICS_MEM_WRCOMB

View File

@ -28,7 +28,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select EC_GOOGLE_CHROMEEC_I2C select EC_GOOGLE_CHROMEEC_I2C
select BOARD_ROMSIZE_KB_4096 select BOARD_ROMSIZE_KB_4096
select DRIVER_MAXIM_MAX77686 select DRIVER_MAXIM_MAX77686
select CHROMEOS select MAINBOARD_HAS_CHROMEOS
select DRIVER_TI_TPS65090 select DRIVER_TI_TPS65090
select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT

View File

@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select GFXUMA select GFXUMA
select CHROMEOS select MAINBOARD_HAS_CHROMEOS
config MAINBOARD_DIR config MAINBOARD_DIR
string string

View File

@ -11,7 +11,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select CHROMEOS select MAINBOARD_HAS_CHROMEOS
select LAPIC_MONOTONIC_TIMER select LAPIC_MONOTONIC_TIMER
config MAINBOARD_DIR config MAINBOARD_DIR

View File

@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select GFXUMA select GFXUMA
#select CHROMEOS #select MAINBOARD_HAS_CHROMEOS
select EARLY_CBMEM_INIT select EARLY_CBMEM_INIT
config MAINBOARD_DIR config MAINBOARD_DIR

View File

@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select CHROMEOS select MAINBOARD_HAS_CHROMEOS
select CACHE_ROM select CACHE_ROM
select MARK_GRAPHICS_MEM_WRCOMB select MARK_GRAPHICS_MEM_WRCOMB
select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT

View File

@ -4,7 +4,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select ARCH_X86 select ARCH_X86
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192
select CHROMEOS select MAINBOARD_HAS_CHROMEOS
select CPU_INTEL_SOCKET_RPGA989 select CPU_INTEL_SOCKET_RPGA989
select EC_SMSC_MEC1308 select EC_SMSC_MEC1308
select GFXUMA select GFXUMA

View File

@ -4,7 +4,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select ARCH_X86 select ARCH_X86
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192
select CHROMEOS select MAINBOARD_HAS_CHROMEOS
select CPU_INTEL_SOCKET_RPGA989 select CPU_INTEL_SOCKET_RPGA989
select GFXUMA select GFXUMA
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME

View File

@ -16,17 +16,22 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## 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 config CHROMEOS
bool bool "Build for ChromeOS"
default n default y
select TPM select TPM
help help
Enable ChromeOS specific features like the GPIO sub table in Enable ChromeOS specific features like the GPIO sub table in
the coreboot table. NOTE: Enabling this option on an unsupported the coreboot table. NOTE: Enabling this option on an unsupported
board will most likely break your build. board will most likely break your build.
menu "ChromeOS" if CHROMEOS
depends on CHROMEOS
config VBNV_OFFSET config VBNV_OFFSET
hex hex
@ -66,12 +71,9 @@ config FLASHMAP_OFFSET
help help
Offset of flash map in firmware image Offset of flash map in firmware image
endmenu
config VBOOT_VERIFY_FIRMWARE config VBOOT_VERIFY_FIRMWARE
bool "Verify firmware with vboot." bool "Verify firmware with vboot."
default n default n
depends on CHROMEOS
help help
Enabling VBOOT_VERIFY_FIRMWARE will use vboot to verify the ramstage Enabling VBOOT_VERIFY_FIRMWARE will use vboot to verify the ramstage
and boot loader. and boot loader.
@ -111,8 +113,10 @@ config VBOOT_RAMSTAGE_INDEX
config NO_TPM_RESUME config NO_TPM_RESUME
bool bool
default n default n
depends on CHROMEOS
help help
On some boards the TPM stays powered up in S3. On those On some boards the TPM stays powered up in S3. On those
boards, booting Windows will break if the TPM resume command boards, booting Windows will break if the TPM resume command
is sent during an S3 resume. is sent during an S3 resume.
endif
endmenu