Our recent trend is to collect SoC files into arch/arm/mach-(SOC).
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
Changes in v2: - Rebase on the top of u-boot-socfpga/master (commit b284d268a)
arch/arm/Makefile | 1 + arch/arm/cpu/armv7/Makefile | 1 - arch/arm/{cpu/armv7/socfpga => mach-socfpga}/Makefile | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/clock_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/fpga_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/freeze_controller.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/misc.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/reset_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/scan_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/spl.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/system_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/timer.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/u-boot-spl.lds | 0 include/configs/socfpga_common.h | 2 +- 14 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/Makefile (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/clock_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/fpga_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/freeze_controller.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/misc.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/reset_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/scan_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/spl.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/system_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/timer.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/u-boot-spl.lds (100%)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index bd4749c..cd71d46 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -52,6 +52,7 @@ machine-$(CONFIG_KIRKWOOD) += kirkwood 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 e6249f1..ffb1cdc 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -51,7 +51,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 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 diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 41bb52b..61ce376 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