| commit | e5c5aa9da0f64a2f29fac008545db049dfb79131 | [log] [tgz] |
|---|---|---|
| author | Stefan Roese <sr@denx.de> | Mon Apr 20 09:28:12 2015 +0200 |
| committer | Luka Perkov <luka.perkov@sartura.hr> | Thu Jul 23 10:38:05 2015 +0200 |
| tree | 783089f3655fb14cba2610da3e27211625553963 | |
| parent | 8ec49a613f3deec2fa99adec6008884753c4f9c6 [diff] |
arm: mvebu: serdes: Move Armada XP SERDES / PHY init code into new directory With the upcoming addition of the Armada 38x SPL support, which is not compatible to the Armada XP SERDES init code, we need to introduce a new directory infrastructure. So lets move the AXP serdes init code into a new directory. This way the A38x code can be added in a clean way. Signed-off-by: Stefan Roese <sr@denx.de>
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 4f477cd..9cdbefd 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile
@@ -20,5 +20,6 @@ obj-$(CONFIG_SPL_BUILD) += spl.o obj-$(CONFIG_SPL_BUILD) += lowlevel_spl.o -obj-y += serdes/ +obj-$(CONFIG_SYS_MVEBU_DDR_AXP) += serdes/axp/ + endif
diff --git a/arch/arm/mach-mvebu/serdes/Makefile b/arch/arm/mach-mvebu/serdes/axp/Makefile similarity index 100% rename from arch/arm/mach-mvebu/serdes/Makefile rename to arch/arm/mach-mvebu/serdes/axp/Makefile
diff --git a/arch/arm/mach-mvebu/serdes/board_env_spec.h b/arch/arm/mach-mvebu/serdes/axp/board_env_spec.h similarity index 100% rename from arch/arm/mach-mvebu/serdes/board_env_spec.h rename to arch/arm/mach-mvebu/serdes/axp/board_env_spec.h
diff --git a/arch/arm/mach-mvebu/serdes/high_speed_env_lib.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c similarity index 100% rename from arch/arm/mach-mvebu/serdes/high_speed_env_lib.c rename to arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
diff --git a/arch/arm/mach-mvebu/serdes/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c similarity index 100% rename from arch/arm/mach-mvebu/serdes/high_speed_env_spec.c rename to arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c
diff --git a/arch/arm/mach-mvebu/serdes/high_speed_env_spec.h b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.h similarity index 100% rename from arch/arm/mach-mvebu/serdes/high_speed_env_spec.h rename to arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.h
diff --git a/board/maxbcm/maxbcm.c b/board/maxbcm/maxbcm.c index 2fbb90c..119ba4c 100644 --- a/board/maxbcm/maxbcm.c +++ b/board/maxbcm/maxbcm.c
@@ -11,8 +11,8 @@ #include <asm/arch/soc.h> #include <linux/mbus.h> -#include "../drivers/ddr/mvebu/ddr3_hw_training.h" -#include "../arch/arm/mach-mvebu/serdes/high_speed_env_spec.h" +#include "../drivers/ddr/marvell/axp/ddr3_hw_training.h" +#include "../arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.h" DECLARE_GLOBAL_DATA_PTR;