arm: Remove spear300 boards

These boards have not been converted to CONFIG_DM_USB by the deadline
and is also missing conversion to CONFIG_DM.  Remove them.

Cc: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d7ed9ce..52d3934 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -566,14 +566,6 @@ config ARCH_ORION5X
        select CPU_ARM926EJS
        select GPIO_EXTRA_HEADER
 
-config TARGET_SPEAR300
-       bool "Support spear300"
-       select BOARD_EARLY_INIT_F
-       select CPU_ARM926EJS
-       select GPIO_EXTRA_HEADER
-       select PL011_SERIAL
-       imply CMD_SAVES
-
 config TARGET_SPEAR310
        bool "Support spear310"
        select BOARD_EARLY_INIT_F
@@ -2122,7 +2114,6 @@ source "board/kontron/sl28/Kconfig"
 source "board/myir/mys_6ulx/Kconfig"
 source "board/seeed/npi_imx6ull/Kconfig"
 source "board/socionext/developerbox/Kconfig"
-source "board/spear/spear300/Kconfig"
 source "board/spear/spear310/Kconfig"
 source "board/spear/spear320/Kconfig"
 source "board/spear/spear600/Kconfig"

diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
index 2106541..bb955c9 100644 (file)
--- a/arch/arm/cpu/arm926ejs/spear/cpu.c
+++ b/arch/arm/cpu/arm926ejs/spear/cpu.c
@@ -66,9 +66,7 @@ int arch_cpu_init(void)
 #ifdef CONFIG_DISPLAY_CPUINFO
 int print_cpuinfo(void)
 {
-#ifdef CONFIG_SPEAR300
-       printf("CPU:   SPEAr300\n");
-#elif defined(CONFIG_SPEAR310)
+#if defined(CONFIG_SPEAR310)
        printf("CPU:   SPEAr310\n");
 #elif defined(CONFIG_SPEAR320)
        printf("CPU:   SPEAr320\n");

diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c
index b5b9945..6f14f4f 100644 (file)
--- a/arch/arm/cpu/arm926ejs/spear/spl.c
+++ b/arch/arm/cpu/arm926ejs/spear/spl.c
@@ -205,9 +205,7 @@ int get_socrev(void)
                return SOC_SPEAR600_BA;
        else
                return SOC_SPEAR_NA;
-#elif defined(CONFIG_SPEAR300)
-       return SOC_SPEAR300;
-#elif defined(CONFIG_SPEAR310)
+#if defined(CONFIG_SPEAR310)
        return SOC_SPEAR310;
 #elif defined(CONFIG_SPEAR320)
        return SOC_SPEAR320;

diff --git a/arch/arm/include/asm/arch-spear/hardware.h b/arch/arm/include/asm/arch-spear/hardware.h
index c05bd44..002d3ec 100644 (file)
--- a/arch/arm/include/asm/arch-spear/hardware.h
+++ b/arch/arm/include/asm/arch-spear/hardware.h
@@ -41,9 +41,6 @@
 
 #define CONFIG_SPEAR_MPMCREGS                  100
 
-#elif defined(CONFIG_SPEAR300)
-#define CONFIG_SYS_FSMC_BASE                   0x94000000
-
 #elif defined(CONFIG_SPEAR310)
 #define CONFIG_SYS_FSMC_BASE                   0x44000000
 

diff --git a/board/spear/spear300/Kconfig b/board/spear/spear300/Kconfig
deleted file mode 100644 (file)
index 27360f3..0000000
--- a/board/spear/spear300/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_SPEAR300
-
-config SYS_BOARD
-       default "spear300"
-
-config SYS_VENDOR
-       default "spear"
-
-config SYS_SOC
-       default "spear"
-
-config SYS_CONFIG_NAME
-       default "spear3xx_evb"
-
-endif

diff --git a/board/spear/spear300/MAINTAINERS b/board/spear/spear300/MAINTAINERS
deleted file mode 100644 (file)
index 07152ae..0000000
--- a/board/spear/spear300/MAINTAINERS
+++ /dev/null
@@ -1,13 +0,0 @@
-SPEAR300 BOARD
-M:     Vipin Kumar <vipin.kumar@st.com>
-S:     Maintained
-F:     board/spear/spear300/
-F:     include/configs/spear3xx_evb.h
-F:     configs/spear300_defconfig
-
-SPEAR300_NAND BOARD
-#M:    -
-S:     Maintained
-F:     configs/spear300_nand_defconfig
-F:     configs/spear300_usbtty_defconfig
-F:     configs/spear300_usbtty_nand_defconfig

diff --git a/board/spear/spear300/Makefile b/board/spear/spear300/Makefile
deleted file mode 100644 (file)
index d638bfc..0000000
--- a/board/spear/spear300/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2004
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-
-obj-y  := spear300.o

diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c
deleted file mode 100644 (file)
index a594538..0000000
--- a/board/spear/spear300/spear300.c
+++ /dev/null
@@ -1,61 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2009
- * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
- */
-
-#include <common.h>
-#include <miiphy.h>
-#include <net.h>
-#include <netdev.h>
-#include <nand.h>
-#include <asm/io.h>
-#include <linux/mtd/fsmc_nand.h>
-#include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/spr_defs.h>
-#include <asm/arch/spr_misc.h>
-
-static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE];
-
-int board_init(void)
-{
-       return spear_board_init(MACH_TYPE_SPEAR300);
-}
-
-/*
- * board_nand_init - Board specific NAND initialization
- * @nand:      mtd private chip structure
- *
- * Called by nand_init_chip to initialize the board specific functions
- */
-
-void board_nand_init()
-{
-       struct misc_regs *const misc_regs_p =
-           (struct misc_regs *)CONFIG_SPEAR_MISCBASE;
-       struct nand_chip *nand = &nand_chip[0];
-
-#if defined(CONFIG_NAND_FSMC)
-       if (((readl(&misc_regs_p->auto_cfg_reg) & MISC_SOCCFGMSK) ==
-            MISC_SOCCFG30) ||
-           ((readl(&misc_regs_p->auto_cfg_reg) & MISC_SOCCFGMSK) ==
-            MISC_SOCCFG31)) {
-
-               fsmc_nand_init(nand);
-       }
-#endif
-       return;
-}
-
-int board_eth_init(struct bd_info *bis)
-{
-       int ret = 0;
-
-#if defined(CONFIG_ETH_DESIGNWARE)
-       u32 interface = PHY_INTERFACE_MODE_MII;
-       if (designware_initialize(CONFIG_SPEAR_ETHBASE, interface) >= 0)
-               ret++;
-#endif
-       return ret;
-}

diff --git a/configs/spear300_defconfig b/configs/spear300_defconfig
deleted file mode 100644 (file)
index b4dfd93..0000000
--- a/configs/spear300_defconfig
+++ /dev/null
@@ -1,35 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_TARGET_SPEAR300=y
-CONFIG_SYS_TEXT_BASE=0x00700000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_IDENT_STRING="-SPEAr"
-CONFIG_SYS_EXTRA_OPTIONS="SPEAR300"
-CONFIG_BOOTDELAY=1
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2"
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_MISC_INIT_R=y
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_NAND=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xF8040000
-CONFIG_SYS_I2C_DW=y
-# CONFIG_MMC is not set
-CONFIG_MTD=y
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_PHY_GIGE=y
-CONFIG_ETH_DESIGNWARE=y
-CONFIG_MII=y
-CONFIG_CONS_INDEX=0

diff --git a/configs/spear300_nand_defconfig b/configs/spear300_nand_defconfig
deleted file mode 100644 (file)
index eb749af..0000000
--- a/configs/spear300_nand_defconfig
+++ /dev/null
@@ -1,35 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_TARGET_SPEAR300=y
-CONFIG_SYS_TEXT_BASE=0x00700000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_OFFSET=0x60000
-CONFIG_IDENT_STRING="-SPEAr"
-CONFIG_SYS_EXTRA_OPTIONS="SPEAR300"
-CONFIG_BOOTDELAY=1
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2"
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_MISC_INIT_R=y
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_NAND=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_NAND=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_I2C_DW=y
-# CONFIG_MMC is not set
-CONFIG_MTD=y
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_PHY_GIGE=y
-CONFIG_ETH_DESIGNWARE=y
-CONFIG_MII=y
-CONFIG_CONS_INDEX=0

diff --git a/configs/spear300_usbtty_defconfig b/configs/spear300_usbtty_defconfig
deleted file mode 100644 (file)
index d87574b..0000000
--- a/configs/spear300_usbtty_defconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_TARGET_SPEAR300=y
-CONFIG_SYS_TEXT_BASE=0x00700000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_IDENT_STRING="-SPEAr"
-CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,USBTTY"
-CONFIG_BOOTDELAY=-1
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2"
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_MISC_INIT_R=y
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_NAND=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_ADDR=0xF8040000
-CONFIG_SYS_I2C_DW=y
-# CONFIG_MMC is not set
-CONFIG_MTD=y
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_PHY_GIGE=y
-CONFIG_ETH_DESIGNWARE=y
-CONFIG_MII=y
-CONFIG_CONS_INDEX=0
-CONFIG_USB=y
-CONFIG_USB_GADGET=y

diff --git a/configs/spear300_usbtty_nand_defconfig b/configs/spear300_usbtty_nand_defconfig
deleted file mode 100644 (file)
index 16d0f2e..0000000
--- a/configs/spear300_usbtty_nand_defconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_TARGET_SPEAR300=y
-CONFIG_SYS_TEXT_BASE=0x00700000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_OFFSET=0x60000
-CONFIG_IDENT_STRING="-SPEAr"
-CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,USBTTY"
-CONFIG_BOOTDELAY=-1
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2"
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_MISC_INIT_R=y
-# CONFIG_AUTO_COMPLETE is not set
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_NAND=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_NAND=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_SYS_I2C_DW=y
-# CONFIG_MMC is not set
-CONFIG_MTD=y
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_PHY_GIGE=y
-CONFIG_ETH_DESIGNWARE=y
-CONFIG_MII=y
-CONFIG_CONS_INDEX=0
-CONFIG_USB=y
-CONFIG_USB_GADGET=y

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 41065dd..da41996 100644 (file)
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -138,7 +138,7 @@ config SYS_I2C_DW
 
 config SYS_I2C_DW_ENABLE_STATUS_UNSUPPORTED
        bool "DW I2C Enable Status Register not supported"
-       depends on SYS_I2C_DW && (TARGET_SPEAR300 || TARGET_SPEAR310 || \
+       depends on SYS_I2C_DW && (TARGET_SPEAR310 || \
                TARGET_SPEAR320 || TARGET_SPEAR600 || TARGET_X600)
        default y
        help

diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 4ba51d5..a9abdb0 100644 (file)
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -33,8 +33,6 @@
 #define CONFIG_SYS_I2C
 #if defined(CONFIG_SPEAR600)
 #define CONFIG_SYS_I2C_BASE                    0xD0200000
-#elif defined(CONFIG_SPEAR300)
-#define CONFIG_SYS_I2C_BASE                    0xD0180000
 #elif defined(CONFIG_SPEAR310)
 #define CONFIG_SYS_I2C_BASE                    0xD0180000
 #elif defined(CONFIG_SPEAR320)

diff --git a/include/configs/spear3xx_evb.h b/include/configs/spear3xx_evb.h
deleted file mode 100644 (file)
index 2f642b1..0000000
--- a/include/configs/spear3xx_evb.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2009
- * Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-#if defined(CONFIG_SPEAR300)
-#define CONFIG_SPEAR3XX
-#elif defined(CONFIG_SPEAR310)
-#define CONFIG_SPEAR3XX
-#elif defined(CONFIG_SPEAR320)
-#define CONFIG_SPEAR3XX
-#endif
-
-#if defined(CONFIG_USBTTY)
-#define CONFIG_SPEAR_USBTTY
-#endif
-
-#include <configs/spear-common.h>
-
-/* Ethernet driver configuration */
-#define CONFIG_DW_ALTDESCRIPTOR
-
-#if defined(CONFIG_SPEAR310)
-#define CONFIG_MACB
-#define CONFIG_MACB0_PHY                       0x01
-#define CONFIG_MACB1_PHY                       0x03
-#define CONFIG_MACB2_PHY                       0x05
-#define CONFIG_MACB3_PHY                       0x07
-
-#elif defined(CONFIG_SPEAR320)
-#define CONFIG_MACB
-#define CONFIG_MACB0_PHY                       0x01
-
-#endif
-
-/* Serial Configuration (PL011) */
-#define CONFIG_SYS_SERIAL0                     0xD0000000
-
-#if defined(CONFIG_SPEAR300)
-#define CONFIG_PL01x_PORTS                     {(void *)CONFIG_SYS_SERIAL0}
-
-#elif defined(CONFIG_SPEAR310)
-
-#if (CONFIG_CONS_INDEX)
-#undef  CONFIG_PL011_CLOCK
-#define CONFIG_PL011_CLOCK                     (83 * 1000 * 1000)
-#endif
-
-#define CONFIG_SYS_SERIAL1                     0xB2000000
-#define CONFIG_SYS_SERIAL2                     0xB2080000
-#define CONFIG_SYS_SERIAL3                     0xB2100000
-#define CONFIG_SYS_SERIAL4                     0xB2180000
-#define CONFIG_SYS_SERIAL5                     0xB2200000
-#define CONFIG_PL01x_PORTS                     {(void *)CONFIG_SYS_SERIAL0, \
-                                               (void *)CONFIG_SYS_SERIAL1, \
-                                               (void *)CONFIG_SYS_SERIAL2, \
-                                               (void *)CONFIG_SYS_SERIAL3, \
-                                               (void *)CONFIG_SYS_SERIAL4, \
-                                               (void *)CONFIG_SYS_SERIAL5 }
-#elif defined(CONFIG_SPEAR320)
-
-#if (CONFIG_CONS_INDEX)
-#undef  CONFIG_PL011_CLOCK
-#define CONFIG_PL011_CLOCK                     (83 * 1000 * 1000)
-#endif
-
-#define CONFIG_SYS_SERIAL1                     0xA3000000
-#define CONFIG_SYS_SERIAL2                     0xA4000000
-#define CONFIG_PL01x_PORTS                     {(void *)CONFIG_SYS_SERIAL0, \
-                                               (void *)CONFIG_SYS_SERIAL1, \
-                                               (void *)CONFIG_SYS_SERIAL2 }
-#endif
-
-#if defined(CONFIG_SPEAR_EMI)
-#if defined(CONFIG_SPEAR310)
-#define CONFIG_SYS_FLASH_BASE                  0x50000000
-#define CONFIG_SYS_CS1_FLASH_BASE              0x60000000
-#define CONFIG_SYS_CS2_FLASH_BASE              0x70000000
-#define CONFIG_SYS_CS3_FLASH_BASE              0x80000000
-#define CONFIG_SYS_CS4_FLASH_BASE              0x90000000
-#define CONFIG_SYS_CS5_FLASH_BASE              0xA0000000
-#define CONFIG_SYS_FLASH_BANKS_LIST            { CONFIG_SYS_FLASH_BASE,   \
-                                               CONFIG_SYS_CS1_FLASH_BASE, \
-                                               CONFIG_SYS_CS2_FLASH_BASE, \
-                                               CONFIG_SYS_CS3_FLASH_BASE, \
-                                               CONFIG_SYS_CS4_FLASH_BASE, \
-                                               CONFIG_SYS_CS5_FLASH_BASE }
-#define CONFIG_SYS_MAX_FLASH_BANKS             6
-
-#elif defined(CONFIG_SPEAR320)
-#define CONFIG_SYS_FLASH_BASE                  0x44000000
-#define CONFIG_SYS_CS1_FLASH_BASE              0x45000000
-#define CONFIG_SYS_CS2_FLASH_BASE              0x46000000
-#define CONFIG_SYS_CS3_FLASH_BASE              0x47000000
-#define CONFIG_SYS_FLASH_BANKS_LIST            { CONFIG_SYS_FLASH_BASE,   \
-                                               CONFIG_SYS_CS1_FLASH_BASE, \
-                                               CONFIG_SYS_CS2_FLASH_BASE, \
-                                               CONFIG_SYS_CS3_FLASH_BASE }
-#define CONFIG_SYS_MAX_FLASH_BANKS             4
-
-#endif
-
-#define CONFIG_SYS_MAX_FLASH_SECT              (127 + 8)
-#define CONFIG_SYS_FLASH_QUIET_TEST
-
-#endif
-
-/* NAND flash configuration */
-#define CONFIG_SYS_FSMC_NAND_SP
-#define CONFIG_SYS_FSMC_NAND_8BIT
-
-#if defined(CONFIG_SPEAR300)
-#define CONFIG_SYS_NAND_BASE                   0x80000000
-
-#elif defined(CONFIG_SPEAR310)
-#define CONFIG_SYS_NAND_BASE                   0x40000000
-
-#elif defined(CONFIG_SPEAR320)
-#define CONFIG_SYS_NAND_BASE                   0x50000000
-
-#endif
-
-/* Environment Settings */
-#if defined(CONFIG_SPEAR300)
-#define CONFIG_EXTRA_ENV_SETTINGS              CONFIG_EXTRA_ENV_USBTTY
-
-#elif defined(CONFIG_SPEAR310) || defined(CONFIG_SPEAR320)
-#define CONFIG_EXTRA_ENV_UNLOCK                        "unlock=yes\0"
-#define CONFIG_EXTRA_ENV_SETTINGS              CONFIG_EXTRA_ENV_USBTTY \
-                                               CONFIG_EXTRA_ENV_UNLOCK
-#endif
-
-#endif  /* __CONFIG_H */