Re: [PATCH 05/25] arm: imx: Remove MX23 support
On 09.02.21 14:02, Tom Rini wrote: > As there are now no boards for the MX23 family, remove the general > support. > I am fine to drop it. Acked-by: Stefano Babic Best regards, Stefano > Cc: Stefano Babic > Cc: Fabio Estevam > Cc: NXP i.MX U-Boot Team > Signed-off-by: Tom Rini > --- > arch/arm/Kconfig | 8 +- > arch/arm/Makefile | 2 +- > arch/arm/cpu/arm926ejs/mxs/Makefile | 1 - > arch/arm/cpu/arm926ejs/mxs/clock.c| 31 +- > arch/arm/cpu/arm926ejs/mxs/iomux.c| 7 +- > .../cpu/arm926ejs/mxs/mxsimage-spl.mx23.cfg | 5 - > arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg | 7 - > arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 31 +- > arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 85 + > arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 50 +-- > arch/arm/cpu/arm926ejs/mxs/timer.c| 12 +- > arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd| 18 - > arch/arm/include/asm/arch-mxs/imx-regs.h | 5 - > arch/arm/include/asm/arch-mxs/iomux-mx23.h| 349 -- > arch/arm/include/asm/arch-mxs/regs-base.h | 46 +-- > .../include/asm/arch-mxs/regs-clkctrl-mx23.h | 209 --- > .../include/asm/arch-mxs/regs-power-mx23.h| 344 - > arch/arm/include/asm/arch-mxs/regs-ssp.h | 42 +-- > arch/arm/include/asm/arch-mxs/regs-timrot.h | 97 + > arch/arm/include/asm/arch-mxs/sys_proto.h | 17 +- > arch/arm/include/asm/mach-imx/dma.h | 14 +- > arch/arm/include/asm/mach-imx/regs-apbh.h | 115 +- > arch/arm/include/asm/mach-imx/regs-lcdif.h| 12 - > arch/arm/mach-imx/mxs/Kconfig | 21 -- > drivers/dma/apbh_dma.c| 5 +- > drivers/gpio/mxs_gpio.c | 12 +- > drivers/mmc/mxsmmc.c | 12 +- > drivers/spi/mxs_spi.c | 9 +- > include/configs/mxs.h | 14 +- > tools/Makefile| 5 +- > 30 files changed, 44 insertions(+), 1541 deletions(-) > delete mode 100644 arch/arm/cpu/arm926ejs/mxs/mxsimage-spl.mx23.cfg > delete mode 100644 arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg > delete mode 100644 arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd > delete mode 100644 arch/arm/include/asm/arch-mxs/iomux-mx23.h > delete mode 100644 arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h > delete mode 100644 arch/arm/include/asm/arch-mxs/regs-power-mx23.h > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 95557d6ed6bd..f2a87c3caed8 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -856,12 +856,6 @@ config ARCH_IMXRT > select SUPPORT_SPL > imply CMD_DM > > -config ARCH_MX23 > - bool "NXP i.MX23 family" > - select CPU_ARM926EJS > - select PL011_SERIAL > - select SUPPORT_SPL > - > config ARCH_MX25 > bool "NXP MX25" > select CPU_ARM926EJS > @@ -2042,6 +2036,6 @@ source "arch/arm/Kconfig.debug" > endmenu > > config SPL_LDSCRIPT > - default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || > ARCH_MX28) && !SPL_FRAMEWORK > + default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if ARCH_MX28 && > !SPL_FRAMEWORK > default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136 > default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64 > diff --git a/arch/arm/Makefile b/arch/arm/Makefile > index 28b523b37c70..7c1bca7f9269 100644 > --- a/arch/arm/Makefile > +++ b/arch/arm/Makefile > @@ -107,7 +107,7 @@ libs-y += arch/arm/cpu/ > libs-y += arch/arm/lib/ > > ifeq ($(CONFIG_SPL_BUILD),y) > -ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 > mx6 mx7 mx35 imx8m imx8 imxrt)) > +ifneq (,$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35 > imx8m imx8 imxrt)) > libs-y += arch/arm/mach-imx/ > endif > else > diff --git a/arch/arm/cpu/arm926ejs/mxs/Makefile > b/arch/arm/cpu/arm926ejs/mxs/Makefile > index f60e61e4343f..f846a5400a3d 100644 > --- a/arch/arm/cpu/arm926ejs/mxs/Makefile > +++ b/arch/arm/cpu/arm926ejs/mxs/Makefile > @@ -12,7 +12,6 @@ obj-y += spl_boot.o spl_lradc_init.o spl_mem_init.o > spl_power_init.o > endif > > # Specify the target for use in elftosb call > -MKIMAGE_TARGET-$(CONFIG_MX23) = > mxsimage$(CONFIG_SPL_FRAMEWORK:%=-spl).mx23.cfg > MKIMAGE_TARGET-$(CONFIG_MX28) = > mxsimage$(CONFIG_SPL_FRAMEWORK:%=-spl).mx28.cfg > > # Generate HAB-capable IVT > diff --git a/arch/arm/cpu/arm926ejs/mxs/clock.c > b/arch/arm/cpu/arm926ejs/mxs/clock.c > index 4e1cf3a1e32b..9aa6f83bb395 100644 > --- a/arch/arm/cpu/arm926ejs/mxs/clock.c > +++ b/arch/arm/cpu/arm926ejs/mxs/clock.c > @@ -28,9 +28,7 @@ > #define PLL_FREQ_MHZ(PLL_FREQ_KHZ / 1000) > #define XTAL_FREQ_MHZ (XTAL_FREQ_KHZ / 1000) > > -#if defined(CONFIG_MX23) > -#define MXC_SSPCLK_MAX MXC_SSPCLK0 > -#elif defined(CONFIG_MX28) > +#if
[PATCH 05/25] arm: imx: Remove MX23 support
As there are now no boards for the MX23 family, remove the general
support.
Cc: Stefano Babic
Cc: Fabio Estevam
Cc: NXP i.MX U-Boot Team
Signed-off-by: Tom Rini
---
arch/arm/Kconfig | 8 +-
arch/arm/Makefile | 2 +-
arch/arm/cpu/arm926ejs/mxs/Makefile | 1 -
arch/arm/cpu/arm926ejs/mxs/clock.c| 31 +-
arch/arm/cpu/arm926ejs/mxs/iomux.c| 7 +-
.../cpu/arm926ejs/mxs/mxsimage-spl.mx23.cfg | 5 -
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg | 7 -
arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 31 +-
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 85 +
arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 50 +--
arch/arm/cpu/arm926ejs/mxs/timer.c| 12 +-
arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd| 18 -
arch/arm/include/asm/arch-mxs/imx-regs.h | 5 -
arch/arm/include/asm/arch-mxs/iomux-mx23.h| 349 --
arch/arm/include/asm/arch-mxs/regs-base.h | 46 +--
.../include/asm/arch-mxs/regs-clkctrl-mx23.h | 209 ---
.../include/asm/arch-mxs/regs-power-mx23.h| 344 -
arch/arm/include/asm/arch-mxs/regs-ssp.h | 42 +--
arch/arm/include/asm/arch-mxs/regs-timrot.h | 97 +
arch/arm/include/asm/arch-mxs/sys_proto.h | 17 +-
arch/arm/include/asm/mach-imx/dma.h | 14 +-
arch/arm/include/asm/mach-imx/regs-apbh.h | 115 +-
arch/arm/include/asm/mach-imx/regs-lcdif.h| 12 -
arch/arm/mach-imx/mxs/Kconfig | 21 --
drivers/dma/apbh_dma.c| 5 +-
drivers/gpio/mxs_gpio.c | 12 +-
drivers/mmc/mxsmmc.c | 12 +-
drivers/spi/mxs_spi.c | 9 +-
include/configs/mxs.h | 14 +-
tools/Makefile| 5 +-
30 files changed, 44 insertions(+), 1541 deletions(-)
delete mode 100644 arch/arm/cpu/arm926ejs/mxs/mxsimage-spl.mx23.cfg
delete mode 100644 arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
delete mode 100644 arch/arm/cpu/arm926ejs/mxs/u-boot-imx23.bd
delete mode 100644 arch/arm/include/asm/arch-mxs/iomux-mx23.h
delete mode 100644 arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h
delete mode 100644 arch/arm/include/asm/arch-mxs/regs-power-mx23.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 95557d6ed6bd..f2a87c3caed8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -856,12 +856,6 @@ config ARCH_IMXRT
select SUPPORT_SPL
imply CMD_DM
-config ARCH_MX23
- bool "NXP i.MX23 family"
- select CPU_ARM926EJS
- select PL011_SERIAL
- select SUPPORT_SPL
-
config ARCH_MX25
bool "NXP MX25"
select CPU_ARM926EJS
@@ -2042,6 +2036,6 @@ source "arch/arm/Kconfig.debug"
endmenu
config SPL_LDSCRIPT
- default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 ||
ARCH_MX28) && !SPL_FRAMEWORK
+ default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if ARCH_MX28 &&
!SPL_FRAMEWORK
default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136
default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 28b523b37c70..7c1bca7f9269 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -107,7 +107,7 @@ libs-y += arch/arm/cpu/
libs-y += arch/arm/lib/
ifeq ($(CONFIG_SPL_BUILD),y)
-ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5
mx6 mx7 mx35 imx8m imx8 imxrt))
+ifneq (,$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35
imx8m imx8 imxrt))
libs-y += arch/arm/mach-imx/
endif
else
diff --git a/arch/arm/cpu/arm926ejs/mxs/Makefile
b/arch/arm/cpu/arm926ejs/mxs/Makefile
index f60e61e4343f..f846a5400a3d 100644
--- a/arch/arm/cpu/arm926ejs/mxs/Makefile
+++ b/arch/arm/cpu/arm926ejs/mxs/Makefile
@@ -12,7 +12,6 @@ obj-y += spl_boot.o spl_lradc_init.o spl_mem_init.o
spl_power_init.o
endif
# Specify the target for use in elftosb call
-MKIMAGE_TARGET-$(CONFIG_MX23) = mxsimage$(CONFIG_SPL_FRAMEWORK:%=-spl).mx23.cfg
MKIMAGE_TARGET-$(CONFIG_MX28) = mxsimage$(CONFIG_SPL_FRAMEWORK:%=-spl).mx28.cfg
# Generate HAB-capable IVT
diff --git a/arch/arm/cpu/arm926ejs/mxs/clock.c
b/arch/arm/cpu/arm926ejs/mxs/clock.c
index 4e1cf3a1e32b..9aa6f83bb395 100644
--- a/arch/arm/cpu/arm926ejs/mxs/clock.c
+++ b/arch/arm/cpu/arm926ejs/mxs/clock.c
@@ -28,9 +28,7 @@
#definePLL_FREQ_MHZ(PLL_FREQ_KHZ / 1000)
#defineXTAL_FREQ_MHZ (XTAL_FREQ_KHZ / 1000)
-#if defined(CONFIG_MX23)
-#define MXC_SSPCLK_MAX MXC_SSPCLK0
-#elif defined(CONFIG_MX28)
+#if defined(CONFIG_MX28)
#define MXC_SSPCLK_MAX MXC_SSPCLK3
#endif
@@ -113,10 +111,7 @@ static uint32_t mxs_get_gpmiclk(void)
{
struct mxs_clkctrl_regs *clkctrl_regs =
(struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
-#if defined(CONFIG_MX23)
- uint8_t *reg =
-
