diff options
Diffstat (limited to 'arch/arm')
| -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 |
13 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 8ff94a3c0b..6f30098f0a 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 d335845d93..64a283f866 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 7524ef90e4..7524ef90e4 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 fa3b93a257..fa3b93a257 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 43fd2fedee..43fd2fedee 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 0be643c817..0be643c817 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 0f8b4d095d..0f8b4d095d 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 45b352bdfc..45b352bdfc 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 a820b1b1bf..a820b1b1bf 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 f994658452..f994658452 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 8126e0d43c..8126e0d43c 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 253cde39d1..253cde39d1 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 569fa418f4..569fa418f4 100644 --- a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds +++ b/arch/arm/mach-socfpga/u-boot-spl.lds |