Marc Jones (marc.jones@se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8722
-gerrit
commit 771ec7d04613916ddab7aba0bf021d5056f10f4a Author: Vadim Bendebury vbendeb@chromium.org Date: Mon Jul 28 17:19:26 2014 -0700
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
Original-Change-Id: Iadd758a799d69e1e34579d7d495378856b64c45b Original-Signed-off-by: Vadim Bendebury vbendeb@chromium.org Original-Reviewed-on: https://chromium-review.googlesource.com/210119 (cherry picked from commit f4d41ddf906c1bf0d10da38011998fa0a630c332) Signed-off-by: Marc Jones marc.jones@se-eng.com
Change-Id: I0d5f94d3428157a70f0a9d711b57432e3f796733 --- src/Kconfig | 4 ++-- src/mainboard/google/nyan_big/Kconfig | 2 ++ 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, 10 insertions(+), 2 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig index 7beb64c..c223901 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -1127,8 +1127,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 bee9748..2968b01 100644 --- a/src/mainboard/google/nyan_big/Kconfig +++ b/src/mainboard/google/nyan_big/Kconfig @@ -22,6 +22,7 @@ if BOARD_GOOGLE_NYAN_BIG config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select SOC_NVIDIA_TEGRA124 + select BOARD_ID_SUPPORT select MAINBOARD_HAS_CHROMEOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI @@ -33,6 +34,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B select VIRTUAL_DEV_SWITCH + select TERTIARY_BOARD_ID
config MAINBOARD_DIR string diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig index 1013455..789937f 100644 --- a/src/mainboard/google/nyan_blaze/Kconfig +++ b/src/mainboard/google/nyan_blaze/Kconfig @@ -22,6 +22,7 @@ if BOARD_GOOGLE_NYAN_BLAZE config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select ARCH_ARM + select BOARD_ID_SUPPORT select CHROMEOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI @@ -33,6 +34,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_1024 select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B + select TERTIARY_BOARD_ID select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig index 8c162ec..87e742e 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 0d93564..c489a80 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 select BOARD_ROMSIZE_KB_4096 diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig index 10c0f1b..b0c064c 100644 --- a/src/mainboard/google/storm/Kconfig +++ b/src/mainboard/google/storm/Kconfig @@ -22,11 +22,13 @@ if BOARD_GOOGLE_STORM config BOARD_SPECIFIC_OPTIONS def_bool y select SOC_QC_IPQ806X + select BOARD_ID_SUPPORT select BOARD_ROMSIZE_KB_4096 select COMMON_CBFS_SPI_WRAPPER select MAINBOARD_HAS_BOOTBLOCK_INIT select SPI_FLASH select SPI_FLASH_SPANSION + select TERTIARY_BOARD_ID
config BOARD_VARIANT_AP148 bool "pick this to build an image for ap148"
-
Marc Jones