| Message ID | 20220323212009.1066483-9-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 0ebaa72e5683b0737b91cf7dfd371ba5d737e4eb |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [01/22] Convert CONFIG_CF_DSPI to Kconfig | expand |
Hello Tom, On 23.03.22 22:19, Tom Rini wrote: > 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> > --- > board/keymile/common/ivm.c | 2 +- > configs/kmtegr1_defconfig | 1 - > 2 files changed, 1 insertion(+), 2 deletions(-) Reviewed-by: Heiko Schocher <hs@denx.de> bye, Heiko
> > > 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> > --- > board/keymile/common/ivm.c | 2 +- > configs/kmtegr1_defconfig | 1 - > 2 files changed, 1 insertion(+), 2 deletions(-) > Reviewed-by: Holger Brunck <holger.brunck@hitachienergy.com>
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index ff550f7fe766..67db0c50f47c 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 d6bcc2f38b4e..e697e6e74761 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=" "
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> --- board/keymile/common/ivm.c | 2 +- configs/kmtegr1_defconfig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)