diff options
| author | Trevor Woerner <twoerner@gmail.com> | 2020-05-06 08:02:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-15 14:47:35 -0400 |
| commit | b3d9a8b1857878fd72bf5385d91585fbafe516d6 (patch) | |
| tree | fd11b9f6b343aabb33247b4b3fe4ccfde1cc8a6f | |
| parent | 0ff042d836f2a40b2104d4501111fbb340293c5c (diff) | |
| download | u-boot-b3d9a8b1857878fd72bf5385d91585fbafe516d6.tar.gz | |
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 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)
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-lpc32xx/Kconfig (renamed from arch/arm/cpu/arm926ejs/lpc32xx/Kconfig) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-lpc32xx/Makefile (renamed from arch/arm/cpu/arm926ejs/lpc32xx/Makefile) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-lpc32xx/clk.c (renamed from arch/arm/cpu/arm926ejs/lpc32xx/clk.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-lpc32xx/cpu.c (renamed from arch/arm/cpu/arm926ejs/lpc32xx/cpu.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-lpc32xx/devices.c (renamed from arch/arm/cpu/arm926ejs/lpc32xx/devices.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-lpc32xx/dram.c (renamed from arch/arm/cpu/arm926ejs/lpc32xx/dram.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-lpc32xx/lowlevel_init.S (renamed from arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-lpc32xx/timer.c (renamed from arch/arm/cpu/arm926ejs/lpc32xx/timer.c) | 0 |
11 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0d463088a2..bd802b3be9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1777,7 +1777,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 index 986ad738ac..986ad738ac 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/Kconfig +++ b/arch/arm/mach-lpc32xx/Kconfig diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/Makefile b/arch/arm/mach-lpc32xx/Makefile index 6303570bee..6303570bee 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/Makefile +++ b/arch/arm/mach-lpc32xx/Makefile diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/clk.c b/arch/arm/mach-lpc32xx/clk.c index cb2344d79f..cb2344d79f 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/clk.c +++ b/arch/arm/mach-lpc32xx/clk.c diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c b/arch/arm/mach-lpc32xx/cpu.c index 4c59a44f7e..4c59a44f7e 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c +++ b/arch/arm/mach-lpc32xx/cpu.c diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/devices.c b/arch/arm/mach-lpc32xx/devices.c index 7e7646a2e1..7e7646a2e1 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/devices.c +++ b/arch/arm/mach-lpc32xx/devices.c diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/dram.c b/arch/arm/mach-lpc32xx/dram.c index 4f975694fd..4f975694fd 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/dram.c +++ b/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 index d42da2bc56..d42da2bc56 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S +++ b/arch/arm/mach-lpc32xx/lowlevel_init.S diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c b/arch/arm/mach-lpc32xx/timer.c index 3a896d10ca..3a896d10ca 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c +++ b/arch/arm/mach-lpc32xx/timer.c |