From f4d41ddf906c1bf0d10da38011998fa0a630c332 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Mon, 28 Jul 2014 17:19:26 -0700 Subject: [PATCH] Enable publishing of board ID where supported These boards are supposed to be able to determine the board ID at run time based on the certain GPIO settings. BUG=chrome-os-partner:30489 TEST=verified that all boards build. Checked that storm proto0 reports board ID of 0 on the console Change-Id: Iadd758a799d69e1e34579d7d495378856b64c45b Signed-off-by: Vadim Bendebury Reviewed-on: https://chromium-review.googlesource.com/210119 --- src/Kconfig | 4 ++-- src/mainboard/google/nyan_big/Kconfig | 8 +++++--- src/mainboard/google/nyan_blaze/Kconfig | 2 ++ src/mainboard/google/rush/Kconfig | 1 + src/mainboard/google/rush_ryu/Kconfig | 1 + src/mainboard/google/storm/Kconfig | 2 ++ 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 10e424e100..d84f20f0e2 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -1006,8 +1006,8 @@ config BOARD_ID_SUPPORT config TERTIARY_BOARD_ID bool "Interpret board ID GPIOs as tertiary inputs" - default n if ARCH_X86 - default y if !ARCH_X86 + default n + depends on BOARD_ID_SUPPORT help Consider each GPIO as being in one of thee states: pulled down (0), pulled up (1), or not connected (2) diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig index d853cae11e..e4021aa3e2 100644 --- a/src/mainboard/google/nyan_big/Kconfig +++ b/src/mainboard/google/nyan_big/Kconfig @@ -21,16 +21,18 @@ if BOARD_GOOGLE_NYAN_BIG config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select BOARD_ID_SUPPORT select CHROMEOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI select EC_SOFTWARE_SYNC - select SOC_NVIDIA_TEGRA124 - select TEGRA124_MODEL_CD570M - select MAINBOARD_HAS_BOOTBLOCK_INIT select MAINBOARD_DO_NATIVE_VGA_INIT + select MAINBOARD_HAS_BOOTBLOCK_INIT + select SOC_NVIDIA_TEGRA124 select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B + select TEGRA124_MODEL_CD570M + select TERTIARY_BOARD_ID select VIRTUAL_DEV_SWITCH config MAINBOARD_DIR diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig index a333fe2478..0b57f3c326 100644 --- a/src/mainboard/google/nyan_blaze/Kconfig +++ b/src/mainboard/google/nyan_blaze/Kconfig @@ -21,6 +21,7 @@ if BOARD_GOOGLE_NYAN_BLAZE config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select BOARD_ID_SUPPORT select CHROMEOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI @@ -31,6 +32,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B + select TERTIARY_BOARD_ID select VIRTUAL_DEV_SWITCH diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig index 2ce1d4723a..64a59f887e 100644 --- a/src/mainboard/google/rush/Kconfig +++ b/src/mainboard/google/rush/Kconfig @@ -21,6 +21,7 @@ if BOARD_GOOGLE_RUSH config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select BOARD_ID_SUPPORT select CHROMEOS select SOC_NVIDIA_TEGRA132 select MAINBOARD_HAS_BOOTBLOCK_INIT diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig index 491d52b399..5c0dee2192 100644 --- a/src/mainboard/google/rush_ryu/Kconfig +++ b/src/mainboard/google/rush_ryu/Kconfig @@ -21,6 +21,7 @@ if BOARD_GOOGLE_RUSH_RYU config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select BOARD_ID_SUPPORT select SOC_NVIDIA_TEGRA132 select MAINBOARD_HAS_BOOTBLOCK_INIT diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig index 950f00d9f8..903e8ae7da 100644 --- a/src/mainboard/google/storm/Kconfig +++ b/src/mainboard/google/storm/Kconfig @@ -21,11 +21,13 @@ if BOARD_GOOGLE_STORM config BOARD_SPECIFIC_OPTIONS def_bool y + select BOARD_ID_SUPPORT select COMMON_CBFS_SPI_WRAPPER select MAINBOARD_HAS_BOOTBLOCK_INIT select SOC_QC_IPQ806X select SPI_FLASH select SPI_FLASH_SPANSION + select TERTIARY_BOARD_ID config BOARD_VARIANT_AP148 bool "pick this to build an image for ap148"