diff mbox series

[U-Boot,3/4] arm/km: remove board KMCOGE3UN

Message ID 20191125162416.9120-3-holger.brunck@ch.abb.com
State Accepted
Delegated to: Tom Rini
Headers show
Series [U-Boot,1/4] km/boards: fix typo for MAC address offset config option | expand

Commit Message

Holger Brunck Nov. 25, 2019, 4:24 p.m. UTC 
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

Comments

Stefan Roese Nov. 26, 2019, 1:21 p.m. UTC | #1 
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");
> -			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
> 

Viele Grüße,
Stefan
Tom Rini Jan. 10, 2020, 9:50 p.m. UTC | #2 
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!
diff mbox series

Patch

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