From 82c706e8f0d8b0a5d412170849d45ff4d885655c Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 30 Mar 2015 12:20:55 -0700 Subject: switch mainboards over to use BOARD_ID_AUTO This patch switches the mainboards with board id straps to use BOARD_ID_AUTO instead of BOARD_ID_SUPPORT. On urara, which does not have those straps, the option is removed. (And re-added for urara derivatives through setting the config option BOARD_ID_MANUAL BRANCH=none BUG=chrome-os-partner:37593 TEST=emerg-nyan_big coreboot, emerge-urara coreboot, emerge-buranku coreboot Change-Id: I5ac4024c6f1f9b9d7a5179d88722c69b23b82bbd Signed-off-by: Patrick Georgi Original-Commit-Id: 22a470698f9c9ed275aa8150a5bb8d8cf368b050 Original-Signed-off-by: Stefan Reinauer Original-Change-Id: I48c291ad6f255a28c833bebc2638bfafa2782e74 Original-Reviewed-on: https://chromium-review.googlesource.com/262935 Original-Reviewed-by: Vadim Bendebury Reviewed-on: http://review.coreboot.org/9906 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/mainboard/google/cosmos/Kconfig | 2 +- src/mainboard/google/nyan_big/Kconfig | 2 +- src/mainboard/google/nyan_blaze/Kconfig | 2 +- src/mainboard/google/purin/Kconfig | 2 +- src/mainboard/google/rush/Kconfig | 2 +- src/mainboard/google/rush_ryu/Kconfig | 2 +- src/mainboard/google/storm/Kconfig | 2 +- src/mainboard/google/urara/Kconfig | 1 - src/mainboard/google/veyron_brain/Kconfig | 2 +- src/mainboard/google/veyron_danger/Kconfig | 2 +- src/mainboard/google/veyron_jerry/Kconfig | 2 +- src/mainboard/google/veyron_mighty/Kconfig | 2 +- src/mainboard/google/veyron_pinky/Kconfig | 2 +- src/mainboard/google/veyron_rialto/Kconfig | 2 +- src/mainboard/google/veyron_speedy/Kconfig | 2 +- 15 files changed, 14 insertions(+), 15 deletions(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig index dc4a3b6efd..8be71bd07b 100644 --- a/src/mainboard/google/cosmos/Kconfig +++ b/src/mainboard/google/cosmos/Kconfig @@ -21,8 +21,8 @@ if BOARD_GOOGLE_COSMOS config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_2048 - select BOARD_ID_SUPPORT select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig index 6fc618a839..555f86330f 100644 --- a/src/mainboard/google/nyan_big/Kconfig +++ b/src/mainboard/google/nyan_big/Kconfig @@ -22,8 +22,8 @@ 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 BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI select EC_SOFTWARE_SYNC diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig index 025cc6efec..9cb5e770f5 100644 --- a/src/mainboard/google/nyan_blaze/Kconfig +++ b/src/mainboard/google/nyan_blaze/Kconfig @@ -22,7 +22,7 @@ if BOARD_GOOGLE_NYAN_BLAZE config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select ARCH_ARM - select BOARD_ID_SUPPORT + select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI select EC_SOFTWARE_SYNC diff --git a/src/mainboard/google/purin/Kconfig b/src/mainboard/google/purin/Kconfig index 0d1965f9dc..158d9d54e6 100644 --- a/src/mainboard/google/purin/Kconfig +++ b/src/mainboard/google/purin/Kconfig @@ -21,7 +21,7 @@ if BOARD_GOOGLE_PURIN config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select BOARD_ID_SUPPORT + select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_2048 select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig index e565f47d0e..0d2250521d 100644 --- a/src/mainboard/google/rush/Kconfig +++ b/src/mainboard/google/rush/Kconfig @@ -21,7 +21,7 @@ if BOARD_GOOGLE_RUSH config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select BOARD_ID_SUPPORT + select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI select EC_SOFTWARE_SYNC diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig index d6609e14ce..23f6007bac 100644 --- a/src/mainboard/google/rush_ryu/Kconfig +++ b/src/mainboard/google/rush_ryu/Kconfig @@ -21,7 +21,7 @@ if BOARD_GOOGLE_RUSH_RYU config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select BOARD_ID_SUPPORT + select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_I2C select EC_GOOGLE_CHROMEEC_I2C_PROTO3 diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig index 52c4c2354b..95d27930bc 100644 --- a/src/mainboard/google/storm/Kconfig +++ b/src/mainboard/google/storm/Kconfig @@ -22,7 +22,7 @@ if BOARD_GOOGLE_STORM config BOARD_SPECIFIC_OPTIONS def_bool y select SOC_QC_IPQ806X - select BOARD_ID_SUPPORT + select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_8192 select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET diff --git a/src/mainboard/google/urara/Kconfig b/src/mainboard/google/urara/Kconfig index e065422fb2..e1004cde40 100644 --- a/src/mainboard/google/urara/Kconfig +++ b/src/mainboard/google/urara/Kconfig @@ -24,7 +24,6 @@ if BOARD_GOOGLE_URARA config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_512 - select BOARD_ID_SUPPORT select BOOTBLOCK_CONSOLE select MAINBOARD_HAS_CHROMEOS select SPI_FLASH_WINBOND diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig index e5e38f9e5d..ea750679b9 100644 --- a/src/mainboard/google/veyron_brain/Kconfig +++ b/src/mainboard/google/veyron_brain/Kconfig @@ -21,7 +21,7 @@ if BOARD_GOOGLE_VEYRON_BRAIN config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select BOARD_ID_SUPPORT + select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET diff --git a/src/mainboard/google/veyron_danger/Kconfig b/src/mainboard/google/veyron_danger/Kconfig index 2fad394f7b..f6e0060398 100644 --- a/src/mainboard/google/veyron_danger/Kconfig +++ b/src/mainboard/google/veyron_danger/Kconfig @@ -21,7 +21,7 @@ if BOARD_GOOGLE_VEYRON_DANGER config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select BOARD_ID_SUPPORT + select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER diff --git a/src/mainboard/google/veyron_jerry/Kconfig b/src/mainboard/google/veyron_jerry/Kconfig index 7127b0b480..be0b73633c 100644 --- a/src/mainboard/google/veyron_jerry/Kconfig +++ b/src/mainboard/google/veyron_jerry/Kconfig @@ -21,7 +21,7 @@ if BOARD_GOOGLE_VEYRON_JERRY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select BOARD_ID_SUPPORT + select BOARD_ID_AUTO select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC diff --git a/src/mainboard/google/veyron_mighty/Kconfig b/src/mainboard/google/veyron_mighty/Kconfig index 0a65b3176b..58972ad5f7 100644 --- a/src/mainboard/google/veyron_mighty/Kconfig +++ b/src/mainboard/google/veyron_mighty/Kconfig @@ -21,7 +21,7 @@ if BOARD_GOOGLE_VEYRON_MIGHTY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select BOARD_ID_SUPPORT + select BOARD_ID_AUTO select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC diff --git a/src/mainboard/google/veyron_pinky/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig index f6aea37ae3..87d24f03ea 100644 --- a/src/mainboard/google/veyron_pinky/Kconfig +++ b/src/mainboard/google/veyron_pinky/Kconfig @@ -21,7 +21,7 @@ if BOARD_GOOGLE_VEYRON_PINKY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select BOARD_ID_SUPPORT + select BOARD_ID_AUTO select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig index bc40ccb59f..f4a90df91b 100644 --- a/src/mainboard/google/veyron_rialto/Kconfig +++ b/src/mainboard/google/veyron_rialto/Kconfig @@ -21,7 +21,7 @@ if BOARD_GOOGLE_VEYRON_RIALTO config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select BOARD_ID_SUPPORT + select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER diff --git a/src/mainboard/google/veyron_speedy/Kconfig b/src/mainboard/google/veyron_speedy/Kconfig index facd7155c3..6a51457a2d 100644 --- a/src/mainboard/google/veyron_speedy/Kconfig +++ b/src/mainboard/google/veyron_speedy/Kconfig @@ -21,7 +21,7 @@ if BOARD_GOOGLE_VEYRON_SPEEDY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select BOARD_ID_SUPPORT + select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 select CHROMEOS_VBNV_EC select COMMON_CBFS_SPI_WRAPPER -- cgit v1.2.3