From 967cd9a02741487e26e4301d201f4eb9c34e383c Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Tue, 18 Aug 2015 14:22:58 -0600 Subject: 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 Reviewed-on: http://review.coreboot.org/11272 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- 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 ++++-- 5 files changed, 19 insertions(+), 9 deletions(-) (limited to 'src/soc') diff --git a/src/soc/broadcom/cygnus/Kconfig b/src/soc/broadcom/cygnus/Kconfig index 7ab305cbae..75df786f53 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 930645e3d3..45a2abb5ee 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 7aff588f41..f899803459 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 9a1e4f99d9..dd60d630c2 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 1800b16f26..bc484e3bc6 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" -- cgit v1.2.3