summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Kconfig22
-rw-r--r--src/include/boardid.h5
-rw-r--r--src/lib/coreboot_table.c2
-rw-r--r--src/mainboard/google/urara/Kconfig1
-rw-r--r--src/mainboard/google/urara/bootblock.c2
-rw-r--r--src/mainboard/google/urara/urara_boardid.h6
6 files changed, 9 insertions, 29 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 8873ec8cdc..bc8f059bcd 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -236,14 +236,6 @@ config UPDATE_IMAGE
If unsure, select 'N'
-config BOARD_ID_STRING
- string "Board ID"
- # Default value set at the end of the file
- depends on BOARD_ID_MANUAL
- help
- This string is placed in the 'board_id' CBFS file for indicating
- board type.
-
config RAM_CODE_SUPPORT
bool
help
@@ -1222,16 +1214,6 @@ config BOARD_ID_AUTO
Mainboards that can read a board ID from the hardware straps
(ie. GPIO) select this configuration option.
-config BOARD_ID_MANUAL
- bool
- default n
- depends on !BOARD_ID_AUTO
- help
- If you want to maintain a board ID, but the hardware does not
- have straps to automatically determine the ID, you can say Y
- here and add a file named 'board_id' to CBFS. If you don't know
- what this is about, say N.
-
config BOOTBLOCK_CUSTOM
# To be selected by arch, SoC or mainboard if it does not want use the normal
# src/lib/bootblock.c#main() C entry point.
@@ -1256,10 +1238,6 @@ config COMPRESS_PRERAM_STAGES
config INCLUDE_CONFIG_FILE
default y
-config BOARD_ID_STRING
- default "(none)"
- depends on BOARD_ID_MANUAL
-
config BOOTSPLASH_FILE
depends on BOOTSPLASH_IMAGE
default "bootsplash.jpg"
diff --git a/src/include/boardid.h b/src/include/boardid.h
index 6bb2c18f66..121d05281a 100644
--- a/src/include/boardid.h
+++ b/src/include/boardid.h
@@ -18,11 +18,6 @@
#include <stdint.h>
-struct board_hw {
- uint8_t i2c_interface;
-};
-
-const struct board_hw *board_get_hw(void);
uint8_t board_id(void);
uint32_t ram_code(void);
diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index f152f341ff..29dd53afad 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -246,7 +246,7 @@ static inline void lb_vboot_handoff(struct lb_header *header) {}
static void lb_board_id(struct lb_header *header)
{
-#if IS_ENABLED(CONFIG_BOARD_ID_AUTO) || IS_ENABLED(CONFIG_BOARD_ID_MANUAL)
+#if IS_ENABLED(CONFIG_BOARD_ID_AUTO)
struct lb_board_id *bid;
bid = (struct lb_board_id *)lb_new_record(header);
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