Move arch/arm/cpu/armv7/zynq/* -> arch/arm/mach-zynq/*
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/Kconfig | 2 +- arch/arm/Makefile | 1 + arch/arm/cpu/armv7/Makefile | 1 - arch/arm/{cpu/armv7/zynq => mach-zynq}/Kconfig | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/Makefile | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/clk.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/cpu.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/ddrc.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/lowlevel_init.S | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/slcr.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/spl.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/timer.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot-spl.lds | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot.lds | 0 include/configs/zynq-common.h | 4 ++-- 15 files changed, 4 insertions(+), 4 deletions(-) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/Kconfig (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/Makefile (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/clk.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/cpu.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/ddrc.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/lowlevel_init.S (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/slcr.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/spl.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/timer.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot-spl.lds (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot.lds (100%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b9ebee1..7af1e4b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -755,7 +755,7 @@ source "arch/arm/mach-uniphier/Kconfig"
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 08946de..45cb1d2 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -17,6 +17,7 @@ machine-$(CONFIG_ORION5X) += orion5x 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 1312a9d..204cbdd 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -57,4 +57,3 @@ obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/ 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 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 485babd..8396fd4 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -291,7 +291,7 @@ # define CONFIG_SYS_MMC_MAX_DEVICE 1 #endif
-#define CONFIG_SYS_LDSCRIPT "arch/arm/cpu/armv7/zynq/u-boot.lds" +#define CONFIG_SYS_LDSCRIPT "arch/arm/mach-zynq/u-boot.lds"
/* Commands */ #include <config_cmd_default.h> @@ -309,7 +309,7 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_BOARD_INIT
-#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/zynq/u-boot-spl.lds" +#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-zynq/u-boot-spl.lds"
/* MMC support */ #ifdef CONFIG_ZYNQ_SDHCI0