Skip to contentSkip to conversation

arm: lpc32xx: move SoC to mach-lpc32xx

PATCH Superseded Trevor Woerner 1 participant 4 messages Apr 6, 2020

Subsystems (10)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 arm: lpc32xx: move SoC to mach-lpc32xx

Following the example of most other SoCs in arch/$(ARCH)/cpu/$(CPU)/$(SOC) move the lpc32xx code from arch/arm/cpu/arm926ejs/lpc32xx to arch/arm/mach-lpc32xx.

Following the checklist from commit 01f14456306c84f9bcd3945a10c98ae50e30542a:
[1] move files from arch/arm/cpu/arm926ejs/lpc32xx to arch/arm/mach-lpx32xx
[2] add machine entry to arch/arm/Makefile
[3] remove "obj-y += ..." from arch/arm/cpu/arm926ejs/Makefile
[4] fix the Kconfig file path in arch/arm/Kconfig
[5] (no MAINTAINERS update)

---
 arch/arm/Kconfig                                                | 2 +-
 arch/arm/Makefile                                               | 1 +
 arch/arm/cpu/arm926ejs/Makefile                                 | 1 -
 arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/Kconfig        | 0
 arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/Makefile       | 0
 arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/clk.c          | 0
 arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/cpu.c          | 0
 arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/devices.c      | 0
 arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/dram.c         | 0
 .../arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/lowlevel_init.S | 0
 arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/timer.c        | 0
 11 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/Kconfig (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/Makefile (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/clk.c (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/cpu.c (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/devices.c (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/dram.c (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/lowlevel_init.S (100%)
 rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/timer.c (100%)
arch/arm/Kconfig +1 -1
index bbb1e2738b..3096b97c6f 100644
@@ -1732,7 +1732,7 @@ source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
-source "arch/arm/cpu/arm926ejs/lpc32xx/Kconfig"
+source "arch/arm/mach-lpc32xx/Kconfig"
 
 source "arch/arm/mach-mvebu/Kconfig"
 
arch/arm/Makefile +1 -0
index e25bb0e594..33bb8923bf 100644
@@ -62,6 +62,7 @@ machine-$(CONFIG_ARCH_K3)		+= k3
 machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone
 # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
 machine-$(CONFIG_KIRKWOOD)		+= kirkwood
+machine-$(CONFIG_ARCH_LPC32XX)		+= lpc32xx
 machine-$(CONFIG_ARCH_MEDIATEK)		+= mediatek
 machine-$(CONFIG_ARCH_MESON)		+= meson
 machine-$(CONFIG_ARCH_MVEBU)		+= mvebu
arch/arm/cpu/arm926ejs/Makefile +0 -1
index b051025bb0..af63d5cc5e 100644
@@ -13,7 +13,6 @@ endif
 endif
 
 obj-$(CONFIG_ARMADA100) += armada100/
-obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/
 obj-$(CONFIG_MX25) += mx25/
 obj-$(CONFIG_MX27) += mx27/
 obj-$(if $(filter mxs,$(SOC)),y) += mxs/
arch/arm/mach-lpc32xx/Kconfig renamed from arch/arm/cpu/arm926ejs/lpc32xx/Kconfig +0 -0
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/Kconfig
rename to arch/arm/mach-lpc32xx/Kconfig
arch/arm/mach-lpc32xx/Makefile renamed from arch/arm/cpu/arm926ejs/lpc32xx/Makefile +0 -0
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/Makefile
rename to arch/arm/mach-lpc32xx/Makefile
arch/arm/mach-lpc32xx/clk.c renamed from arch/arm/cpu/arm926ejs/lpc32xx/clk.c +0 -0
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/clk.c
rename to arch/arm/mach-lpc32xx/clk.c
arch/arm/mach-lpc32xx/cpu.c renamed from arch/arm/cpu/arm926ejs/lpc32xx/cpu.c +0 -0
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
rename to arch/arm/mach-lpc32xx/cpu.c
arch/arm/mach-lpc32xx/devices.c renamed from arch/arm/cpu/arm926ejs/lpc32xx/devices.c +0 -0
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/devices.c
rename to arch/arm/mach-lpc32xx/devices.c
arch/arm/mach-lpc32xx/dram.c renamed from arch/arm/cpu/arm926ejs/lpc32xx/dram.c +0 -0
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/dram.c
rename to arch/arm/mach-lpc32xx/dram.c
arch/arm/mach-lpc32xx/lowlevel_init.S renamed from arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S +0 -0
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S
rename to arch/arm/mach-lpc32xx/lowlevel_init.S
arch/arm/mach-lpc32xx/timer.c renamed from arch/arm/cpu/arm926ejs/lpc32xx/timer.c +0 -0
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/timer.c
rename to arch/arm/mach-lpc32xx/timer.c
Signature · 1 line
2.25.0.114.g5b0ca878e0
#1 lore raw

PATCH 2/5 arch/arm/Makefile: sort machine names

The comment hoped that people would keep the CONFIG_* macro names sorted, but this drifted over time. Put the list back in alphanumerical order.

---
 arch/arm/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/Makefile +6 -6
index 33bb8923bf..5d32dec29c 100644
@@ -66,25 +66,25 @@ machine-$(CONFIG_ARCH_LPC32XX)		+= lpc32xx
 machine-$(CONFIG_ARCH_MEDIATEK)		+= mediatek
 machine-$(CONFIG_ARCH_MESON)		+= meson
 machine-$(CONFIG_ARCH_MVEBU)		+= mvebu
-# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
+machine-$(CONFIG_ARCH_OMAP2PLUS)	+= omap2
 # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
 machine-$(CONFIG_ORION5X)		+= orion5x
-machine-$(CONFIG_ARCH_OMAP2PLUS)	+= omap2
 machine-$(CONFIG_ARCH_OWL)		+= owl
+machine-$(CONFIG_ARCH_RMOBILE)		+= rmobile
+machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip
 machine-$(CONFIG_ARCH_S5PC1XX)		+= s5pc1xx
-machine-$(CONFIG_ARCH_SUNXI)		+= sunxi
 machine-$(CONFIG_ARCH_SNAPDRAGON)	+= snapdragon
 machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga
-machine-$(CONFIG_ARCH_RMOBILE)		+= rmobile
-machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip
 machine-$(CONFIG_STM32)			+= stm32
 machine-$(CONFIG_ARCH_STM32MP)		+= stm32mp
+machine-$(CONFIG_ARCH_SUNXI)		+= sunxi
+# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
 machine-$(CONFIG_TEGRA)			+= tegra
 machine-$(CONFIG_ARCH_U8500)		+= u8500
 machine-$(CONFIG_ARCH_UNIPHIER)		+= uniphier
+machine-$(CONFIG_ARCH_VERSAL)		+= versal
 machine-$(CONFIG_ARCH_ZYNQ)		+= zynq
 machine-$(CONFIG_ARCH_ZYNQMP)		+= zynqmp
-machine-$(CONFIG_ARCH_VERSAL)		+= versal
 machine-$(CONFIG_ARCH_ZYNQMP_R5)	+= zynqmp-r5
 
 machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
Signature · 1 line
2.25.0.114.g5b0ca878e0
#2 lore raw

PATCH 3/5 rename symbol: CONFIG_ORION5X -> CONFIG_ARCH_ORION5X

In reply to Trevor Woerner

Have this symbol follow the pattern of all other such symbols. This patch also removes a TODO from the code.

---
 arch/arm/Kconfig                | 2 +-
 arch/arm/Makefile               | 3 +--
 arch/arm/mach-orion5x/Kconfig   | 4 ++--
 configs/edminiv2_defconfig      | 2 +-
 drivers/ata/mvsata_ide.c        | 2 +-
 drivers/i2c/mvtwsi.c            | 2 +-
 drivers/net/Kconfig             | 2 +-
 drivers/net/mvgbe.c             | 2 +-
 drivers/usb/host/Kconfig        | 2 +-
 drivers/usb/host/ehci-marvell.c | 2 +-
 10 files changed, 11 insertions(+), 12 deletions(-)
arch/arm/Kconfig +1 -1
index 3096b97c6f..d56f375c8b 100644
@@ -547,7 +547,7 @@ config TARGET_APF27
 	select CPU_ARM926EJS
 	select SUPPORT_SPL
 
-config ORION5X
+config ARCH_ORION5X
 	bool "Marvell Orion"
 	select CPU_ARM926EJS
 
arch/arm/Makefile +1 -2
index 5d32dec29c..2b44ffb493 100644
@@ -67,8 +67,7 @@ machine-$(CONFIG_ARCH_MEDIATEK)		+= mediatek
 machine-$(CONFIG_ARCH_MESON)		+= meson
 machine-$(CONFIG_ARCH_MVEBU)		+= mvebu
 machine-$(CONFIG_ARCH_OMAP2PLUS)	+= omap2
-# TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
-machine-$(CONFIG_ORION5X)		+= orion5x
+machine-$(CONFIG_ARCH_ORION5X)		+= orion5x
 machine-$(CONFIG_ARCH_OWL)		+= owl
 machine-$(CONFIG_ARCH_RMOBILE)		+= rmobile
 machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip
arch/arm/mach-orion5x/Kconfig +2 -2
index 2984a3edda..23c13e22f5 100644
@@ -1,4 +1,4 @@
-if ORION5X
+if ARCH_ORION5X
 
 choice
 	prompt "Marvell Orion board select"
@@ -16,6 +16,6 @@ config SYS_SOC
 source "board/LaCie/edminiv2/Kconfig"
 
 config SPL_LDSCRIPT
-	default "$(CPUDIR)/orion5x/u-boot-spl.lds" if ORION5X
+	default "$(CPUDIR)/orion5x/u-boot-spl.lds" if ARCH_ORION5X
 
 endif
configs/edminiv2_defconfig +1 -1
index 2bbd6a783b..552b2d5b44 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
-CONFIG_ORION5X=y
+CONFIG_ARCH_ORION5X=y
 CONFIG_SYS_TEXT_BASE=0x00800000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
drivers/ata/mvsata_ide.c +1 -1
index 38181235af..9ac16555d6 100644
@@ -8,7 +8,7 @@
 #include <common.h>
 #include <asm/io.h>
 
-#if defined(CONFIG_ORION5X)
+#if defined(CONFIG_ARCH_ORION5X)
 #include <asm/arch/orion5x.h>
 #elif defined(CONFIG_KIRKWOOD)
 #include <asm/arch/soc.h>
drivers/i2c/mvtwsi.c +1 -1
index 382cf4b304..77fe35a42b 100644
@@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
  */
 
 #ifndef CONFIG_DM_I2C
-#if defined(CONFIG_ORION5X)
+#if defined(CONFIG_ARCH_ORION5X)
 #include <asm/arch/orion5x.h>
 #elif (defined(CONFIG_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU))
 #include <asm/arch/soc.h>
drivers/net/Kconfig +1 -1
index 4d1013c984..3fd3e72219 100644
@@ -303,7 +303,7 @@ config FSLDMAFEC
 
 config MVGBE
 	bool "Marvell Orion5x/Kirkwood network interface support"
-	depends on KIRKWOOD || ORION5X
+	depends on KIRKWOOD || ARCH_ORION5X
 	select PHYLIB if DM_ETH
 	help
 	  This driver supports the network interface units in the
drivers/net/mvgbe.c +1 -1
index 037e59ec6e..b0b8d349a8 100644
@@ -26,7 +26,7 @@
 
 #if defined(CONFIG_KIRKWOOD)
 #include <asm/arch/soc.h>
-#elif defined(CONFIG_ORION5X)
+#elif defined(CONFIG_ARCH_ORION5X)
 #include <asm/arch/orion5x.h>
 #endif
 
drivers/usb/host/Kconfig +1 -1
index 0987ff25b1..5574e9f989 100644
@@ -121,7 +121,7 @@ config USB_EHCI_ATMEL
 
 config USB_EHCI_MARVELL
 	bool "Support for Marvell on-chip EHCI USB controller"
-	depends on ARCH_MVEBU || KIRKWOOD || ORION5X
+	depends on ARCH_MVEBU || KIRKWOOD || ARCH_ORION5X
 	default y
 	---help---
 	  Enables support for the on-chip EHCI controller on MVEBU SoCs.
drivers/usb/host/ehci-marvell.c +1 -1
index 8efe6b63b9..3b10cdfc58 100644
@@ -15,7 +15,7 @@
 
 #if defined(CONFIG_KIRKWOOD)
 #include <asm/arch/soc.h>
-#elif defined(CONFIG_ORION5X)
+#elif defined(CONFIG_ARCH_ORION5X)
 #include <asm/arch/orion5x.h>
 #endif
 
Signature · 1 line
2.25.0.114.g5b0ca878e0
#3 lore raw

PATCH 4/5 arm: orion5x: finish moving SoC to mach-orion5x

In reply to Trevor Woerner

The SPL linker script had been left in arch/$(ARCH)/cpu/$(CPU)/$(SOC) so move it to the already-established arch/$(ARCH)/mach-$(SOC) location.

---
 arch/arm/mach-orion5x/Kconfig                                   | 2 +-
 arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/u-boot-spl.lds | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/u-boot-spl.lds (100%)
arch/arm/mach-orion5x/Kconfig +1 -1
index 23c13e22f5..5980e095ce 100644
@@ -16,6 +16,6 @@ config SYS_SOC
 source "board/LaCie/edminiv2/Kconfig"
 
 config SPL_LDSCRIPT
-	default "$(CPUDIR)/orion5x/u-boot-spl.lds" if ARCH_ORION5X
+	default "arch/arm/mach-orion5x/u-boot-spl.lds"
 
 endif
arch/arm/mach-orion5x/u-boot-spl.lds renamed from arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds +0 -0
similarity index 100%
rename from arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds
rename to arch/arm/mach-orion5x/u-boot-spl.lds
Signature · 1 line
2.25.0.114.g5b0ca878e0