| Message ID | 20200414044030.28965-1-twoerner@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [RESEND] arm: lpc32xx: move SoC to mach-lpc32xx | expand |
On Mon, 13 Apr 2020 at 22:40, Trevor Woerner <twoerner at gmail.com> wrote: > > 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 01f14456306c ("ARM: prepare for moving SoC sources into mach-*"): > > [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) > > Signed-off-by: Trevor Woerner <twoerner at gmail.com> > --- > 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%) > Reviewed-by: Simon Glass <sjg at chromium.org>
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index bbb1e2738b..3096b97c6f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e25bb0e594..33bb8923bf 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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 diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index b051025bb0..af63d5cc5e 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -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/ diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/Kconfig b/arch/arm/mach-lpc32xx/Kconfig similarity index 100% rename from arch/arm/cpu/arm926ejs/lpc32xx/Kconfig rename to arch/arm/mach-lpc32xx/Kconfig diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/Makefile b/arch/arm/mach-lpc32xx/Makefile similarity index 100% rename from arch/arm/cpu/arm926ejs/lpc32xx/Makefile rename to arch/arm/mach-lpc32xx/Makefile diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/clk.c b/arch/arm/mach-lpc32xx/clk.c similarity index 100% rename from arch/arm/cpu/arm926ejs/lpc32xx/clk.c rename to arch/arm/mach-lpc32xx/clk.c diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c b/arch/arm/mach-lpc32xx/cpu.c similarity index 100% rename from arch/arm/cpu/arm926ejs/lpc32xx/cpu.c rename to arch/arm/mach-lpc32xx/cpu.c diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/devices.c b/arch/arm/mach-lpc32xx/devices.c similarity index 100% rename from arch/arm/cpu/arm926ejs/lpc32xx/devices.c rename to arch/arm/mach-lpc32xx/devices.c diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/dram.c b/arch/arm/mach-lpc32xx/dram.c similarity index 100% rename from arch/arm/cpu/arm926ejs/lpc32xx/dram.c rename to arch/arm/mach-lpc32xx/dram.c diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S b/arch/arm/mach-lpc32xx/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S rename to arch/arm/mach-lpc32xx/lowlevel_init.S diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c b/arch/arm/mach-lpc32xx/timer.c similarity index 100% rename from arch/arm/cpu/arm926ejs/lpc32xx/timer.c rename to arch/arm/mach-lpc32xx/timer.c
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 01f14456306c ("ARM: prepare for moving SoC sources into mach-*"): [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) Signed-off-by: Trevor Woerner <twoerner at gmail.com> --- 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%)