[U-Boot] [PATCH 1/4] km/boards: fix typo for MAC address offset config option
This patch only fixes a typo.
Signed-off-by: Holger Brunck holger.brunck@ch.abb.com CC: Stefan Roese sr@denx.de CC: Valentin Longchamp valentin.longchamp@ch.abb.com --- board/keymile/Kconfig | 2 +- board/keymile/common/ivm.c | 6 +++--- configs/kmcoge5un_defconfig | 2 +- configs/mgcoge3un_defconfig | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index acaa9289f7..ba1960f3d0 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -70,7 +70,7 @@ config KM_COMMON_ETH_INIT Use the Ethernet initialization implemented in common code, which detects if a Piggy board is present.
-config PIGGY_MAC_ADRESS_OFFSET +config PIGGY_MAC_ADDRESS_OFFSET int "Piggy Address Offset" default 0 help diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index 50df44d1c1..429e9c7914 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -309,16 +309,16 @@ static int ivm_populate_env(unsigned char *buf, int len)
#ifndef CONFIG_KMTEGR1 /* if an offset is defined, add it */ - process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADRESS_OFFSET, true); + process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADDRESS_OFFSET, true); env_set((char *)"ethaddr", (char *)valbuf); #else /* 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 the IVM */ - process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADRESS_OFFSET, false); + process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADDRESS_OFFSET, false); env_set((char *)"ethaddr", (char *)valbuf); - process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADRESS_OFFSET, true); + process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADDRESS_OFFSET, true); env_set((char *)"eth1addr", (char *)valbuf); #endif
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index ff23af3060..f2c835029a 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -4,7 +4,7 @@ CONFIG_ARCH_CPU_INIT=y CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y -CONFIG_PIGGY_MAC_ADRESS_OFFSET=3 +CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 CONFIG_KM_ENV_IS_IN_SPI_NOR=y CONFIG_KM_PIGGY4_88E6352=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig index cae6645832..24f6b4656c 100644 --- a/configs/mgcoge3un_defconfig +++ b/configs/mgcoge3un_defconfig @@ -4,7 +4,7 @@ CONFIG_ARCH_CPU_INIT=y CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y -CONFIG_PIGGY_MAC_ADRESS_OFFSET=3 +CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 CONFIG_KM_PIGGY4_88E6061=y CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x0
For upcoming SECU board we have different MAC address offsets depending on which functional unit we are running. In this case we need to pass this value to the ivm_populate_env function instead of using the hard coded config option there.
Signed-off-by: Holger Brunck holger.brunck@ch.abb.com CC: Stefan Roese sr@denx.de CC: Valentin Longchamp valentin.longchamp@ch.abb.com CC: Marek Vasut marex@denx.de --- board/keymile/common/common.h | 2 +- board/keymile/common/ivm.c | 12 ++++++------ board/keymile/km83xx/km83xx.c | 3 ++- board/keymile/km_arm/km_arm.c | 3 ++- board/keymile/kmp204x/kmp204x.c | 3 ++- 5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/board/keymile/common/common.h b/board/keymile/common/common.h index 42b760dc6e..8251de4db8 100644 --- a/board/keymile/common/common.h +++ b/board/keymile/common/common.h @@ -121,7 +121,7 @@ struct bfticu_iomap { };
int ethernet_present(void); -int ivm_read_eeprom(unsigned char *buf, int len); +int ivm_read_eeprom(unsigned char *buf, int len, int mac_address_offset); int ivm_analyze_eeprom(unsigned char *buf, int len);
int trigger_fpga_config(void); diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index 429e9c7914..fee7f03c8c 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -297,7 +297,7 @@ int ivm_analyze_eeprom(unsigned char *buf, int len) return 0; }
-static int ivm_populate_env(unsigned char *buf, int len) +static int ivm_populate_env(unsigned char *buf, int len, int mac_address_offset) { unsigned char *page2; unsigned char valbuf[MAC_STR_SZ]; @@ -309,23 +309,23 @@ static int ivm_populate_env(unsigned char *buf, int len)
#ifndef CONFIG_KMTEGR1 /* if an offset is defined, add it */ - process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADDRESS_OFFSET, true); + process_mac(valbuf, page2, mac_address_offset, true); env_set((char *)"ethaddr", (char *)valbuf); #else /* 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 the IVM */ - process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADDRESS_OFFSET, false); + process_mac(valbuf, page2, mac_address_offset, false); env_set((char *)"ethaddr", (char *)valbuf); - process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADDRESS_OFFSET, true); + process_mac(valbuf, page2, mac_address_offset, true); env_set((char *)"eth1addr", (char *)valbuf); #endif
return 0; }
-int ivm_read_eeprom(unsigned char *buf, int len) +int ivm_read_eeprom(unsigned char *buf, int len, int mac_address_offset) { int ret;
@@ -339,5 +339,5 @@ int ivm_read_eeprom(unsigned char *buf, int len) return -2; }
- return ivm_populate_env(buf, len); + return ivm_populate_env(buf, len, mac_address_offset); } diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index 8846b64f7d..59347a3990 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -185,7 +185,8 @@ int board_early_init_r(void)
int misc_init_r(void) { - ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN); + ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN, + CONFIG_PIGGY_MAC_ADDRESS_OFFSET); return 0; }
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 922cc621f7..2724d8bd48 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -231,7 +231,8 @@ int misc_init_r(void) } #endif
- ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN); + ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN, + CONFIG_PIGGY_MAC_ADDRESS_OFFSET);
initialize_unit_leds(); set_km_env(); diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c index 4d1e38aa3a..e7c321c326 100644 --- a/board/keymile/kmp204x/kmp204x.c +++ b/board/keymile/kmp204x/kmp204x.c @@ -195,7 +195,8 @@ int misc_init_r(void) } }
- ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN); + ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN, + CONFIG_PIGGY_MAC_ADDRESS_OFFSET); return 0; }
On 25.11.19 17:24, Holger Brunck wrote:
For upcoming SECU board we have different MAC address offsets depending on which functional unit we are running. In this case we need to pass this value to the ivm_populate_env function instead of using the hard coded config option there.
Signed-off-by: Holger Brunck holger.brunck@ch.abb.com CC: Stefan Roese sr@denx.de CC: Valentin Longchamp valentin.longchamp@ch.abb.com CC: Marek Vasut marex@denx.de
Reviewed-by: Stefan Roese sr@denx.de
Thanks, Stefan
board/keymile/common/common.h | 2 +- board/keymile/common/ivm.c | 12 ++++++------ board/keymile/km83xx/km83xx.c | 3 ++- board/keymile/km_arm/km_arm.c | 3 ++- board/keymile/kmp204x/kmp204x.c | 3 ++- 5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/board/keymile/common/common.h b/board/keymile/common/common.h index 42b760dc6e..8251de4db8 100644 --- a/board/keymile/common/common.h +++ b/board/keymile/common/common.h @@ -121,7 +121,7 @@ struct bfticu_iomap { };
int ethernet_present(void); -int ivm_read_eeprom(unsigned char *buf, int len); +int ivm_read_eeprom(unsigned char *buf, int len, int mac_address_offset); int ivm_analyze_eeprom(unsigned char *buf, int len);
int trigger_fpga_config(void); diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index 429e9c7914..fee7f03c8c 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -297,7 +297,7 @@ int ivm_analyze_eeprom(unsigned char *buf, int len) return 0; }
-static int ivm_populate_env(unsigned char *buf, int len) +static int ivm_populate_env(unsigned char *buf, int len, int mac_address_offset) { unsigned char *page2; unsigned char valbuf[MAC_STR_SZ]; @@ -309,23 +309,23 @@ static int ivm_populate_env(unsigned char *buf, int len)
#ifndef CONFIG_KMTEGR1 /* if an offset is defined, add it */
- process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADDRESS_OFFSET, true);
- process_mac(valbuf, page2, mac_address_offset, true); env_set((char *)"ethaddr", (char *)valbuf); #else /* 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 the IVM
- process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADDRESS_OFFSET, false);
- process_mac(valbuf, page2, mac_address_offset, false); env_set((char *)"ethaddr", (char *)valbuf);
- process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADDRESS_OFFSET, true);
process_mac(valbuf, page2, mac_address_offset, true); env_set((char *)"eth1addr", (char *)valbuf); #endif
return 0; }
-int ivm_read_eeprom(unsigned char *buf, int len) +int ivm_read_eeprom(unsigned char *buf, int len, int mac_address_offset) { int ret;
@@ -339,5 +339,5 @@ int ivm_read_eeprom(unsigned char *buf, int len) return -2; }
- return ivm_populate_env(buf, len);
- return ivm_populate_env(buf, len, mac_address_offset); }
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index 8846b64f7d..59347a3990 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -185,7 +185,8 @@ int board_early_init_r(void)
int misc_init_r(void) {
- ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN);
- ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN,
CONFIG_PIGGY_MAC_ADDRESS_OFFSET);diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 922cc621f7..2724d8bd48 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -231,7 +231,8 @@ int misc_init_r(void) } #endif
- ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN);
ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN,
CONFIG_PIGGY_MAC_ADDRESS_OFFSET);initialize_unit_leds(); set_km_env();
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c index 4d1e38aa3a..e7c321c326 100644 --- a/board/keymile/kmp204x/kmp204x.c +++ b/board/keymile/kmp204x/kmp204x.c @@ -195,7 +195,8 @@ int misc_init_r(void) } }
- ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN);
- ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN,
CONFIG_PIGGY_MAC_ADDRESS_OFFSET);
Viele Grüße, Stefan
On Mon, Nov 25, 2019 at 05:24:14PM +0100, Holger Brunck wrote:
For upcoming SECU board we have different MAC address offsets depending on which functional unit we are running. In this case we need to pass this value to the ivm_populate_env function instead of using the hard coded config option there.
Signed-off-by: Holger Brunck holger.brunck@ch.abb.com CC: Stefan Roese sr@denx.de CC: Valentin Longchamp valentin.longchamp@ch.abb.com CC: Marek Vasut marex@denx.de Reviewed-by: Stefan Roese sr@denx.de
Applied to u-boot/master, thanks!
This target is out of maintenance and can be removed.
Signed-off-by: Holger Brunck holger.brunck@ch.abb.com CC: Stefan Roese sr@denx.de CC: Valentin Longchamp valentin.longchamp@ch.abb.com --- board/keymile/km_arm/MAINTAINERS | 1 - board/keymile/km_arm/km_arm.c | 55 +------------------------------- configs/mgcoge3un_defconfig | 52 ------------------------------ include/configs/km_kirkwood.h | 10 +----- scripts/config_whitelist.txt | 1 - 5 files changed, 2 insertions(+), 117 deletions(-) delete mode 100644 configs/mgcoge3un_defconfig
diff --git a/board/keymile/km_arm/MAINTAINERS b/board/keymile/km_arm/MAINTAINERS index d80589ded7..17926017c3 100644 --- a/board/keymile/km_arm/MAINTAINERS +++ b/board/keymile/km_arm/MAINTAINERS @@ -10,4 +10,3 @@ F: configs/kmcoge5un_defconfig F: configs/kmnusa_defconfig F: configs/kmsugp1_defconfig F: configs/kmsuv31_defconfig -F: configs/mgcoge3un_defconfig diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 2724d8bd48..d39a6b6362 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -121,26 +121,6 @@ static const u32 kwmpp_config[] = {
static uchar ivm_content[CONFIG_SYS_IVM_EEPROM_MAX_LEN];
-#if defined(CONFIG_KM_MGCOGE3UN) -/* - * Wait for startup OK from mgcoge3ne - */ -static int startup_allowed(void) -{ - unsigned char buf; - - /* - * Read CIRQ16 bit (bit 0) - */ - if (i2c_read(BOCO, REG_IRQ_CIRQ2, 1, &buf, 1) != 0) - printf("%s: Error reading Boco\n", __func__); - else - if ((buf & MASK_RBI_DEFECT_16) == MASK_RBI_DEFECT_16) - return 1; - return 0; -} -#endif - #if (defined(CONFIG_KM_PIGGY4_88E6061)|defined(CONFIG_KM_PIGGY4_88E6352)) /* * All boards with PIGGY4 connected via a simple switch have ethernet always @@ -198,39 +178,6 @@ static void set_bootcount_addr(void)
int misc_init_r(void) { -#if defined(CONFIG_KM_MGCOGE3UN) - char *wait_for_ne; - u8 dip_switch = kw_gpio_get_value(KM_FLASH_ERASE_ENABLE); - wait_for_ne = env_get("waitforne"); - - if ((wait_for_ne != NULL) && (dip_switch == 0)) { - if (strcmp(wait_for_ne, "true") == 0) { - int cnt = 0; - int abort = 0; - puts("NE go: "); - while (startup_allowed() == 0) { - if (tstc()) { - (void) getc(); /* consume input */ - abort = 1; - break; - } - udelay(200000); - cnt++; - if (cnt == 5) - puts("wait\b\b\b\b"); - if (cnt == 10) { - cnt = 0; - puts(" \b\b\b\b"); - } - } - if (abort == 1) - printf("\nAbort waiting for ne\n"); - else - puts("OK\n"); - } - } -#endif - ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN, CONFIG_PIGGY_MAC_ADDRESS_OFFSET);
@@ -293,7 +240,7 @@ int board_init(void)
int board_late_init(void) { -#if (defined(CONFIG_KM_COGE5UN) | defined(CONFIG_KM_MGCOGE3UN)) +#if defined(CONFIG_KM_COGE5UN) u8 dip_switch = kw_gpio_get_value(KM_FLASH_ERASE_ENABLE);
/* if pin 1 do full erase */ diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig deleted file mode 100644 index 24f6b4656c..0000000000 --- a/configs/mgcoge3un_defconfig +++ /dev/null @@ -1,52 +0,0 @@ -CONFIG_ARM=y -CONFIG_SYS_DCACHE_OFF=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_KIRKWOOD=y -CONFIG_SYS_TEXT_BASE=0x07d00000 -CONFIG_TARGET_KM_KIRKWOOD=y -CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 -CONFIG_KM_PIGGY4_88E6061=y -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0x0 -CONFIG_IDENT_STRING="\nKeymile COGE3UN" -CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN" -CONFIG_MISC_INIT_R=y -CONFIG_VERSION_VARIABLE=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_HUSH_PARSER=y -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" -CONFIG_AUTOBOOT_STOP_STR=" " -CONFIG_CMD_ASKENV=y -CONFIG_CMD_GREPENV=y -CONFIG_CMD_EEPROM=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_JFFS2=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" -CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" -CONFIG_CMD_UBI=y -# CONFIG_CMD_UBIFS is not set -CONFIG_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood" -CONFIG_ENV_IS_IN_EEPROM=y -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -CONFIG_ENV_OFFSET_REDUND=0x2000 -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_BOOTCOUNT_RAM=y -CONFIG_BOOTCOUNT_BOOTLIMIT=3 -# CONFIG_MMC is not set -CONFIG_SF_DEFAULT_SPEED=8100000 -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_MVGBE=y -CONFIG_MII=y -CONFIG_SYS_NS16550=y -CONFIG_SPI=y -CONFIG_KIRKWOOD_SPI=y -CONFIG_BCH=y diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h index 6fce83cfcd..064097a631 100644 --- a/include/configs/km_kirkwood.h +++ b/include/configs/km_kirkwood.h @@ -51,14 +51,6 @@ #undef CONFIG_SYS_KWD_CONFIG #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
-/* KM_MGCOGE3UN */ -#elif defined(CONFIG_KM_MGCOGE3UN) -#define CONFIG_HOSTNAME "mgcoge3un" -#undef CONFIG_SYS_KWD_CONFIG -#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-memphis.cfg -#define CONFIG_KM_BOARD_EXTRA_ENV "waitforne=true\0" -#define CONFIG_KM_DISABLE_PCIE - /* KMCOGE5UN */ #elif defined(CONFIG_KM_COGE5UN) #undef CONFIG_SYS_KWD_CONFIG @@ -113,7 +105,7 @@
#ifdef CONFIG_KM_PIGGY4_88E6061 /* - * Some keymile boards like mgcoge3un have their PIGGY4 connected via + * Some keymile boards like mgcoge5un have their PIGGY4 connected via * an Marvell 88E6061 simple switch. * In this case we have to change the default settings for the * ethernet phy connected to the kirkwood. diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7784922693..08fab0aebf 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -946,7 +946,6 @@ CONFIG_KM_ECC_MODE CONFIG_KM_KIRKWOOD CONFIG_KM_KIRKWOOD_128M16 CONFIG_KM_KIRKWOOD_PCI -CONFIG_KM_MGCOGE3UN CONFIG_KM_NEW_ENV CONFIG_KM_NUSA CONFIG_KM_ROOTFSSIZE
On 25.11.19 17:24, Holger Brunck wrote:
This target is out of maintenance and can be removed.
Signed-off-by: Holger Brunck holger.brunck@ch.abb.com CC: Stefan Roese sr@denx.de CC: Valentin Longchamp valentin.longchamp@ch.abb.com
Reviewed-by: Stefan Roese sr@denx.de
Thanks, Stefan
board/keymile/km_arm/MAINTAINERS | 1 - board/keymile/km_arm/km_arm.c | 55 +------------------------------- configs/mgcoge3un_defconfig | 52 ------------------------------ include/configs/km_kirkwood.h | 10 +----- scripts/config_whitelist.txt | 1 - 5 files changed, 2 insertions(+), 117 deletions(-) delete mode 100644 configs/mgcoge3un_defconfig
diff --git a/board/keymile/km_arm/MAINTAINERS b/board/keymile/km_arm/MAINTAINERS index d80589ded7..17926017c3 100644 --- a/board/keymile/km_arm/MAINTAINERS +++ b/board/keymile/km_arm/MAINTAINERS @@ -10,4 +10,3 @@ F: configs/kmcoge5un_defconfig F: configs/kmnusa_defconfig F: configs/kmsugp1_defconfig F: configs/kmsuv31_defconfig -F: configs/mgcoge3un_defconfig diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 2724d8bd48..d39a6b6362 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -121,26 +121,6 @@ static const u32 kwmpp_config[] = {
static uchar ivm_content[CONFIG_SYS_IVM_EEPROM_MAX_LEN];
-#if defined(CONFIG_KM_MGCOGE3UN) -/*
- Wait for startup OK from mgcoge3ne
- */
-static int startup_allowed(void) -{
- unsigned char buf;
- /*
* Read CIRQ16 bit (bit 0)*/- if (i2c_read(BOCO, REG_IRQ_CIRQ2, 1, &buf, 1) != 0)
printf("%s: Error reading Boco\n", __func__);- else
if ((buf & MASK_RBI_DEFECT_16) == MASK_RBI_DEFECT_16)return 1;- return 0;
-} -#endif
- #if (defined(CONFIG_KM_PIGGY4_88E6061)|defined(CONFIG_KM_PIGGY4_88E6352)) /*
- All boards with PIGGY4 connected via a simple switch have ethernet always
@@ -198,39 +178,6 @@ static void set_bootcount_addr(void)
int misc_init_r(void) { -#if defined(CONFIG_KM_MGCOGE3UN)
- char *wait_for_ne;
- u8 dip_switch = kw_gpio_get_value(KM_FLASH_ERASE_ENABLE);
- wait_for_ne = env_get("waitforne");
- if ((wait_for_ne != NULL) && (dip_switch == 0)) {
if (strcmp(wait_for_ne, "true") == 0) {int cnt = 0;int abort = 0;puts("NE go: ");while (startup_allowed() == 0) {if (tstc()) {(void) getc(); /* consume input */abort = 1;break;}udelay(200000);cnt++;if (cnt == 5)puts("wait\b\b\b\b");if (cnt == 10) {cnt = 0;puts(" \b\b\b\b");}}if (abort == 1)printf("\nAbort waiting for ne\n");elseputs("OK\n");}- }
-#endif
- ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN, CONFIG_PIGGY_MAC_ADDRESS_OFFSET);
@@ -293,7 +240,7 @@ int board_init(void)
int board_late_init(void) { -#if (defined(CONFIG_KM_COGE5UN) | defined(CONFIG_KM_MGCOGE3UN)) +#if defined(CONFIG_KM_COGE5UN) u8 dip_switch = kw_gpio_get_value(KM_FLASH_ERASE_ENABLE);
/* if pin 1 do full erase */ diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig deleted file mode 100644 index 24f6b4656c..0000000000 --- a/configs/mgcoge3un_defconfig +++ /dev/null @@ -1,52 +0,0 @@ -CONFIG_ARM=y -CONFIG_SYS_DCACHE_OFF=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_KIRKWOOD=y -CONFIG_SYS_TEXT_BASE=0x07d00000 -CONFIG_TARGET_KM_KIRKWOOD=y -CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 -CONFIG_KM_PIGGY4_88E6061=y -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0x0 -CONFIG_IDENT_STRING="\nKeymile COGE3UN" -CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN" -CONFIG_MISC_INIT_R=y -CONFIG_VERSION_VARIABLE=y -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_HUSH_PARSER=y -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" -CONFIG_AUTOBOOT_STOP_STR=" " -CONFIG_CMD_ASKENV=y -CONFIG_CMD_GREPENV=y -CONFIG_CMD_EEPROM=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_JFFS2=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" -CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);" -CONFIG_CMD_UBI=y -# CONFIG_CMD_UBIFS is not set -CONFIG_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood" -CONFIG_ENV_IS_IN_EEPROM=y -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -CONFIG_ENV_OFFSET_REDUND=0x2000 -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_BOOTCOUNT_RAM=y -CONFIG_BOOTCOUNT_BOOTLIMIT=3 -# CONFIG_MMC is not set -CONFIG_SF_DEFAULT_SPEED=8100000 -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_MVGBE=y -CONFIG_MII=y -CONFIG_SYS_NS16550=y -CONFIG_SPI=y -CONFIG_KIRKWOOD_SPI=y -CONFIG_BCH=y diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h index 6fce83cfcd..064097a631 100644 --- a/include/configs/km_kirkwood.h +++ b/include/configs/km_kirkwood.h @@ -51,14 +51,6 @@ #undef CONFIG_SYS_KWD_CONFIG #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
-/* KM_MGCOGE3UN */ -#elif defined(CONFIG_KM_MGCOGE3UN) -#define CONFIG_HOSTNAME "mgcoge3un" -#undef CONFIG_SYS_KWD_CONFIG -#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-memphis.cfg -#define CONFIG_KM_BOARD_EXTRA_ENV "waitforne=true\0" -#define CONFIG_KM_DISABLE_PCIE
- /* KMCOGE5UN */ #elif defined(CONFIG_KM_COGE5UN) #undef CONFIG_SYS_KWD_CONFIG
@@ -113,7 +105,7 @@
#ifdef CONFIG_KM_PIGGY4_88E6061 /*
- Some keymile boards like mgcoge3un have their PIGGY4 connected via
- Some keymile boards like mgcoge5un have their PIGGY4 connected via
- an Marvell 88E6061 simple switch.
- In this case we have to change the default settings for the
- ethernet phy connected to the kirkwood.
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7784922693..08fab0aebf 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -946,7 +946,6 @@ CONFIG_KM_ECC_MODE CONFIG_KM_KIRKWOOD CONFIG_KM_KIRKWOOD_128M16 CONFIG_KM_KIRKWOOD_PCI -CONFIG_KM_MGCOGE3UN CONFIG_KM_NEW_ENV CONFIG_KM_NUSA CONFIG_KM_ROOTFSSIZE
Viele Grüße, Stefan
On Mon, Nov 25, 2019 at 05:24:15PM +0100, Holger Brunck wrote:
This target is out of maintenance and can be removed.
Signed-off-by: Holger Brunck holger.brunck@ch.abb.com CC: Stefan Roese sr@denx.de CC: Valentin Longchamp valentin.longchamp@ch.abb.com Reviewed-by: Stefan Roese sr@denx.de
Applied to u-boot/master, thanks!
The M25P80 and M25P32 SPI flashes from Numonix/Micron will be replaced by Marconix MX25L80 and MX25L32 flashes.
Signed-off-by: Holger Brunck holger.brunck@ch.abb.com CC: Stefan Roese sr@denx.de CC: Valentin Longchamp valentin.longchamp@ch.abb.com --- configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmnusa_defconfig | 1 + 4 files changed, 4 insertions(+)
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index 73b4054dcc..c05b789897 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -42,6 +42,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_SF_DEFAULT_SPEED=8100000 CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig index ea8af60fa5..a17cfdd92c 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -42,6 +42,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_SF_DEFAULT_SPEED=8100000 CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index f2c835029a..a44df06e1b 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -46,6 +46,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_SF_DEFAULT_SPEED=8100000 CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig index 0b5a0e4e22..ffd8cb03f9 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -46,6 +46,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_SF_DEFAULT_SPEED=8100000 CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MV88E6352_SWITCH=y CONFIG_MVGBE=y CONFIG_MII=y
On 25.11.19 17:24, Holger Brunck wrote:
The M25P80 and M25P32 SPI flashes from Numonix/Micron will be replaced by Marconix MX25L80 and MX25L32 flashes.
Signed-off-by: Holger Brunck holger.brunck@ch.abb.com CC: Stefan Roese sr@denx.de CC: Valentin Longchamp valentin.longchamp@ch.abb.com
Reviewed-by: Stefan Roese sr@denx.de
Thanks, Stefan
configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmnusa_defconfig | 1 + 4 files changed, 4 insertions(+)
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index 73b4054dcc..c05b789897 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -42,6 +42,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_SF_DEFAULT_SPEED=8100000 CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig index ea8af60fa5..a17cfdd92c 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -42,6 +42,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_SF_DEFAULT_SPEED=8100000 CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index f2c835029a..a44df06e1b 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -46,6 +46,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_SF_DEFAULT_SPEED=8100000 CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig index 0b5a0e4e22..ffd8cb03f9 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -46,6 +46,7 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 # CONFIG_MMC is not set CONFIG_SF_DEFAULT_SPEED=8100000 CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MV88E6352_SWITCH=y CONFIG_MVGBE=y CONFIG_MII=y
Viele Grüße, Stefan
On Mon, Nov 25, 2019 at 05:24:16PM +0100, Holger Brunck wrote:
The M25P80 and M25P32 SPI flashes from Numonix/Micron will be replaced by Marconix MX25L80 and MX25L32 flashes.
Signed-off-by: Holger Brunck holger.brunck@ch.abb.com CC: Stefan Roese sr@denx.de CC: Valentin Longchamp valentin.longchamp@ch.abb.com Reviewed-by: Stefan Roese sr@denx.de
Applied to u-boot/master, thanks!
On 25.11.19 17:24, Holger Brunck wrote:
This patch only fixes a typo.
Signed-off-by: Holger Brunck holger.brunck@ch.abb.com CC: Stefan Roese sr@denx.de CC: Valentin Longchamp valentin.longchamp@ch.abb.com
Reviewed-by: Stefan Roese sr@denx.de
Thanks, Stefan
board/keymile/Kconfig | 2 +- board/keymile/common/ivm.c | 6 +++--- configs/kmcoge5un_defconfig | 2 +- configs/mgcoge3un_defconfig | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index acaa9289f7..ba1960f3d0 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -70,7 +70,7 @@ config KM_COMMON_ETH_INIT Use the Ethernet initialization implemented in common code, which detects if a Piggy board is present.
-config PIGGY_MAC_ADRESS_OFFSET +config PIGGY_MAC_ADDRESS_OFFSET int "Piggy Address Offset" default 0 help diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index 50df44d1c1..429e9c7914 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -309,16 +309,16 @@ static int ivm_populate_env(unsigned char *buf, int len)
#ifndef CONFIG_KMTEGR1 /* if an offset is defined, add it */
- process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADRESS_OFFSET, true);
- process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADDRESS_OFFSET, true); env_set((char *)"ethaddr", (char *)valbuf); #else /* 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 the IVM
- process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADRESS_OFFSET, false);
- process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADDRESS_OFFSET, false); env_set((char *)"ethaddr", (char *)valbuf);
- process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADRESS_OFFSET, true);
- process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADDRESS_OFFSET, true); env_set((char *)"eth1addr", (char *)valbuf); #endif
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index ff23af3060..f2c835029a 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -4,7 +4,7 @@ CONFIG_ARCH_CPU_INIT=y CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y -CONFIG_PIGGY_MAC_ADRESS_OFFSET=3 +CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 CONFIG_KM_ENV_IS_IN_SPI_NOR=y CONFIG_KM_PIGGY4_88E6352=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig index cae6645832..24f6b4656c 100644 --- a/configs/mgcoge3un_defconfig +++ b/configs/mgcoge3un_defconfig @@ -4,7 +4,7 @@ CONFIG_ARCH_CPU_INIT=y CONFIG_KIRKWOOD=y CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y -CONFIG_PIGGY_MAC_ADRESS_OFFSET=3 +CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 CONFIG_KM_PIGGY4_88E6061=y CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x0
Viele Grüße, Stefan
On Mon, Nov 25, 2019 at 05:24:13PM +0100, Holger Brunck wrote:
This patch only fixes a typo.
Signed-off-by: Holger Brunck holger.brunck@ch.abb.com CC: Stefan Roese sr@denx.de CC: Valentin Longchamp valentin.longchamp@ch.abb.com Reviewed-by: Stefan Roese sr@denx.de
Applied to u-boot/master, thanks!
participants (3)
-
Holger Brunck -
Stefan Roese -
Tom Rini