From ec477346bfe8f73aac225e9a8c2c5e6438bba593 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Wed, 29 Nov 2017 14:27:51 -0800 Subject: 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 Reviewed-on: https://review.coreboot.org/22694 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/Kconfig | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'src/Kconfig') 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" -- cgit v1.2.3