| commit | 05a217212b41c6342fc1c6be0fe49ce28c9afe40 | [log] [tgz] |
|---|---|---|
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | Tue Apr 21 20:38:21 2015 +0900 |
| committer | Marek Vasut <marex@denx.de> | Thu May 07 05:21:12 2015 +0200 |
| tree | a7178e048809fcd4b3abec3ea398d7dada7cf1aa | |
| parent | 7865f4b0b67ea7108117e68166294b7e95a5ede1 [diff] |
ARM: socfpga: move SoC sources to mach-socfpga Our recent trend is to collect SoC files into arch/arm/mach-(SOC). Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 8ff94a3..6f30098 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile
@@ -53,6 +53,7 @@ machine-$(CONFIG_ARCH_NOMADIK) += nomadik # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X machine-$(CONFIG_ORION5X) += orion5x +machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_ARCH_UNIPHIER) += uniphier machine-$(CONFIG_ARCH_VERSATILE) += versatile
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index d335845..64a283f 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile
@@ -50,7 +50,6 @@ obj-$(CONFIG_OMAP54XX) += omap5/ obj-$(CONFIG_RMOBILE) += rmobile/ obj-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx/ -obj-$(CONFIG_SOCFPGA) += socfpga/ obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_U8500) += u8500/
diff --git a/arch/arm/cpu/armv7/socfpga/Makefile b/arch/arm/mach-socfpga/Makefile similarity index 100% rename from arch/arm/cpu/armv7/socfpga/Makefile rename to arch/arm/mach-socfpga/Makefile
diff --git a/arch/arm/cpu/armv7/socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c similarity index 100% rename from arch/arm/cpu/armv7/socfpga/clock_manager.c rename to arch/arm/mach-socfpga/clock_manager.c
diff --git a/arch/arm/cpu/armv7/socfpga/fpga_manager.c b/arch/arm/mach-socfpga/fpga_manager.c similarity index 100% rename from arch/arm/cpu/armv7/socfpga/fpga_manager.c rename to arch/arm/mach-socfpga/fpga_manager.c
diff --git a/arch/arm/cpu/armv7/socfpga/freeze_controller.c b/arch/arm/mach-socfpga/freeze_controller.c similarity index 100% rename from arch/arm/cpu/armv7/socfpga/freeze_controller.c rename to arch/arm/mach-socfpga/freeze_controller.c
diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/mach-socfpga/misc.c similarity index 100% rename from arch/arm/cpu/armv7/socfpga/misc.c rename to arch/arm/mach-socfpga/misc.c
diff --git a/arch/arm/cpu/armv7/socfpga/reset_manager.c b/arch/arm/mach-socfpga/reset_manager.c similarity index 100% rename from arch/arm/cpu/armv7/socfpga/reset_manager.c rename to arch/arm/mach-socfpga/reset_manager.c
diff --git a/arch/arm/cpu/armv7/socfpga/scan_manager.c b/arch/arm/mach-socfpga/scan_manager.c similarity index 100% rename from arch/arm/cpu/armv7/socfpga/scan_manager.c rename to arch/arm/mach-socfpga/scan_manager.c
diff --git a/arch/arm/cpu/armv7/socfpga/spl.c b/arch/arm/mach-socfpga/spl.c similarity index 100% rename from arch/arm/cpu/armv7/socfpga/spl.c rename to arch/arm/mach-socfpga/spl.c
diff --git a/arch/arm/cpu/armv7/socfpga/system_manager.c b/arch/arm/mach-socfpga/system_manager.c similarity index 100% rename from arch/arm/cpu/armv7/socfpga/system_manager.c rename to arch/arm/mach-socfpga/system_manager.c
diff --git a/arch/arm/cpu/armv7/socfpga/timer.c b/arch/arm/mach-socfpga/timer.c similarity index 100% rename from arch/arm/cpu/armv7/socfpga/timer.c rename to arch/arm/mach-socfpga/timer.c
diff --git a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds b/arch/arm/mach-socfpga/u-boot-spl.lds similarity index 100% rename from arch/arm/cpu/armv7/socfpga/u-boot-spl.lds rename to arch/arm/mach-socfpga/u-boot-spl.lds