aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorTom Rini2021-05-22 08:47:11 -0400
committerTom Rini2021-07-07 22:22:42 -0400
commit0e377bbabbf288f1d88dd95964986e8a681a77e2 (patch)
tree996cbf38e8d2198c15d0ea130c145078a2f868fc /arch/arm
parentaa697e6904ba1b3144a46ec642d4695e7c0cdc3e (diff)
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig9
-rw-r--r--arch/arm/cpu/arm926ejs/spear/cpu.c4
-rw-r--r--arch/arm/cpu/arm926ejs/spear/spl.c4
-rw-r--r--arch/arm/include/asm/arch-spear/hardware.h3
4 files changed, 2 insertions, 18 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d7ed9ceef20..52d3934dd88 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_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 21065410746..bb955c9e082 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)
{
-#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 b5b9945a87f..6f14f4ff666 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;
-#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 c05bd44c42d..002d3ecdec9 100644
--- 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