diff options
| author | Tom Rini <trini@konsulko.com> | 2021-05-22 15:47:12 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-08 05:22:42 +0300 |
| commit | 1dc77c290f4b9610978e215b6dcf70e595b3270e (patch) | |
| tree | 99252d585cd1fbcf78a47e8597de438f4bacd785 /arch/arm | |
| parent | 0e377bbabbf288f1d88dd95964986e8a681a77e2 (diff) | |
| download | u-boot-1dc77c290f4b9610978e215b6dcf70e595b3270e.tar.xz | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 9 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/spear/cpu.c | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/spear/spl.c | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-spear/hardware.h | 16 |
4 files changed, 2 insertions, 31 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 52d3934dd8..6f860acb7c 100644 --- 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 bb955c9e08..d05878edf8 100644 --- 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 6f14f4ff66..5b5b79be8c 100644 --- 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 002d3ecdec..b0bf1af170 100644 --- 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 |