From 58e1fdb051c469049d8ed8b31f229470de4d0562 Mon Sep 17 00:00:00 2001 From: Holger Brunck Date: Mon, 25 Nov 2019 17:24:13 +0100 Subject: km/boards: fix typo for MAC address offset config option This patch only fixes a typo. Signed-off-by: Holger Brunck CC: Stefan Roese CC: Valentin Longchamp Reviewed-by: Stefan Roese --- board/keymile/Kconfig | 2 +- board/keymile/common/ivm.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'board/keymile') diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index 5f512d56da..634dbbe097 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -76,7 +76,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 -- cgit From fd7c400962dd905611d5d3453a02fd4707da10fb Mon Sep 17 00:00:00 2001 From: Holger Brunck Date: Mon, 25 Nov 2019 17:24:14 +0100 Subject: km/boards: add MAC address offset as argument to ivm_populate_env 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 CC: Stefan Roese CC: Valentin Longchamp CC: Marek Vasut Reviewed-by: Stefan Roese --- 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(-) (limited to 'board/keymile') 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 5969d51395..feca7be372 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -186,7 +186,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 7f83ec180e..627543a0aa 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -232,7 +232,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 88914c80e8..9e1956c8b7 100644 --- a/board/keymile/kmp204x/kmp204x.c +++ b/board/keymile/kmp204x/kmp204x.c @@ -196,7 +196,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; } -- cgit From e7fdb3462d4b99a55e55f11688d1dd68b98cccd2 Mon Sep 17 00:00:00 2001 From: Holger Brunck Date: Mon, 25 Nov 2019 17:24:15 +0100 Subject: arm/km: remove board KMCOGE3UN This target is out of maintenance and can be removed. Signed-off-by: Holger Brunck CC: Stefan Roese CC: Valentin Longchamp Reviewed-by: Stefan Roese --- board/keymile/km_arm/MAINTAINERS | 1 - board/keymile/km_arm/km_arm.c | 55 +--------------------------------------- 2 files changed, 1 insertion(+), 55 deletions(-) (limited to 'board/keymile') 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 627543a0aa..7aa9fa7fca 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -122,26 +122,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 @@ -199,39 +179,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); @@ -294,7 +241,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 */ -- cgit