arm: Remove spear310 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 52d3934dd8875b2e102b3df1c5e723729cc3d10b..6f860acb7c1af54566164a866d0a436f60a6c8f2 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_SPEAR310
-       bool "Support spear310"
-       select BOARD_EARLY_INIT_F
-       select CPU_ARM926EJS
-       select GPIO_EXTRA_HEADER
-       select PL011_SERIAL
-       imply CMD_SAVES
-
 config TARGET_SPEAR320
        bool "Support spear320"
        select BOARD_EARLY_INIT_F
@@ -2114,7 +2106,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/spear310/Kconfig"
 source "board/spear/spear320/Kconfig"
 source "board/spear/spear600/Kconfig"
 source "board/spear/x600/Kconfig"

diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
index bb955c9e08269c09d15d9ec00a7946679932af0a..d05878edf8978f23ffaf3d2e4bdf0752143a7786 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)
 {
-#if defined(CONFIG_SPEAR310)
-       printf("CPU:   SPEAr310\n");
-#elif defined(CONFIG_SPEAR320)
+#if defined(CONFIG_SPEAR320)
        printf("CPU:   SPEAr320\n");
 #elif defined(CONFIG_SPEAR600)
        printf("CPU:   SPEAr600\n");

diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c
index 6f14f4ff666e43551e6468ef31d4a59be88614b8..5b5b79be8c3b12d63c17c873d44b26645f1e8f54 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;
-#if defined(CONFIG_SPEAR310)
-       return SOC_SPEAR310;
-#elif defined(CONFIG_SPEAR320)
+#if defined(CONFIG_SPEAR320)
        return SOC_SPEAR320;
 #endif
 }

diff --git a/arch/arm/include/asm/arch-spear/hardware.h b/arch/arm/include/asm/arch-spear/hardware.h
index 002d3ecdec9d478bf7b5bdf62f801d98a5d2ee5e..b0bf1af1705455c63b46c1ff01b1bfd9265715b9 100644 (file)
--- a/arch/arm/include/asm/arch-spear/hardware.h
+++ b/arch/arm/include/asm/arch-spear/hardware.h
@@ -41,22 +41,6 @@
 
 #define CONFIG_SPEAR_MPMCREGS                  100
 
-#elif defined(CONFIG_SPEAR310)
-#define CONFIG_SYS_FSMC_BASE                   0x44000000
-
-#undef CONFIG_SYS_NAND_CLE
-#undef CONFIG_SYS_NAND_ALE
-#define CONFIG_SYS_NAND_CLE                    (1 << 17)
-#define CONFIG_SYS_NAND_ALE                    (1 << 16)
-
-#define CONFIG_SPEAR_EMIBASE                   0x4F000000
-#define CONFIG_SPEAR_RASBASE                   0xB4000000
-
-#define CONFIG_SYS_MACB0_BASE                  0xB0000000
-#define CONFIG_SYS_MACB1_BASE                  0xB0800000
-#define CONFIG_SYS_MACB2_BASE                  0xB1000000
-#define CONFIG_SYS_MACB3_BASE                  0xB1800000
-
 #elif defined(CONFIG_SPEAR320)
 #define CONFIG_SYS_FSMC_BASE                   0x4C000000
 

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

diff --git a/board/spear/spear310/MAINTAINERS b/board/spear/spear310/MAINTAINERS
deleted file mode 100644 (file)
index 4f9aa15..0000000
--- a/board/spear/spear310/MAINTAINERS
+++ /dev/null
@@ -1,15 +0,0 @@
-SPEAR310 BOARD
-M:     Vipin Kumar <vipin.kumar@st.com>
-S:     Maintained
-F:     board/spear/spear310/
-F:     include/configs/spear3xx_evb.h
-F:     configs/spear310_defconfig
-
-SPEAR310_NAND BOARD
-#M:    -
-S:     Maintained
-F:     configs/spear310_nand_defconfig
-F:     configs/spear310_pnor_defconfig
-F:     configs/spear310_usbtty_defconfig
-F:     configs/spear310_usbtty_nand_defconfig
-F:     configs/spear310_usbtty_pnor_defconfig

diff --git a/board/spear/spear310/Makefile b/board/spear/spear310/Makefile
deleted file mode 100644 (file)
index 581d414..0000000
--- a/board/spear/spear310/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  := spear310.o

diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
deleted file mode 100644 (file)
index b4c3c0c..0000000
--- a/board/spear/spear310/spear310.c
+++ /dev/null
@@ -1,79 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2009
- * Ryan Chen, ST Micoelectronics, ryan.chen@st.com.
- * 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_SPEAR310);
-}
-
-/*
- * 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
-#if defined(CONFIG_MACB)
-       if (macb_eth_initialize(0, (void *)CONFIG_SYS_MACB0_BASE,
-                               CONFIG_MACB0_PHY) >= 0)
-               ret++;
-
-       if (macb_eth_initialize(1, (void *)CONFIG_SYS_MACB1_BASE,
-                               CONFIG_MACB1_PHY) >= 0)
-               ret++;
-
-       if (macb_eth_initialize(2, (void *)CONFIG_SYS_MACB2_BASE,
-                               CONFIG_MACB2_PHY) >= 0)
-               ret++;
-
-       if (macb_eth_initialize(3, (void *)CONFIG_SYS_MACB3_BASE,
-                               CONFIG_MACB3_PHY) >= 0)
-               ret++;
-#endif
-       return ret;
-}

diff --git a/configs/spear310_defconfig b/configs/spear310_defconfig
deleted file mode 100644 (file)
index 9818fe9..0000000
--- a/configs/spear310_defconfig
+++ /dev/null
@@ -1,35 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_TARGET_SPEAR310=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="SPEAR310"
-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/spear310_nand_defconfig b/configs/spear310_nand_defconfig
deleted file mode 100644 (file)
index a7eaccc..0000000
--- a/configs/spear310_nand_defconfig
+++ /dev/null
@@ -1,35 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_TARGET_SPEAR310=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="SPEAR310"
-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/spear310_pnor_defconfig b/configs/spear310_pnor_defconfig
deleted file mode 100644 (file)
index 186a5b5..0000000
--- a/configs/spear310_pnor_defconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_TARGET_SPEAR310=y
-CONFIG_SYS_TEXT_BASE=0x00700000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_IDENT_STRING="-SPEAr"
-CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,FLASH_PNOR"
-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=0x50060000
-CONFIG_SYS_I2C_DW=y
-# CONFIG_MMC is not set
-CONFIG_MTD=y
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=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/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig
deleted file mode 100644 (file)
index f51d801..0000000
--- a/configs/spear310_usbtty_defconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_TARGET_SPEAR310=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="SPEAR310,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/spear310_usbtty_nand_defconfig b/configs/spear310_usbtty_nand_defconfig
deleted file mode 100644 (file)
index 32a0cbe..0000000
--- a/configs/spear310_usbtty_nand_defconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_TARGET_SPEAR310=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="SPEAR310,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/configs/spear310_usbtty_pnor_defconfig b/configs/spear310_usbtty_pnor_defconfig
deleted file mode 100644 (file)
index 0bff01a..0000000
--- a/configs/spear310_usbtty_pnor_defconfig
+++ /dev/null
@@ -1,40 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_TARGET_SPEAR310=y
-CONFIG_SYS_TEXT_BASE=0x00700000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_SECT_SIZE=0x20000
-CONFIG_IDENT_STRING="-SPEAr"
-CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY,FLASH_PNOR"
-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=0x50060000
-CONFIG_SYS_I2C_DW=y
-# CONFIG_MMC is not set
-CONFIG_MTD=y
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=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 da41996470cdaf0d45f19ab0b6c2cc912fbfd8f2..7bcc857dade29493c63cca236e9687018b2c2236 100644 (file)
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -138,8 +138,8 @@ 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_SPEAR310 || \
-               TARGET_SPEAR320 || TARGET_SPEAR600 || TARGET_X600)
+       depends on SYS_I2C_DW && \
+               (TARGET_SPEAR320 || TARGET_SPEAR600 || TARGET_X600)
        default y
        help
          Some versions of the Designware I2C controller do not support the

diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index a9abdb0f792ee3ca06c6c5141f6ed51ece7fb7e9..122990e6348999ccf1279003d704f658db4bf883 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_SPEAR310)
-#define CONFIG_SYS_I2C_BASE                    0xD0180000
 #elif defined(CONFIG_SPEAR320)
 #define CONFIG_SYS_I2C_BASE                    0xD0180000
 #endif