From: Michal Simek Date: Tue, 29 Nov 2016 11:03:51 +0000 (+0100) Subject: ARM64: zynqmp: Use DTS name for different psu_init_gpl* files in SPL X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=829779ac12d58476882bae78fbba06a50d5d2f34;p=thirdparty%2Fu-boot.git ARM64: zynqmp: Use DTS name for different psu_init_gpl* files in SPL CONFIG_SYS_CONFIG_NAME is not proper config option for different low level init files because different board revisions requires different psu_init_gpl* files. Also at the end of moving drivers to DM all board specific configuration files should be removed. Signed-off-by: Michal Simek --- diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile index efc8edaaf6e..9d69d6546e2 100644 --- a/board/xilinx/zynqmp/Makefile +++ b/board/xilinx/zynqmp/Makefile @@ -7,7 +7,7 @@ obj-y := zynqmp.o -hw-platform-y :=$(shell echo $(CONFIG_SYS_CONFIG_NAME)) +hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)) init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\ $(hw-platform-y)/psu_init_gpl.o) diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_ep/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-ep108/psu_init_gpl.c similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_ep/psu_init_gpl.c rename to board/xilinx/zynqmp/zynqmp-ep108/psu_init_gpl.c diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_ep/psu_init_gpl.h b/board/xilinx/zynqmp/zynqmp-ep108/psu_init_gpl.h similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_ep/psu_init_gpl.h rename to board/xilinx/zynqmp/zynqmp-ep108/psu_init_gpl.h diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm015_dc1/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zc1751-xm015-dc1/psu_init_gpl.c similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm015_dc1/psu_init_gpl.c rename to board/xilinx/zynqmp/zynqmp-zc1751-xm015-dc1/psu_init_gpl.c diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm015_dc1/psu_init_gpl.h b/board/xilinx/zynqmp/zynqmp-zc1751-xm015-dc1/psu_init_gpl.h similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm015_dc1/psu_init_gpl.h rename to board/xilinx/zynqmp/zynqmp-zc1751-xm015-dc1/psu_init_gpl.h diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm016_dc2/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zc1751-xm016-dc2/psu_init_gpl.c similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm016_dc2/psu_init_gpl.c rename to board/xilinx/zynqmp/zynqmp-zc1751-xm016-dc2/psu_init_gpl.c diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm016_dc2/psu_init_gpl.h b/board/xilinx/zynqmp/zynqmp-zc1751-xm016-dc2/psu_init_gpl.h similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm016_dc2/psu_init_gpl.h rename to board/xilinx/zynqmp/zynqmp-zc1751-xm016-dc2/psu_init_gpl.h diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm017_dc3/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zc1751-xm017-dc3/psu_init_gpl.c similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm017_dc3/psu_init_gpl.c rename to board/xilinx/zynqmp/zynqmp-zc1751-xm017-dc3/psu_init_gpl.c diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm017_dc3/psu_init_gpl.h b/board/xilinx/zynqmp/zynqmp-zc1751-xm017-dc3/psu_init_gpl.h similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm017_dc3/psu_init_gpl.h rename to board/xilinx/zynqmp/zynqmp-zc1751-xm017-dc3/psu_init_gpl.h diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm018_dc4/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zc1751-xm018-dc4/psu_init_gpl.c similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm018_dc4/psu_init_gpl.c rename to board/xilinx/zynqmp/zynqmp-zc1751-xm018-dc4/psu_init_gpl.c diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm018_dc4/psu_init_gpl.h b/board/xilinx/zynqmp/zynqmp-zc1751-xm018-dc4/psu_init_gpl.h similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm018_dc4/psu_init_gpl.h rename to board/xilinx/zynqmp/zynqmp-zc1751-xm018-dc4/psu_init_gpl.h diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm019_dc5/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zc1751-xm019-dc5/psu_init_gpl.c similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm019_dc5/psu_init_gpl.c rename to board/xilinx/zynqmp/zynqmp-zc1751-xm019-dc5/psu_init_gpl.c diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm019_dc5/psu_init_gpl.h b/board/xilinx/zynqmp/zynqmp-zc1751-xm019-dc5/psu_init_gpl.h similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zc1751_xm019_dc5/psu_init_gpl.h rename to board/xilinx/zynqmp/zynqmp-zc1751-xm019-dc5/psu_init_gpl.h diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zcu100/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu100/psu_init_gpl.c similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zcu100/psu_init_gpl.c rename to board/xilinx/zynqmp/zynqmp-zcu100/psu_init_gpl.c diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zcu100/psu_init_gpl.h b/board/xilinx/zynqmp/zynqmp-zcu100/psu_init_gpl.h similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zcu100/psu_init_gpl.h rename to board/xilinx/zynqmp/zynqmp-zcu100/psu_init_gpl.h diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zcu100/regs.txt b/board/xilinx/zynqmp/zynqmp-zcu100/regs.txt similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zcu100/regs.txt rename to board/xilinx/zynqmp/zynqmp-zcu100/regs.txt diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zcu102/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu102/psu_init_gpl.c similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zcu102/psu_init_gpl.c rename to board/xilinx/zynqmp/zynqmp-zcu102/psu_init_gpl.c diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zcu102/psu_init_gpl.h b/board/xilinx/zynqmp/zynqmp-zcu102/psu_init_gpl.h similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zcu102/psu_init_gpl.h rename to board/xilinx/zynqmp/zynqmp-zcu102/psu_init_gpl.h diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zcu106/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106/psu_init_gpl.c similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zcu106/psu_init_gpl.c rename to board/xilinx/zynqmp/zynqmp-zcu106/psu_init_gpl.c diff --git a/board/xilinx/zynqmp/xilinx_zynqmp_zcu106/psu_init_gpl.h b/board/xilinx/zynqmp/zynqmp-zcu106/psu_init_gpl.h similarity index 100% rename from board/xilinx/zynqmp/xilinx_zynqmp_zcu106/psu_init_gpl.h rename to board/xilinx/zynqmp/zynqmp-zcu106/psu_init_gpl.h diff --git a/configs/xilinx_zynqmp_zcu100_defconfig b/configs/xilinx_zynqmp_zcu100_defconfig index 87e94bf7610..a9a827afdbc 100644 --- a/configs/xilinx_zynqmp_zcu100_defconfig +++ b/configs/xilinx_zynqmp_zcu100_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_DM=y CONFIG_DM_SPI_FLASH=y CONFIG_DM_GPIO=y -CONFIG_BOOT_INIT_FILE="board/xilinx/zynqmp/xilinx_zynqmp_zcu100/regs.txt" +CONFIG_BOOT_INIT_FILE="board/xilinx/zynqmp/zynqmp-zcu100/regs.txt" CONFIG_ZYNQMP_QSPI=y CONFIG_ZYNQMP_USB=y CONFIG_SYS_TEXT_BASE=0x8000000