diff options
| author | Julius Werner <jwerner@chromium.org> | 2017-11-29 14:27:51 -0800 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2017-12-06 23:27:03 +0000 |
| commit | ec477346bfe8f73aac225e9a8c2c5e6438bba593 (patch) | |
| tree | 5daf39673de0b79406bd7f86ec4846108d96cc75 /src/mainboard | |
| parent | 079455f2076969b8419d16c9cb6ee8ea7a020f3c (diff) | |
Kconfig: Remove BOARD_ID_MANUAL option
The BOARD_ID_MANUAL and BOARD_ID_STRING options were introduced for the
Urara board which is now long dead, and have never been used anywhere
else. They were trying to do something that we usually handle with a
separate SKU ID these days, whereas BOARD_ID is supposed to be reserved
for different revisions of the same board/SKU. Get rid of it to make
further refactoring of other options easier.
Also shove some stuff back into the Urara mainboard that should've never
crept into generic headers.
Change-Id: I4e7018066eadb38bced96d8eca2ffd4f0dd17110
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/22694
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/google/urara/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/urara/bootblock.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/urara/urara_boardid.h | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/mainboard/google/urara/Kconfig b/src/mainboard/google/urara/Kconfig index 06263d51fb..3d415c4a3e 100644 --- a/src/mainboard/google/urara/Kconfig +++ b/src/mainboard/google/urara/Kconfig @@ -24,7 +24,6 @@ config BOARD_SPECIFIC_OPTIONS select CPU_IMGTEC_PISTACHIO select COMMON_CBFS_SPI_WRAPPER select SPI_FLASH - select BOARD_ID_MANUAL config MAINBOARD_DIR string diff --git a/src/mainboard/google/urara/bootblock.c b/src/mainboard/google/urara/bootblock.c index 121f35df14..2b5a48a869 100644 --- a/src/mainboard/google/urara/bootblock.c +++ b/src/mainboard/google/urara/bootblock.c @@ -20,6 +20,8 @@ #include <assert.h> #include <boardid.h> +#include "urara_boardid.h" + #define PADS_FUNCTION_SELECT0_ADDR (0xB8101C00 + 0xC0) #define GPIO_BIT_EN_ADDR(bank) (0xB8101C00 + 0x200 + (0x24 * (bank))) diff --git a/src/mainboard/google/urara/urara_boardid.h b/src/mainboard/google/urara/urara_boardid.h index e638555797..bc61085b5d 100644 --- a/src/mainboard/google/urara/urara_boardid.h +++ b/src/mainboard/google/urara/urara_boardid.h @@ -27,4 +27,10 @@ #define URARA_BOARD_ID_KENNET 4 #define URARA_BOARD_ID_SPACE 5 +struct board_hw { + uint8_t i2c_interface; +}; + +const struct board_hw *board_get_hw(void); + #endif |