Skip to contentSkip to conversation

km/boards: fix typo for MAC address offset config option

PATCH New Holger Brunck 3 participants 12 messages Nov 25, 2019 – Jan 10, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 km/boards: fix typo for MAC address offset config option

This patch only fixes a typo.

CC Stefan Roese <[email protected]>
CC Valentin Longchamp <[email protected]>
---
 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(-)
board/keymile/Kconfig +1 -1
index acaa9289f7..ba1960f3d0 100644
@@ -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
board/keymile/common/ivm.c +3 -3
index 50df44d1c1..429e9c7914 100644
@@ -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
 
configs/kmcoge5un_defconfig +1 -1
index ff23af3060..f2c835029a 100644
@@ -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
configs/mgcoge3un_defconfig +1 -1
index cae6645832..24f6b4656c 100644
@@ -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
Signature · 1 line
2.24.0.rc1
#1 lore raw

PATCH 2/4 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.

CC Stefan Roese <[email protected]>
CC Valentin Longchamp <[email protected]>
CC Marek Vasut <[email protected]>
---
 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(-)
board/keymile/common/common.h +1 -1
index 42b760dc6e..8251de4db8 100644
@@ -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);
board/keymile/common/ivm.c +6 -6
index 429e9c7914..fee7f03c8c 100644
@@ -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);
 }
board/keymile/km83xx/km83xx.c +2 -1
index 8846b64f7d..59347a3990 100644
@@ -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;
 }
 
board/keymile/km_arm/km_arm.c +2 -1
index 922cc621f7..2724d8bd48 100644
@@ -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();
board/keymile/kmp204x/kmp204x.c +2 -1
index 4d1e38aa3a..e7c321c326 100644
@@ -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;
 }
 
Signature · 1 line
2.24.0.rc1
#2 lore raw

PATCH 2/4 km/boards: add MAC address offset as argument to ivm_populate_env

Quoted 9 lines · Holger Brunck

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.

CC Stefan Roese <[email protected]>
CC Valentin Longchamp <[email protected]>
CC Marek Vasut <[email protected]>

Thanks,
Stefan

Quoted 103 lines
---
  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(-)
board/keymile/common/common.h +1 -1
index 42b760dc6e..8251de4db8 100644
@@ -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);
board/keymile/common/ivm.c +6 -6
index 429e9c7914..fee7f03c8c 100644
@@ -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);
  }
board/keymile/km83xx/km83xx.c +2 -1
index 8846b64f7d..59347a3990 100644
@@ -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;
  }
 
board/keymile/km_arm/km_arm.c +2 -1
index 922cc621f7..2724d8bd48 100644
@@ -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();
board/keymile/kmp204x/kmp204x.c +0 -0
index 4d1e38aa3a..e7c321c326 100644

board/keymile/kmp204x/kmp204x.c int misc_init_r(void) · line 202

Quoted 9 lines
board/keymile/kmp204x/kmp204x.c +2 -1
@@ -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;
  }
 

Viele Grüße,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#3 lore raw

PATCH 2/4 km/boards: add MAC address offset as argument to ivm_populate_env

In reply to Holger Brunck
Quoted 10 lines · Holger Brunck

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.

CC Stefan Roese <[email protected]>
CC Valentin Longchamp <[email protected]>
CC Marek Vasut <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200110/e117203f/attachment.sig>
#4 lore raw

PATCH 3/4 arm/km: remove board KMCOGE3UN

In reply to Holger Brunck

This target is out of maintenance and can be removed.

CC Stefan Roese <[email protected]>
CC Valentin Longchamp <[email protected]>
---
 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
board/keymile/km_arm/MAINTAINERS +0 -1
index d80589ded7..17926017c3 100644
@@ -10,4 +10,3 @@ F:	configs/kmcoge5un_defconfig
 F:	configs/kmnusa_defconfig
 F:	configs/kmsugp1_defconfig
 F:	configs/kmsuv31_defconfig
-F:	configs/mgcoge3un_defconfig
board/keymile/km_arm/km_arm.c +1 -54

73 lines not on this page · raw message

configs/mgcoge3un_defconfig deleted +0 -52

52 lines not on this page · raw message

include/configs/km_kirkwood.h +1 -9
index 6fce83cfcd..064097a631 100644
@@ -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.
scripts/config_whitelist.txt +0 -1
index 7784922693..08fab0aebf 100644
@@ -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
Signature · 1 line
2.24.0.rc1
#5 lore raw

PATCH 3/4 arm/km: remove board KMCOGE3UN

Quoted 5 lines · Holger Brunck

This target is out of maintenance and can be removed.

CC Stefan Roese <[email protected]>
CC Valentin Longchamp <[email protected]>

Thanks,
Stefan

Quoted 190 lines
---
  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

board/keymile/km_arm/MAINTAINERS +0 -1
index d80589ded7..17926017c3 100644
@@ -10,4 +10,3 @@ F:	configs/kmcoge5un_defconfig
  F:	configs/kmnusa_defconfig
  F:	configs/kmsugp1_defconfig
  F:	configs/kmsuv31_defconfig
-F:	configs/mgcoge3un_defconfig
board/keymile/km_arm/km_arm.c +1 -54
index 2724d8bd48..d39a6b6362 100644
@@ -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 */
configs/mgcoge3un_defconfig deleted +0 -52
deleted file mode 100644
index 24f6b4656c..0000000000
@@ -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
include/configs/km_kirkwood.h +1 -9
index 6fce83cfcd..064097a631 100644
@@ -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.
scripts/config_whitelist.txt +0 -0
index 7784922693..08fab0aebf 100644

scripts/config_whitelist.txt CONFIG_KM_ECC_MODE · line 951

Quoted 7 lines
scripts/config_whitelist.txt +0 -1
@@ -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

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#6 lore raw

PATCH 3/4 arm/km: remove board KMCOGE3UN

In reply to Holger Brunck
Quoted 6 lines · Holger Brunck

This target is out of maintenance and can be removed.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200110/1cae6db7/attachment.sig>
#7 lore raw

PATCH 4/4 boards/km_arm: enable support for Macronix SPI NOR flash

In reply to Holger Brunck

The M25P80 and M25P32 SPI flashes from Numonix/Micron will be replaced by Marconix MX25L80 and MX25L32 flashes.

CC Stefan Roese <[email protected]>
CC Valentin Longchamp <[email protected]>
---
 configs/km_kirkwood_128m16_defconfig | 1 +
 configs/km_kirkwood_defconfig        | 1 +
 configs/kmcoge5un_defconfig          | 1 +
 configs/kmnusa_defconfig             | 1 +
 4 files changed, 4 insertions(+)
configs/km_kirkwood_128m16_defconfig +1 -0
index 73b4054dcc..c05b789897 100644
@@ -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
configs/km_kirkwood_defconfig +1 -0
index ea8af60fa5..a17cfdd92c 100644
@@ -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
configs/kmcoge5un_defconfig +1 -0
index f2c835029a..a44df06e1b 100644
@@ -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
configs/kmnusa_defconfig +1 -0
index 0b5a0e4e22..ffd8cb03f9 100644
@@ -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
Signature · 1 line
2.24.0.rc1
#8 lore raw

PATCH 4/4 boards/km_arm: enable support for Macronix SPI NOR flash

Quoted 6 lines · Holger Brunck

The M25P80 and M25P32 SPI flashes from Numonix/Micron will be replaced by Marconix MX25L80 and MX25L32 flashes.

CC Stefan Roese <[email protected]>
CC Valentin Longchamp <[email protected]>

Thanks,
Stefan

Quoted 49 lines
---
  configs/km_kirkwood_128m16_defconfig | 1 +
  configs/km_kirkwood_defconfig        | 1 +
  configs/kmcoge5un_defconfig          | 1 +
  configs/kmnusa_defconfig             | 1 +
  4 files changed, 4 insertions(+)
configs/km_kirkwood_128m16_defconfig +1 -0
index 73b4054dcc..c05b789897 100644
@@ -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
configs/km_kirkwood_defconfig +1 -0
index ea8af60fa5..a17cfdd92c 100644
@@ -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
configs/kmcoge5un_defconfig +1 -0
index f2c835029a..a44df06e1b 100644
@@ -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
configs/kmnusa_defconfig +0 -0
index 0b5a0e4e22..ffd8cb03f9 100644

configs/kmnusa_defconfig CONFIG_BOOTCOUNT_BOOTLIMIT=3 · line 52

Quoted 7 lines
configs/kmnusa_defconfig +1 -0
@@ -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

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#9 lore raw

PATCH 4/4 boards/km_arm: enable support for Macronix SPI NOR flash

In reply to Holger Brunck
Quoted 7 lines · Holger Brunck

The M25P80 and M25P32 SPI flashes from Numonix/Micron will be replaced by Marconix MX25L80 and MX25L32 flashes.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200110/505633d9/attachment.sig>
#10 lore raw

PATCH 1/4 km/boards: fix typo for MAC address offset config option

In reply to Holger Brunck
Quoted 5 lines · Holger Brunck

This patch only fixes a typo.

CC Stefan Roese <[email protected]>
CC Valentin Longchamp <[email protected]>

Thanks,
Stefan

Quoted 63 lines
---
  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(-)
board/keymile/Kconfig +1 -1
index acaa9289f7..ba1960f3d0 100644
@@ -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
board/keymile/common/ivm.c +3 -3
index 50df44d1c1..429e9c7914 100644
@@ -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
 
configs/kmcoge5un_defconfig +1 -1
index ff23af3060..f2c835029a 100644
@@ -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
configs/mgcoge3un_defconfig +0 -0
index cae6645832..24f6b4656c 100644

configs/mgcoge3un_defconfig CONFIG_ARCH_CPU_INIT=y · line 10

Quoted 8 lines
configs/mgcoge3un_defconfig +1 -1
@@ -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

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#11 lore raw

PATCH 1/4 km/boards: fix typo for MAC address offset config option

In reply to Holger Brunck
Quoted 6 lines · Holger Brunck

This patch only fixes a typo.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200110/a4e5434e/attachment-0001.sig>