arm: s5pc1xx: move sources to mach-s5pc1xx
Subsystems (3)
move arm/arm/cpu/armv7/s5pc1xx to arch/arm/mach-s5pc1xx
Signed-off-by Minkyu Kang <[email protected]>
---
MAINTAINERS | 6 ++----
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 1 +
arch/arm/cpu/armv7/Makefile | 1 -
arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/Kconfig | 0
arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/Makefile | 0
arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/cache.c | 0
arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/clock.c | 0
.../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/clk.h | 0
.../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/clock.h | 0
.../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/cpu.h | 0
.../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/gpio.h | 0
.../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/mmc.h | 0
.../asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/periph.h | 0
.../asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/pinmux.h | 0
.../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/power.h | 0
.../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/pwm.h | 0
.../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/sromc.h | 0
.../asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/sys_proto.h | 0
.../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/uart.h | 0
.../asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/watchdog.h | 0
arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/reset.S | 0
22 files changed, 4 insertions(+), 6 deletions(-)
rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/Kconfig (100%)
rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/Makefile (100%)
rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/cache.c (100%)
rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/clock.c (100%)
rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/clk.h (100%)
rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/clock.h (100%)
rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/cpu.h (100%)
rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/gpio.h (100%)
rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/mmc.h (100%)
rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/periph.h (100%)
rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/pinmux.h (100%)
rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/power.h (100%)
rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/pwm.h (100%)
rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/sromc.h (100%)
rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/sys_proto.h (100%)
rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/uart.h (100%)
rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/watchdog.h (100%)
rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/reset.S (100%)MAINTAINERS +2 -4
@@ -112,12 +112,10 @@ M: Minkyu Kang <[email protected]> S: Maintained T: git git://git.denx.de/u-boot-samsung.git F: arch/arm/cpu/arm920t/s3c24x0/ -F: arch/arm/cpu/armv7/exynos/ -F: arch/arm/cpu/armv7/s5pc1xx/ +F: arch/arm/mach-exynos/ +F: arch/arm/mach-s5pc1xx/ F: arch/arm/cpu/armv7/s5p-common/ -F: arch/arm/include/asm/arch-exynos/ F: arch/arm/include/asm/arch-s3c24x0/ -F: arch/arm/include/asm/arch-s5pc1xx/ ARM STM SPEAR M: Vipin Kumar <[email protected]>
arch/arm/Kconfig +1 -1
@@ -720,7 +720,7 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig" source "arch/arm/mach-rockchip/Kconfig" -source "arch/arm/cpu/armv7/s5pc1xx/Kconfig" +source "arch/arm/mach-s5pc1xx/Kconfig" source "arch/arm/mach-socfpga/Kconfig"
arch/arm/Makefile +1 -0
@@ -53,6 +53,7 @@ machine-$(CONFIG_ARMADA_XP) += mvebu # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X machine-$(CONFIG_ORION5X) += orion5x +machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_TEGRA) += tegra
arch/arm/cpu/armv7/Makefile +0 -1
@@ -49,7 +49,6 @@ obj-$(CONFIG_OMAP34XX) += omap3/ obj-$(CONFIG_OMAP44XX) += omap4/ obj-$(CONFIG_OMAP54XX) += omap5/ obj-$(CONFIG_RMOBILE) += rmobile/ -obj-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx/ obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_VF610) += vf610/
arch/arm/mach-s5pc1xx/Kconfig renamed from arch/arm/cpu/armv7/s5pc1xx/Kconfig +0 -0
arch/arm/mach-s5pc1xx/Makefile renamed from arch/arm/cpu/armv7/s5pc1xx/Makefile +0 -0
arch/arm/mach-s5pc1xx/cache.c renamed from arch/arm/cpu/armv7/s5pc1xx/cache.c +0 -0
arch/arm/mach-s5pc1xx/clock.c renamed from arch/arm/cpu/armv7/s5pc1xx/clock.c +0 -0
arch/arm/mach-s5pc1xx/include/mach/clk.h renamed from arch/arm/include/asm/arch-s5pc1xx/clk.h +0 -0
arch/arm/mach-s5pc1xx/include/mach/clock.h renamed from arch/arm/include/asm/arch-s5pc1xx/clock.h +0 -0
arch/arm/mach-s5pc1xx/include/mach/cpu.h renamed from arch/arm/include/asm/arch-s5pc1xx/cpu.h +0 -0
arch/arm/mach-s5pc1xx/include/mach/gpio.h renamed from arch/arm/include/asm/arch-s5pc1xx/gpio.h +0 -0
arch/arm/mach-s5pc1xx/include/mach/mmc.h renamed from arch/arm/include/asm/arch-s5pc1xx/mmc.h +0 -0
arch/arm/mach-s5pc1xx/include/mach/periph.h renamed from arch/arm/include/asm/arch-s5pc1xx/periph.h +0 -0
arch/arm/mach-s5pc1xx/include/mach/pinmux.h renamed from arch/arm/include/asm/arch-s5pc1xx/pinmux.h +0 -0
arch/arm/mach-s5pc1xx/include/mach/power.h renamed from arch/arm/include/asm/arch-s5pc1xx/power.h +0 -0
arch/arm/mach-s5pc1xx/include/mach/pwm.h renamed from arch/arm/include/asm/arch-s5pc1xx/pwm.h +0 -0
arch/arm/mach-s5pc1xx/include/mach/sromc.h renamed from arch/arm/include/asm/arch-s5pc1xx/sromc.h +0 -0
arch/arm/mach-s5pc1xx/include/mach/sys_proto.h renamed from arch/arm/include/asm/arch-s5pc1xx/sys_proto.h +0 -0
arch/arm/mach-s5pc1xx/include/mach/uart.h renamed from arch/arm/include/asm/arch-s5pc1xx/uart.h +0 -0
arch/arm/mach-s5pc1xx/include/mach/watchdog.h renamed from arch/arm/include/asm/arch-s5pc1xx/watchdog.h +0 -0
arch/arm/mach-s5pc1xx/reset.S renamed from arch/arm/cpu/armv7/s5pc1xx/reset.S +0 -0
Signature · 4 lines
1.9.1 -- Thanks, Minkyu Kang.
arch/arm/mach-s5pc1xx/reset.S
Quoted 175 lines · Minkyu Kang
move arm/arm/cpu/armv7/s5pc1xx to
arch/arm/mach-s5pc1xxSigned-off-by Minkyu Kang <[email protected]>--- MAINTAINERS | 6 ++---- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 1 + arch/arm/cpu/armv7/Makefile | 1 - arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/Kconfig | 0 arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/Makefile | 0 arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/cache.c | 0 arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/clock.c | 0 .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/clk.h | 0 .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/clock.h | 0 .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/cpu.h | 0 .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/gpio.h | 0 .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/mmc.h | 0 .../asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/periph.h | 0 .../asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/pinmux.h | 0 .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/power.h | 0 .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/pwm.h | 0 .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/sromc.h | 0 .../asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/sys_proto.h | 0 .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/uart.h | 0 .../asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/watchdog.h | 0 arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/reset.S | 0 22 files changed, 4 insertions(+), 6 deletions(-) rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/Kconfig (100%) rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/Makefile (100%) rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/cache.c (100%) rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/clock.c (100%) rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/clk.h (100%) rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/clock.h (100%) rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/cpu.h (100%) rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/mmc.h (100%) rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/periph.h (100%) rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/pinmux.h (100%) rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/power.h (100%) rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/pwm.h (100%) rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/sromc.h (100%) rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/sys_proto.h (100%) rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/uart.h (100%) rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/watchdog.h (100%) rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/reset.S (100%)MAINTAINERS +2
-4@@ -112,12 +112,10 @@ M: Minkyu Kang <[email protected]> S: Maintained T: git git://git.denx.de/u-boot-samsung.git F: arch/arm/cpu/arm920t/s3c24x0/ -F: arch/arm/cpu/armv7/exynos/ -F: arch/arm/cpu/armv7/s5pc1xx/ +F: arch/arm/mach-exynos/ +F: arch/arm/mach-s5pc1xx/ F: arch/arm/cpu/armv7/s5p-common/ -F: arch/arm/include/asm/arch-exynos/ F: arch/arm/include/asm/arch-s3c24x0/ -F: arch/arm/include/asm/arch-s5pc1xx/ ARM STM SPEAR M: Vipin Kumar <[email protected]>arch/arm/Kconfig +1
-1@@ -720,7 +720,7 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig" source "arch/arm/mach-rockchip/Kconfig" -source "arch/arm/cpu/armv7/s5pc1xx/Kconfig" +source "arch/arm/mach-s5pc1xx/Kconfig" source "arch/arm/mach-socfpga/Kconfig"arch/arm/Makefile +1
-0@@ -53,6 +53,7 @@ machine-$(CONFIG_ARMADA_XP) += mvebu # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X machine-$(CONFIG_ORION5X) += orion5x +machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_TEGRA) += tegraarch/arm/cpu/armv7/Makefile +0
-1@@ -49,7 +49,6 @@ obj-$(CONFIG_OMAP34XX) += omap3/ obj-$(CONFIG_OMAP44XX) += omap4/ obj-$(CONFIG_OMAP54XX) += omap5/ obj-$(CONFIG_RMOBILE) += rmobile/ -obj-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx/ obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_VF610) += vf610/arch/arm/mach-s5pc1xx/Kconfig renamed from arch/arm/cpu/armv7/s5pc1xx/Kconfig +0
-0arch/arm/mach-s5pc1xx/Makefile renamed from arch/arm/cpu/armv7/s5pc1xx/Makefile +0
-0arch/arm/mach-s5pc1xx/cache.c renamed from arch/arm/cpu/armv7/s5pc1xx/cache.c +0
-0arch/arm/mach-s5pc1xx/clock.c renamed from arch/arm/cpu/armv7/s5pc1xx/clock.c +0
-0arch/arm/mach-s5pc1xx/include/mach/clk.h renamed from arch/arm/include/asm/arch-s5pc1xx/clk.h +0
-0arch/arm/mach-s5pc1xx/include/mach/clock.h renamed from arch/arm/include/asm/arch-s5pc1xx/clock.h +0
-0arch/arm/mach-s5pc1xx/include/mach/cpu.h renamed from arch/arm/include/asm/arch-s5pc1xx/cpu.h +0
-0arch/arm/mach-s5pc1xx/include/mach/gpio.h renamed from arch/arm/include/asm/arch-s5pc1xx/gpio.h +0
-0arch/arm/mach-s5pc1xx/include/mach/mmc.h renamed from arch/arm/include/asm/arch-s5pc1xx/mmc.h +0
-0arch/arm/mach-s5pc1xx/include/mach/periph.h renamed from arch/arm/include/asm/arch-s5pc1xx/periph.h +0
-0arch/arm/mach-s5pc1xx/include/mach/pinmux.h renamed from arch/arm/include/asm/arch-s5pc1xx/pinmux.h +0
-0arch/arm/mach-s5pc1xx/include/mach/power.h renamed from arch/arm/include/asm/arch-s5pc1xx/power.h +0
-0arch/arm/mach-s5pc1xx/include/mach/pwm.h renamed from arch/arm/include/asm/arch-s5pc1xx/pwm.h +0
-0arch/arm/mach-s5pc1xx/include/mach/sromc.h renamed from arch/arm/include/asm/arch-s5pc1xx/sromc.h +0
-0arch/arm/mach-s5pc1xx/include/mach/sys_proto.h renamed from arch/arm/include/asm/arch-s5pc1xx/sys_proto.h +0
-0arch/arm/mach-s5pc1xx/include/mach/uart.h renamed from arch/arm/include/asm/arch-s5pc1xx/uart.h +0
-0arch/arm/mach-s5pc1xx/include/mach/watchdog.h renamed from arch/arm/include/asm/arch-s5pc1xx/watchdog.h +0
-0arch/arm/mach-s5pc1xx/reset.S renamed from arch/arm/cpu/armv7/s5pc1xx/reset.S +0
-0
applied to u-boot-samsung.
Thanks,
Minkyu Kang.