From: Stefan Roese Date: Mon, 20 Jul 2015 10:17:47 +0200 Subject: [U-Boot] [PATCH v2 05/11] arm: mvebu: serdes: Move Armada XP SERDES / PHY init code into new directory In-Reply-To: <1437380273-10516-1-git-send-email-sr@denx.de> References: <1437380273-10516-1-git-send-email-sr@denx.de> Message-ID: <1437380273-10516-6-git-send-email-sr@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- Changes in v2: None arch/arm/mach-mvebu/Makefile | 3 ++- arch/arm/mach-mvebu/serdes/{ => axp}/Makefile | 0 arch/arm/mach-mvebu/serdes/{ => axp}/board_env_spec.h | 0 arch/arm/mach-mvebu/serdes/{ => axp}/high_speed_env_lib.c | 0 arch/arm/mach-mvebu/serdes/{ => axp}/high_speed_env_spec.c | 0 arch/arm/mach-mvebu/serdes/{ => axp}/high_speed_env_spec.h | 0 board/maxbcm/maxbcm.c | 4 ++-- 7 files changed, 4 insertions(+), 3 deletions(-) rename arch/arm/mach-mvebu/serdes/{ => axp}/Makefile (100%) rename arch/arm/mach-mvebu/serdes/{ => axp}/board_env_spec.h (100%) rename arch/arm/mach-mvebu/serdes/{ => axp}/high_speed_env_lib.c (100%) rename arch/arm/mach-mvebu/serdes/{ => axp}/high_speed_env_spec.c (100%) rename arch/arm/mach-mvebu/serdes/{ => axp}/high_speed_env_spec.h (100%) 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-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 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 #include -#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; -- 2.4.6