Browse Source

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>
Trevor Woerner 4 years ago
parent
commit
b3d9a8b185

+ 1 - 1
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"
 

+ 1 - 0
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

+ 0 - 1
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/

+ 0 - 0
arch/arm/cpu/arm926ejs/lpc32xx/Kconfig → arch/arm/mach-lpc32xx/Kconfig


+ 0 - 0
arch/arm/cpu/arm926ejs/lpc32xx/Makefile → arch/arm/mach-lpc32xx/Makefile


+ 0 - 0
arch/arm/cpu/arm926ejs/lpc32xx/clk.c → arch/arm/mach-lpc32xx/clk.c


+ 0 - 0
arch/arm/cpu/arm926ejs/lpc32xx/cpu.c → arch/arm/mach-lpc32xx/cpu.c


+ 0 - 0
arch/arm/cpu/arm926ejs/lpc32xx/devices.c → arch/arm/mach-lpc32xx/devices.c


+ 0 - 0
arch/arm/cpu/arm926ejs/lpc32xx/dram.c → arch/arm/mach-lpc32xx/dram.c


+ 0 - 0
arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S → arch/arm/mach-lpc32xx/lowlevel_init.S


+ 0 - 0
arch/arm/cpu/arm926ejs/lpc32xx/timer.c → arch/arm/mach-lpc32xx/timer.c