From: Tom Rini Date: Sat, 22 May 2021 12:47:13 +0000 (-0400) Subject: arm: Remove spear320 boards X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/%7B%7B%20%24image.RelPermalink%20%7D%7D?a=commitdiff_plain;h=d7221d0d660755fd395734afa4cce2948e5e5fa8;p=u-boot.git arm: Remove spear320 boards These boards have not been converted to CONFIG_DM_USB by the deadline and is also missing conversion to CONFIG_DM. Remove them. As this is also the last SPEAR3XX platform, remove that symbol as well. Cc: Vipin Kumar Signed-off-by: Tom Rini --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6f860acb7c..512b2c73ab 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_SPEAR320 - bool "Support spear320" - select BOARD_EARLY_INIT_F - select CPU_ARM926EJS - select GPIO_EXTRA_HEADER - select PL011_SERIAL - imply CMD_SAVES - config TARGET_SPEAR600 bool "Support spear600" select BOARD_EARLY_INIT_F @@ -2106,7 +2098,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/spear320/Kconfig" source "board/spear/spear600/Kconfig" source "board/spear/x600/Kconfig" source "board/st/stv0991/Kconfig" diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c index d05878edf8..2e0dd9ec33 100644 --- a/arch/arm/cpu/arm926ejs/spear/cpu.c +++ b/arch/arm/cpu/arm926ejs/spear/cpu.c @@ -19,9 +19,7 @@ int arch_cpu_init(void) periph1_clken = readl(&misc_p->periph1_clken); -#if defined(CONFIG_SPEAR3XX) - periph1_clken |= MISC_GPT2ENB; -#elif defined(CONFIG_SPEAR600) +#if defined(CONFIG_SPEAR600) periph1_clken |= MISC_GPT3ENB; #endif @@ -66,9 +64,7 @@ int arch_cpu_init(void) #ifdef CONFIG_DISPLAY_CPUINFO int print_cpuinfo(void) { -#if defined(CONFIG_SPEAR320) - printf("CPU: SPEAr320\n"); -#elif defined(CONFIG_SPEAR600) +#if defined(CONFIG_SPEAR600) printf("CPU: SPEAr600\n"); #else #error CPU not supported in spear platform diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c index 5b5b79be8c..693cee1ab3 100644 --- a/arch/arm/cpu/arm926ejs/spear/spl.c +++ b/arch/arm/cpu/arm926ejs/spear/spl.c @@ -205,8 +205,6 @@ int get_socrev(void) return SOC_SPEAR600_BA; else return SOC_SPEAR_NA; -#if defined(CONFIG_SPEAR320) - return SOC_SPEAR320; #endif } diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c index b42baa7150..d5f6cccaae 100644 --- a/arch/arm/cpu/arm926ejs/spear/timer.c +++ b/arch/arm/cpu/arm926ejs/spear/timer.c @@ -36,10 +36,7 @@ int timer_init(void) u32 synth; /* Prescaler setting */ -#if defined(CONFIG_SPEAR3XX) - writel(MISC_PRSC_CFG, &misc_regs_p->prsc2_clk_cfg); - synth = MISC_GPT4SYNTH; -#elif defined(CONFIG_SPEAR600) +#if defined(CONFIG_SPEAR600) writel(MISC_PRSC_CFG, &misc_regs_p->prsc1_clk_cfg); synth = MISC_GPT3SYNTH; #else diff --git a/arch/arm/include/asm/arch-spear/hardware.h b/arch/arm/include/asm/arch-spear/hardware.h index b0bf1af170..69b97a03e8 100644 --- a/arch/arm/include/asm/arch-spear/hardware.h +++ b/arch/arm/include/asm/arch-spear/hardware.h @@ -41,13 +41,5 @@ #define CONFIG_SPEAR_MPMCREGS 100 -#elif defined(CONFIG_SPEAR320) -#define CONFIG_SYS_FSMC_BASE 0x4C000000 - -#define CONFIG_SPEAR_EMIBASE 0x40000000 -#define CONFIG_SPEAR_RASBASE 0xB3000000 - -#define CONFIG_SYS_MACB0_BASE 0xAA000000 - #endif #endif /* _ASM_ARCH_HARDWARE_H */ diff --git a/arch/arm/include/asm/arch-spear/spr_misc.h b/arch/arm/include/asm/arch-spear/spr_misc.h index 0171119351..c1a30e24db 100644 --- a/arch/arm/include/asm/arch-spear/spr_misc.h +++ b/arch/arm/include/asm/arch-spear/spr_misc.h @@ -88,10 +88,7 @@ struct misc_regs { #define SYNTH23 0x00020003 /* PLLx_FRQ value */ -#if defined(CONFIG_SPEAR3XX) -#define FREQ_332 0xA600010C -#define FREQ_266 0x8500010C -#elif defined(CONFIG_SPEAR600) +#if defined(CONFIG_SPEAR600) #define FREQ_332 0xA600010F #define FREQ_266 0x8500010F #endif diff --git a/board/spear/spear320/Kconfig b/board/spear/spear320/Kconfig deleted file mode 100644 index df176230f4..0000000000 --- a/board/spear/spear320/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_SPEAR320 - -config SYS_BOARD - default "spear320" - -config SYS_VENDOR - default "spear" - -config SYS_SOC - default "spear" - -config SYS_CONFIG_NAME - default "spear3xx_evb" - -endif diff --git a/board/spear/spear320/MAINTAINERS b/board/spear/spear320/MAINTAINERS deleted file mode 100644 index bf7809230f..0000000000 --- a/board/spear/spear320/MAINTAINERS +++ /dev/null @@ -1,15 +0,0 @@ -SPEAR320 BOARD -M: Vipin Kumar -S: Maintained -F: board/spear/spear320/ -F: include/configs/spear3xx_evb.h -F: configs/spear320_defconfig - -SPEAR320_NAND BOARD -#M: - -S: Maintained -F: configs/spear320_nand_defconfig -F: configs/spear320_pnor_defconfig -F: configs/spear320_usbtty_defconfig -F: configs/spear320_usbtty_nand_defconfig -F: configs/spear320_usbtty_pnor_defconfig diff --git a/board/spear/spear320/Makefile b/board/spear/spear320/Makefile deleted file mode 100644 index 062cbc417a..0000000000 --- a/board/spear/spear320/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 := spear320.o diff --git a/board/spear/spear320/spear320.c b/board/spear/spear320/spear320.c deleted file mode 100644 index 291337b804..0000000000 --- a/board/spear/spear320/spear320.c +++ /dev/null @@ -1,78 +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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define PLGPIO_SEL_36 0xb3000028 -#define PLGPIO_IO_36 0xb3000038 - -static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE]; - -static void spear_phy_reset(void) -{ - writel(0x10, PLGPIO_IO_36); - writel(0x10, PLGPIO_SEL_36); -} - -int board_init(void) -{ - spear_phy_reset(); - return spear_board_init(MACH_TYPE_SPEAR320); -} - -/* - * 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++; -#endif - return ret; -} diff --git a/configs/spear320_defconfig b/configs/spear320_defconfig deleted file mode 100644 index edefff689d..0000000000 --- a/configs/spear320_defconfig +++ /dev/null @@ -1,35 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR320=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="SPEAR320" -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/spear320_nand_defconfig b/configs/spear320_nand_defconfig deleted file mode 100644 index 1646c4aa87..0000000000 --- a/configs/spear320_nand_defconfig +++ /dev/null @@ -1,35 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR320=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="SPEAR320" -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/spear320_pnor_defconfig b/configs/spear320_pnor_defconfig deleted file mode 100644 index 1c0b625e53..0000000000 --- a/configs/spear320_pnor_defconfig +++ /dev/null @@ -1,38 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR320=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="SPEAR320,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=0x44060000 -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/spear320_usbtty_defconfig b/configs/spear320_usbtty_defconfig deleted file mode 100644 index 62fe1fa6a5..0000000000 --- a/configs/spear320_usbtty_defconfig +++ /dev/null @@ -1,37 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR320=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="SPEAR320,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/spear320_usbtty_nand_defconfig b/configs/spear320_usbtty_nand_defconfig deleted file mode 100644 index e9f5c2d26e..0000000000 --- a/configs/spear320_usbtty_nand_defconfig +++ /dev/null @@ -1,37 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR320=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="SPEAR320,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/spear320_usbtty_pnor_defconfig b/configs/spear320_usbtty_pnor_defconfig deleted file mode 100644 index 3d993d724b..0000000000 --- a/configs/spear320_usbtty_pnor_defconfig +++ /dev/null @@ -1,40 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_CPU_INIT=y -CONFIG_TARGET_SPEAR320=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="SPEAR320,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=0x44060000 -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 7bcc857dad..de57ab928a 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -139,7 +139,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_SPEAR320 || TARGET_SPEAR600 || TARGET_X600) + (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 122990e634..d77ea6010a 100644 --- 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_SPEAR320) -#define CONFIG_SYS_I2C_BASE 0xD0180000 #endif #define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_I2C_SLAVE 0x02