| commit | 43246cc44aad8ac451b694201508b2a79188bc08 | [log] [tgz] |
|---|---|---|
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | Mon Mar 16 16:43:22 2015 +0900 |
| committer | Michal Simek <michal.simek@xilinx.com> | Wed Apr 29 11:19:05 2015 +0200 |
| tree | b35d4ca109c56dc4f0033d73199207b07eee06e7 | |
| parent | 2cc97946d84d9ef4ec9fd32cdc5b17495967ee65 [diff] |
ARM: zynq: move SoC sources to mach-zynq Move arch/arm/cpu/armv7/zynq/* -> arch/arm/mach-zynq/* Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5f21b59..21cd1c8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -832,7 +832,7 @@ source "arch/arm/mach-versatile/Kconfig" -source "arch/arm/cpu/armv7/zynq/Kconfig" +source "arch/arm/mach-zynq/Kconfig" source "arch/arm/cpu/armv7/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index bd4749c..5705d64 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile
@@ -55,6 +55,7 @@ machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_ARCH_UNIPHIER) += uniphier machine-$(CONFIG_ARCH_VERSATILE) += versatile +machine-$(CONFIG_ZYNQ) += zynq machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 21fc03b..3c991e1 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile
@@ -56,4 +56,3 @@ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_U8500) += u8500/ obj-$(CONFIG_VF610) += vf610/ -obj-$(CONFIG_ZYNQ) += zynq/
diff --git a/arch/arm/cpu/armv7/zynq/Kconfig b/arch/arm/mach-zynq/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/zynq/Kconfig rename to arch/arm/mach-zynq/Kconfig
diff --git a/arch/arm/cpu/armv7/zynq/Makefile b/arch/arm/mach-zynq/Makefile similarity index 100% rename from arch/arm/cpu/armv7/zynq/Makefile rename to arch/arm/mach-zynq/Makefile
diff --git a/arch/arm/cpu/armv7/zynq/clk.c b/arch/arm/mach-zynq/clk.c similarity index 100% rename from arch/arm/cpu/armv7/zynq/clk.c rename to arch/arm/mach-zynq/clk.c
diff --git a/arch/arm/cpu/armv7/zynq/cpu.c b/arch/arm/mach-zynq/cpu.c similarity index 100% rename from arch/arm/cpu/armv7/zynq/cpu.c rename to arch/arm/mach-zynq/cpu.c
diff --git a/arch/arm/cpu/armv7/zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c similarity index 100% rename from arch/arm/cpu/armv7/zynq/ddrc.c rename to arch/arm/mach-zynq/ddrc.c
diff --git a/arch/arm/cpu/armv7/zynq/lowlevel_init.S b/arch/arm/mach-zynq/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/armv7/zynq/lowlevel_init.S rename to arch/arm/mach-zynq/lowlevel_init.S
diff --git a/arch/arm/cpu/armv7/zynq/slcr.c b/arch/arm/mach-zynq/slcr.c similarity index 100% rename from arch/arm/cpu/armv7/zynq/slcr.c rename to arch/arm/mach-zynq/slcr.c
diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/mach-zynq/spl.c similarity index 100% rename from arch/arm/cpu/armv7/zynq/spl.c rename to arch/arm/mach-zynq/spl.c
diff --git a/arch/arm/cpu/armv7/zynq/timer.c b/arch/arm/mach-zynq/timer.c similarity index 100% rename from arch/arm/cpu/armv7/zynq/timer.c rename to arch/arm/mach-zynq/timer.c
diff --git a/arch/arm/cpu/armv7/zynq/u-boot-spl.lds b/arch/arm/mach-zynq/u-boot-spl.lds similarity index 100% rename from arch/arm/cpu/armv7/zynq/u-boot-spl.lds rename to arch/arm/mach-zynq/u-boot-spl.lds
diff --git a/arch/arm/cpu/armv7/zynq/u-boot.lds b/arch/arm/mach-zynq/u-boot.lds similarity index 100% rename from arch/arm/cpu/armv7/zynq/u-boot.lds rename to arch/arm/mach-zynq/u-boot.lds