diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-04-21 20:38:21 +0900 |
---|---|---|
committer | Marek Vasut <marex@denx.de> | 2015-05-07 05:21:12 +0200 |
commit | 05a217212b41c6342fc1c6be0fe49ce28c9afe40 (patch) | |
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>
-rw-r--r-- | arch/arm/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/Makefile (renamed from arch/arm/cpu/armv7/socfpga/Makefile) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/clock_manager.c (renamed from arch/arm/cpu/armv7/socfpga/clock_manager.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/fpga_manager.c (renamed from arch/arm/cpu/armv7/socfpga/fpga_manager.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/freeze_controller.c (renamed from arch/arm/cpu/armv7/socfpga/freeze_controller.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/misc.c (renamed from arch/arm/cpu/armv7/socfpga/misc.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/reset_manager.c (renamed from arch/arm/cpu/armv7/socfpga/reset_manager.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/scan_manager.c (renamed from arch/arm/cpu/armv7/socfpga/scan_manager.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/spl.c (renamed from arch/arm/cpu/armv7/socfpga/spl.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/system_manager.c (renamed from arch/arm/cpu/armv7/socfpga/system_manager.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/timer.c (renamed from arch/arm/cpu/armv7/socfpga/timer.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-socfpga/u-boot-spl.lds (renamed from arch/arm/cpu/armv7/socfpga/u-boot-spl.lds) | 0 | ||||
-rw-r--r-- | include/configs/socfpga_common.h | 2 |
14 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 8ff94a3c0b4..6f30098f0ac 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -53,6 +53,7 @@ machine-$(CONFIG_ARMADA_XP) += mvebu 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 d335845d93c..64a283f866f 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -50,7 +50,6 @@ obj-$(CONFIG_OMAP44XX) += omap4/ 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 index 7524ef90e49..7524ef90e49 100644 --- a/arch/arm/cpu/armv7/socfpga/Makefile +++ b/arch/arm/mach-socfpga/Makefile diff --git a/arch/arm/cpu/armv7/socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c index fa3b93a2572..fa3b93a2572 100644 --- a/arch/arm/cpu/armv7/socfpga/clock_manager.c +++ b/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 index 43fd2fedee8..43fd2fedee8 100644 --- a/arch/arm/cpu/armv7/socfpga/fpga_manager.c +++ b/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 index 0be643c8179..0be643c8179 100644 --- a/arch/arm/cpu/armv7/socfpga/freeze_controller.c +++ b/arch/arm/mach-socfpga/freeze_controller.c diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index 0f8b4d095d4..0f8b4d095d4 100644 --- a/arch/arm/cpu/armv7/socfpga/misc.c +++ b/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 index 45b352bdfc0..45b352bdfc0 100644 --- a/arch/arm/cpu/armv7/socfpga/reset_manager.c +++ b/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 index a820b1b1bfc..a820b1b1bfc 100644 --- a/arch/arm/cpu/armv7/socfpga/scan_manager.c +++ b/arch/arm/mach-socfpga/scan_manager.c diff --git a/arch/arm/cpu/armv7/socfpga/spl.c b/arch/arm/mach-socfpga/spl.c index f9946584521..f9946584521 100644 --- a/arch/arm/cpu/armv7/socfpga/spl.c +++ b/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 index 8126e0d43cf..8126e0d43cf 100644 --- a/arch/arm/cpu/armv7/socfpga/system_manager.c +++ b/arch/arm/mach-socfpga/system_manager.c diff --git a/arch/arm/cpu/armv7/socfpga/timer.c b/arch/arm/mach-socfpga/timer.c index 253cde39d11..253cde39d11 100644 --- a/arch/arm/cpu/armv7/socfpga/timer.c +++ b/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 index 569fa418f46..569fa418f46 100644 --- a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds +++ b/arch/arm/mach-socfpga/u-boot-spl.lds diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 41bb52bc8c0..61ce3769683 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -298,7 +298,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_CRC32_VERIFY /* Linker script for SPL */ -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/socfpga/u-boot-spl.lds" +#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-socfpga/u-boot-spl.lds" #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT |