Now that the mach-mvebu directory exists and is used by Armada XP we can move the mvebu-common files into this directory as well.
Signed-off-by: Stefan Roese sr@denx.de Cc: Masahiro Yamada yamada.masahiro@socionext.com Tested-by: Kevin Smith kevin.smith@elecsyscorp.com Tested-by: Dirk Eibach dirk.eibach@gdsys.cc ---
Changes in v3: None Changes in v2: None
arch/arm/Makefile | 4 ++-- arch/arm/mach-mvebu/Makefile | 17 ++++++++++++++++- arch/arm/{mvebu-common => mach-mvebu}/dram.c | 0 arch/arm/{mvebu-common => mach-mvebu}/gpio.c | 0 arch/arm/{mvebu-common => mach-mvebu}/mbus.c | 0 arch/arm/{mvebu-common => mach-mvebu}/serdes/Makefile | 0 .../serdes/board_env_spec.h | 0 .../serdes/high_speed_env_lib.c | 0 .../serdes/high_speed_env_spec.c | 0 .../serdes/high_speed_env_spec.h | 0 arch/arm/{mvebu-common => mach-mvebu}/timer.c | 0 arch/arm/{mvebu-common => mach-mvebu}/u-boot-spl.lds | 0 board/maxbcm/maxbcm.c | 2 +- include/configs/db-mv784mp-gp.h | 2 +- include/configs/maxbcm.h | 2 +- 15 files changed, 21 insertions(+), 6 deletions(-) rename arch/arm/{mvebu-common => mach-mvebu}/dram.c (100%) rename arch/arm/{mvebu-common => mach-mvebu}/gpio.c (100%) rename arch/arm/{mvebu-common => mach-mvebu}/mbus.c (100%) rename arch/arm/{mvebu-common => mach-mvebu}/serdes/Makefile (100%) rename arch/arm/{mvebu-common => mach-mvebu}/serdes/board_env_spec.h (100%) rename arch/arm/{mvebu-common => mach-mvebu}/serdes/high_speed_env_lib.c (100%) rename arch/arm/{mvebu-common => mach-mvebu}/serdes/high_speed_env_spec.c (100%) rename arch/arm/{mvebu-common => mach-mvebu}/serdes/high_speed_env_spec.h (100%) rename arch/arm/{mvebu-common => mach-mvebu}/timer.c (100%) rename arch/arm/{mvebu-common => mach-mvebu}/u-boot-spl.lds (100%)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 32c152d..c7ce6ef 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -85,8 +85,8 @@ libs-y += arch/arm/imx-common/ endif endif
-ifneq (,$(filter $(SOC), mvebu kirkwood)) -libs-y += arch/arm/mvebu-common/ +ifneq (,$(filter $(SOC), kirkwood)) +libs-y += arch/arm/mach-mvebu/ endif
# deprecated diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 737159b..4f477cd 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -1,9 +1,24 @@ # -# Copyright (C) 2014 Stefan Roese sr@denx.de +# Copyright (C) 2014-2015 Stefan Roese sr@denx.de # # SPDX-License-Identifier: GPL-2.0+ #
+ifdef CONFIG_KIRKWOOD + +obj-y = dram.o +obj-y += gpio.o +obj-y += timer.o + +else + obj-y = cpu.o +obj-y += dram.o +obj-y += gpio.o +obj-y += mbus.o +obj-y += timer.o obj-$(CONFIG_SPL_BUILD) += spl.o obj-$(CONFIG_SPL_BUILD) += lowlevel_spl.o + +obj-y += serdes/ +endif diff --git a/arch/arm/mvebu-common/dram.c b/arch/arm/mach-mvebu/dram.c similarity index 100% rename from arch/arm/mvebu-common/dram.c rename to arch/arm/mach-mvebu/dram.c diff --git a/arch/arm/mvebu-common/gpio.c b/arch/arm/mach-mvebu/gpio.c similarity index 100% rename from arch/arm/mvebu-common/gpio.c rename to arch/arm/mach-mvebu/gpio.c diff --git a/arch/arm/mvebu-common/mbus.c b/arch/arm/mach-mvebu/mbus.c similarity index 100% rename from arch/arm/mvebu-common/mbus.c rename to arch/arm/mach-mvebu/mbus.c diff --git a/arch/arm/mvebu-common/serdes/Makefile b/arch/arm/mach-mvebu/serdes/Makefile similarity index 100% rename from arch/arm/mvebu-common/serdes/Makefile rename to arch/arm/mach-mvebu/serdes/Makefile diff --git a/arch/arm/mvebu-common/serdes/board_env_spec.h b/arch/arm/mach-mvebu/serdes/board_env_spec.h similarity index 100% rename from arch/arm/mvebu-common/serdes/board_env_spec.h rename to arch/arm/mach-mvebu/serdes/board_env_spec.h diff --git a/arch/arm/mvebu-common/serdes/high_speed_env_lib.c b/arch/arm/mach-mvebu/serdes/high_speed_env_lib.c similarity index 100% rename from arch/arm/mvebu-common/serdes/high_speed_env_lib.c rename to arch/arm/mach-mvebu/serdes/high_speed_env_lib.c diff --git a/arch/arm/mvebu-common/serdes/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/high_speed_env_spec.c similarity index 100% rename from arch/arm/mvebu-common/serdes/high_speed_env_spec.c rename to arch/arm/mach-mvebu/serdes/high_speed_env_spec.c diff --git a/arch/arm/mvebu-common/serdes/high_speed_env_spec.h b/arch/arm/mach-mvebu/serdes/high_speed_env_spec.h similarity index 100% rename from arch/arm/mvebu-common/serdes/high_speed_env_spec.h rename to arch/arm/mach-mvebu/serdes/high_speed_env_spec.h diff --git a/arch/arm/mvebu-common/timer.c b/arch/arm/mach-mvebu/timer.c similarity index 100% rename from arch/arm/mvebu-common/timer.c rename to arch/arm/mach-mvebu/timer.c diff --git a/arch/arm/mvebu-common/u-boot-spl.lds b/arch/arm/mach-mvebu/u-boot-spl.lds similarity index 100% rename from arch/arm/mvebu-common/u-boot-spl.lds rename to arch/arm/mach-mvebu/u-boot-spl.lds diff --git a/board/maxbcm/maxbcm.c b/board/maxbcm/maxbcm.c index 46b16ac..2fbb90c 100644 --- a/board/maxbcm/maxbcm.c +++ b/board/maxbcm/maxbcm.c @@ -12,7 +12,7 @@ #include <linux/mbus.h>
#include "../drivers/ddr/mvebu/ddr3_hw_training.h" -#include "../arch/arm/mvebu-common/serdes/high_speed_env_spec.h" +#include "../arch/arm/mach-mvebu/serdes/high_speed_env_spec.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 4dd7b11..cfeeab5 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -100,7 +100,7 @@ #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_LDSCRIPT "arch/arm/mvebu-common/u-boot-spl.lds" +#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-mvebu/u-boot-spl.lds"
/* SPL related SPI defines */ #define CONFIG_SPL_SPI_SUPPORT diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index e909623..27ea71f 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -100,7 +100,7 @@ #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_LDSCRIPT "arch/arm/mvebu-common/u-boot-spl.lds" +#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-mvebu/u-boot-spl.lds"
/* SPL related SPI defines */ #define CONFIG_SPL_SPI_SUPPORT