aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-03-23 17:19:56 -0400
committerTom Rini <trini@konsulko.com>2022-04-01 10:28:46 -0400
commit0ebaa72e5683b0737b91cf7dfd371ba5d737e4eb (patch)
tree63c1777e6b507ce75d9f25aa2f6937c1a467e137
parentc6c0e56ff8573faa1097e28a53162907c7bea186 (diff)
downloadu-boot-0ebaa72e5683b0737b91cf7dfd371ba5d737e4eb.zip
u-boot-0ebaa72e5683b0737b91cf7dfd371ba5d737e4eb.tar.gz
u-boot-0ebaa72e5683b0737b91cf7dfd371ba5d737e4eb.tar.bz2
kmtegr1: Drop CONFIG_KMTEGR1
The only usage of CONFIG_KMTEGR1 can be replaced by CONFIG_TARGET_KMTEGR1 so do so and remove this other symbol. Cc: Holger Brunck <holger.brunck@hitachienergy.com> Cc: Heiko Schocher <hs@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Heiko Schocher <hs@denx.de> Reviewed-by: Holger Brunck <holger.brunck@hitachienergy.com>
-rw-r--r--board/keymile/common/ivm.c2
-rw-r--r--configs/kmtegr1_defconfig1
2 files changed, 1 insertions, 2 deletions
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
index ff550f7..67db0c5 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -306,7 +306,7 @@ static int ivm_populate_env(unsigned char *buf, int len, int mac_address_offset)
return 0;
page2 = &buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN * 2];
- if (IS_ENABLED(CONFIG_KMTEGR1)) {
+ if (IS_ENABLED(CONFIG_TARGET_KMTEGR1)) {
/* KMTEGR1 has a special setup. eth0 has no connection to the
* outside and gets an locally administred MAC address, eth1 is
* the debug interface and gets the official MAC address from
diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig
index d6bcc2f..e697e6e 100644
--- a/configs/kmtegr1_defconfig
+++ b/configs/kmtegr1_defconfig
@@ -122,7 +122,6 @@ CONFIG_83XX_PCICLK=0x3ef1480
CONFIG_SYS_LOAD_ADDR=0x100000
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="KMTEGR1"
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
CONFIG_AUTOBOOT_STOP_STR=" "