diff options
author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2015-10-09 16:40:09 +0900 |
---|---|---|
committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2016-08-17 10:25:28 +0900 |
commit | badbb63c2c29738a2956504126a30ddb14ca34c1 (patch) | |
tree | 29cb6dbc3cf6b34944b987e0a3619776905a59aa /arch | |
parent | 59d07ee08e858bf2c121d0cdc6c8ddd3b26ee5b1 (diff) |
ARM: rmobile: Move SoC sources to mach-rmobile
Move from arch/arm/cpu/armv7/rmobile/ to arch/arm/mach-rmobile/.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/Kconfig (renamed from arch/arm/cpu/armv7/rmobile/Kconfig) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/Makefile (renamed from arch/arm/cpu/armv7/rmobile/Makefile) | 2 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/board.c (renamed from arch/arm/cpu/armv7/rmobile/board.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/cpu_info-r8a7740.c (renamed from arch/arm/cpu/armv7/rmobile/cpu_info-r8a7740.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/cpu_info-rcar.c (renamed from arch/arm/cpu/armv7/rmobile/cpu_info-rcar.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/cpu_info-sh73a0.c (renamed from arch/arm/cpu/armv7/rmobile/cpu_info-sh73a0.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/cpu_info.c (renamed from arch/arm/cpu/armv7/rmobile/cpu_info.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/emac.c (renamed from arch/arm/cpu/armv7/rmobile/emac.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/lowlevel_init.S (renamed from arch/arm/cpu/armv7/rmobile/lowlevel_init.S) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/lowlevel_init_ca15.S (renamed from arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/pfc-r8a7740.c (renamed from arch/arm/cpu/armv7/rmobile/pfc-r8a7740.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/pfc-r8a7790.c (renamed from arch/arm/cpu/armv7/rmobile/pfc-r8a7790.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/pfc-r8a7790.h (renamed from arch/arm/cpu/armv7/rmobile/pfc-r8a7790.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/pfc-r8a7791.c (renamed from arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/pfc-r8a7793.c (renamed from arch/arm/cpu/armv7/rmobile/pfc-r8a7793.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/pfc-r8a7794.c (renamed from arch/arm/cpu/armv7/rmobile/pfc-r8a7794.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/pfc-sh73a0.c (renamed from arch/arm/cpu/armv7/rmobile/pfc-sh73a0.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/timer.c (renamed from arch/arm/cpu/armv7/rmobile/timer.c) | 0 |
20 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3237a74f722..e6940e62063 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -879,7 +879,7 @@ source "arch/arm/cpu/armv7/omap-common/Kconfig" source "arch/arm/mach-orion5x/Kconfig" -source "arch/arm/cpu/armv7/rmobile/Kconfig" +source "arch/arm/mach-rmobile/Kconfig" source "arch/arm/mach-meson/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 6a07cd178e6..43ae79a6efb 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -59,6 +59,7 @@ machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx machine-$(CONFIG_ARCH_SUNXI) += sunxi machine-$(CONFIG_ARCH_SNAPDRAGON) += snapdragon machine-$(CONFIG_ARCH_SOCFPGA) += socfpga +machine-$(CONFIG_RMOBILE) += rmobile machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_STM32) += stm32 machine-$(CONFIG_TEGRA) += tegra diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig index 85c06eb45f3..85c06eb45f3 100644 --- a/arch/arm/cpu/armv7/rmobile/Kconfig +++ b/arch/arm/mach-rmobile/Kconfig diff --git a/arch/arm/cpu/armv7/rmobile/Makefile b/arch/arm/mach-rmobile/Makefile index 647e426d0b5..d793616b010 100644 --- a/arch/arm/cpu/armv7/rmobile/Makefile +++ b/arch/arm/mach-rmobile/Makefile @@ -16,4 +16,4 @@ obj-$(CONFIG_R8A7791) += lowlevel_init_ca15.o cpu_info-rcar.o pfc-r8a7791.o obj-$(CONFIG_R8A7793) += lowlevel_init_ca15.o cpu_info-rcar.o pfc-r8a7793.o obj-$(CONFIG_R8A7794) += lowlevel_init_ca15.o cpu_info-rcar.o pfc-r8a7794.o obj-$(CONFIG_SH73A0) += lowlevel_init.o cpu_info-sh73a0.o pfc-sh73a0.o -obj-$(CONFIG_TMU_TIMER) += ../../../../sh/lib/time.o +obj-$(CONFIG_TMU_TIMER) += ../../sh/lib/time.o diff --git a/arch/arm/cpu/armv7/rmobile/board.c b/arch/arm/mach-rmobile/board.c index d91bc26703a..d91bc26703a 100644 --- a/arch/arm/cpu/armv7/rmobile/board.c +++ b/arch/arm/mach-rmobile/board.c diff --git a/arch/arm/cpu/armv7/rmobile/cpu_info-r8a7740.c b/arch/arm/mach-rmobile/cpu_info-r8a7740.c index dfe8950ae19..dfe8950ae19 100644 --- a/arch/arm/cpu/armv7/rmobile/cpu_info-r8a7740.c +++ b/arch/arm/mach-rmobile/cpu_info-r8a7740.c diff --git a/arch/arm/cpu/armv7/rmobile/cpu_info-rcar.c b/arch/arm/mach-rmobile/cpu_info-rcar.c index 42ee30fbe7a..42ee30fbe7a 100644 --- a/arch/arm/cpu/armv7/rmobile/cpu_info-rcar.c +++ b/arch/arm/mach-rmobile/cpu_info-rcar.c diff --git a/arch/arm/cpu/armv7/rmobile/cpu_info-sh73a0.c b/arch/arm/mach-rmobile/cpu_info-sh73a0.c index 186b4b5cbb8..186b4b5cbb8 100644 --- a/arch/arm/cpu/armv7/rmobile/cpu_info-sh73a0.c +++ b/arch/arm/mach-rmobile/cpu_info-sh73a0.c diff --git a/arch/arm/cpu/armv7/rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c index d47c47c07ee..d47c47c07ee 100644 --- a/arch/arm/cpu/armv7/rmobile/cpu_info.c +++ b/arch/arm/mach-rmobile/cpu_info.c diff --git a/arch/arm/cpu/armv7/rmobile/emac.c b/arch/arm/mach-rmobile/emac.c index 0710cfd3c19..0710cfd3c19 100644 --- a/arch/arm/cpu/armv7/rmobile/emac.c +++ b/arch/arm/mach-rmobile/emac.c diff --git a/arch/arm/cpu/armv7/rmobile/lowlevel_init.S b/arch/arm/mach-rmobile/lowlevel_init.S index 0d654403eef..0d654403eef 100644 --- a/arch/arm/cpu/armv7/rmobile/lowlevel_init.S +++ b/arch/arm/mach-rmobile/lowlevel_init.S diff --git a/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S b/arch/arm/mach-rmobile/lowlevel_init_ca15.S index a5dbbea9e15..a5dbbea9e15 100644 --- a/arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S +++ b/arch/arm/mach-rmobile/lowlevel_init_ca15.S diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7740.c b/arch/arm/mach-rmobile/pfc-r8a7740.c index 5d42a68266b..5d42a68266b 100644 --- a/arch/arm/cpu/armv7/rmobile/pfc-r8a7740.c +++ b/arch/arm/mach-rmobile/pfc-r8a7740.c diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7790.c b/arch/arm/mach-rmobile/pfc-r8a7790.c index 580aba39e1f..580aba39e1f 100644 --- a/arch/arm/cpu/armv7/rmobile/pfc-r8a7790.c +++ b/arch/arm/mach-rmobile/pfc-r8a7790.c diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7790.h b/arch/arm/mach-rmobile/pfc-r8a7790.h index a13317be0b9..a13317be0b9 100644 --- a/arch/arm/cpu/armv7/rmobile/pfc-r8a7790.h +++ b/arch/arm/mach-rmobile/pfc-r8a7790.h diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c b/arch/arm/mach-rmobile/pfc-r8a7791.c index 46d6e60c158..46d6e60c158 100644 --- a/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c +++ b/arch/arm/mach-rmobile/pfc-r8a7791.c diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7793.c b/arch/arm/mach-rmobile/pfc-r8a7793.c index 03c27ad7fef..03c27ad7fef 100644 --- a/arch/arm/cpu/armv7/rmobile/pfc-r8a7793.c +++ b/arch/arm/mach-rmobile/pfc-r8a7793.c diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7794.c b/arch/arm/mach-rmobile/pfc-r8a7794.c index 7ea5edc2e50..7ea5edc2e50 100644 --- a/arch/arm/cpu/armv7/rmobile/pfc-r8a7794.c +++ b/arch/arm/mach-rmobile/pfc-r8a7794.c diff --git a/arch/arm/cpu/armv7/rmobile/pfc-sh73a0.c b/arch/arm/mach-rmobile/pfc-sh73a0.c index 55dab7c1389..55dab7c1389 100644 --- a/arch/arm/cpu/armv7/rmobile/pfc-sh73a0.c +++ b/arch/arm/mach-rmobile/pfc-sh73a0.c diff --git a/arch/arm/cpu/armv7/rmobile/timer.c b/arch/arm/mach-rmobile/timer.c index 04700e7d34d..04700e7d34d 100644 --- a/arch/arm/cpu/armv7/rmobile/timer.c +++ b/arch/arm/mach-rmobile/timer.c |