diff options
| author | Stefan Roese <sr@denx.de> | 2015-04-20 09:28:12 +0200 |
|---|---|---|
| committer | Luka Perkov <luka.perkov@sartura.hr> | 2015-07-23 10:38:05 +0200 |
| commit | 29b103c733f6c17ecf8ee8d66140254788e2bdda (patch) | |
| tree | 783089f3655fb14cba2610da3e27211625553963 | |
| parent | c25012b9af1e217958ee74dc8d26742cec613860 (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>
| -rw-r--r-- | arch/arm/mach-mvebu/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/serdes/axp/Makefile (renamed from arch/arm/mach-mvebu/serdes/Makefile) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/serdes/axp/board_env_spec.h (renamed from arch/arm/mach-mvebu/serdes/board_env_spec.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c (renamed from arch/arm/mach-mvebu/serdes/high_speed_env_lib.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c (renamed from arch/arm/mach-mvebu/serdes/high_speed_env_spec.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.h (renamed from arch/arm/mach-mvebu/serdes/high_speed_env_spec.h) | 0 | ||||
| -rw-r--r-- | board/maxbcm/maxbcm.c | 4 |
7 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 4f477cded86..9cdbefd24b1 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -20,5 +20,6 @@ obj-y += timer.o 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 index a380fee1445..a380fee1445 100644 --- a/arch/arm/mach-mvebu/serdes/Makefile +++ b/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 index 36e0ed80f0d..36e0ed80f0d 100644 --- a/arch/arm/mach-mvebu/serdes/board_env_spec.h +++ b/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 index 702273aee12..702273aee12 100644 --- a/arch/arm/mach-mvebu/serdes/high_speed_env_lib.c +++ b/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 index 115ec2cd600..115ec2cd600 100644 --- a/arch/arm/mach-mvebu/serdes/high_speed_env_spec.c +++ b/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 index e5aa1b06edb..e5aa1b06edb 100644 --- a/arch/arm/mach-mvebu/serdes/high_speed_env_spec.h +++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.h diff --git a/board/maxbcm/maxbcm.c b/board/maxbcm/maxbcm.c index 2fbb90cfff1..119ba4c6c8f 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; |