Hi, st 11. 9. 2019 v 8:54 odesÃlatel Michal Simek <michal.si...@xilinx.com> napsal: > > Define default address via Kconfig. There is no need to change this address > for most of the boards but it is also possible. This one line save a lot of > lines in defconfigs that's why make sense to do it. > > The similar change has been done by commit 9340d8fe8beb > ("sunxi: move CONFIG_SPL_TEXT_BASE from *_defconfig to Kconfig") > > Signed-off-by: Michal Simek <michal.si...@xilinx.com> > --- > > common/spl/Kconfig | 1 + > configs/avnet_ultra96_rev1_defconfig | 1 - > configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 - > configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 - > configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 - > configs/xilinx_zynqmp_mini_qspi_defconfig | 1 - > configs/xilinx_zynqmp_zc1232_revA_defconfig | 1 - > configs/xilinx_zynqmp_zc1254_revA_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 - > configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 - > configs/xilinx_zynqmp_zcu100_revC_defconfig | 1 - > configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 - > configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 - > configs/xilinx_zynqmp_zcu104_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu104_revC_defconfig | 1 - > configs/xilinx_zynqmp_zcu106_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu111_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu1275_revA_defconfig | 1 - > configs/xilinx_zynqmp_zcu1275_revB_defconfig | 1 - > 23 files changed, 1 insertion(+), 22 deletions(-) > > diff --git a/common/spl/Kconfig b/common/spl/Kconfig > index f467eca2be72..59a7b200891f 100644 > --- a/common/spl/Kconfig > +++ b/common/spl/Kconfig > @@ -138,6 +138,7 @@ config SPL_TEXT_BASE > default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I > default 0x20060 if MACH_SUN50I_H6 > default 0x00060 if ARCH_SUNXI > + default 0xfffc0000 if ARCH_ZYNQMP > default 0x0 > help > The address in memory that SPL will be running from. > diff --git a/configs/avnet_ultra96_rev1_defconfig > b/configs/avnet_ultra96_rev1_defconfig > index b504332ff006..924153081149 100644 > --- a/configs/avnet_ultra96_rev1_defconfig > +++ b/configs/avnet_ultra96_rev1_defconfig > @@ -13,7 +13,6 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig > b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig > index b326231b6829..f463318565ff 100644 > --- a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig > +++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig > @@ -15,7 +15,6 @@ CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > CONFIG_BOOTDELAY=0 > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SYS_PROMPT="ZynqMP> " > CONFIG_CMD_MEMTEST=y > diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig > b/configs/xilinx_zynqmp_mini_emmc0_defconfig > index 0faa3326132d..b4162abdd715 100644 > --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig > +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig > @@ -12,7 +12,6 @@ CONFIG_SUPPORT_RAW_INITRD=y > # CONFIG_BOARD_LATE_INIT is not set > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_BOARD_EARLY_INIT_R=y > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > # CONFIG_CMDLINE_EDITING is not set > # CONFIG_AUTO_COMPLETE is not set > CONFIG_SYS_PROMPT="ZynqMP> " > diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig > b/configs/xilinx_zynqmp_mini_emmc1_defconfig > index 867d2e5d9cee..76d5aa6c713b 100644 > --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig > +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig > @@ -12,7 +12,6 @@ CONFIG_SUPPORT_RAW_INITRD=y > # CONFIG_BOARD_LATE_INIT is not set > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_BOARD_EARLY_INIT_R=y > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > # CONFIG_CMDLINE_EDITING is not set > # CONFIG_AUTO_COMPLETE is not set > CONFIG_SYS_PROMPT="ZynqMP> " > diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig > b/configs/xilinx_zynqmp_mini_qspi_defconfig > index b0bc84d55eca..a20534a488ca 100644 > --- a/configs/xilinx_zynqmp_mini_qspi_defconfig > +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig > @@ -14,7 +14,6 @@ CONFIG_ZYNQMP_NO_DDR=y > # CONFIG_LEGACY_IMAGE_FORMAT is not set > # CONFIG_BOARD_LATE_INIT is not set > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > # CONFIG_CMDLINE_EDITING is not set > # CONFIG_AUTO_COMPLETE is not set > # CONFIG_SYS_LONGHELP is not set > diff --git a/configs/xilinx_zynqmp_zc1232_revA_defconfig > b/configs/xilinx_zynqmp_zc1232_revA_defconfig > index aa2165f77adb..80a310fb1cee 100644 > --- a/configs/xilinx_zynqmp_zc1232_revA_defconfig > +++ b/configs/xilinx_zynqmp_zc1232_revA_defconfig > @@ -13,7 +13,6 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zc1254_revA_defconfig > b/configs/xilinx_zynqmp_zc1254_revA_defconfig > index 1ab0639eb9e2..75ec572827bf 100644 > --- a/configs/xilinx_zynqmp_zc1254_revA_defconfig > +++ b/configs/xilinx_zynqmp_zc1254_revA_defconfig > @@ -13,7 +13,6 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > index 7b1f5e9d0ae3..ce1ea089ce8d 100644 > --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > @@ -15,7 +15,6 @@ CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_BOARD_EARLY_INIT_R=y > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > index ae2554a8eb74..01c29c0e70a3 100644 > --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > @@ -15,7 +15,6 @@ CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_BOARD_EARLY_INIT_R=y > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig > b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig > index 559a61e8d020..877f5b230da3 100644 > --- a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig > +++ b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig > @@ -13,7 +13,6 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > index cc2af6dce0ac..6f14234a590e 100644 > --- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > +++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig > @@ -12,7 +12,6 @@ CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_BOARD_EARLY_INIT_R=y > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > index bf66171335d2..f1970aadf417 100644 > --- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > +++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig > @@ -12,7 +12,6 @@ CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_BOARD_EARLY_INIT_R=y > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zcu100_revC_defconfig > b/configs/xilinx_zynqmp_zcu100_revC_defconfig > index 4b3f72da7487..cd7d2f5376d2 100644 > --- a/configs/xilinx_zynqmp_zcu100_revC_defconfig > +++ b/configs/xilinx_zynqmp_zcu100_revC_defconfig > @@ -13,7 +13,6 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > index ef291a7d38ef..371e6363db2f 100644 > --- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > +++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig > @@ -16,7 +16,6 @@ CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_BOARD_EARLY_INIT_R=y > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig > b/configs/xilinx_zynqmp_zcu102_revA_defconfig > index 975e9f5eb13b..a0fb6c3586cc 100644 > --- a/configs/xilinx_zynqmp_zcu102_revA_defconfig > +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig > @@ -16,7 +16,6 @@ CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_BOARD_EARLY_INIT_R=y > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig > b/configs/xilinx_zynqmp_zcu102_revB_defconfig > index 34918aa17196..db7c093d5ebc 100644 > --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig > +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig > @@ -16,7 +16,6 @@ CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_BOARD_EARLY_INIT_R=y > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zcu104_revA_defconfig > b/configs/xilinx_zynqmp_zcu104_revA_defconfig > index e4090dc28122..eacf75d9f8e2 100644 > --- a/configs/xilinx_zynqmp_zcu104_revA_defconfig > +++ b/configs/xilinx_zynqmp_zcu104_revA_defconfig > @@ -13,7 +13,6 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zcu104_revC_defconfig > b/configs/xilinx_zynqmp_zcu104_revC_defconfig > index 25a2515d1552..1c9a6d6f1ec4 100644 > --- a/configs/xilinx_zynqmp_zcu104_revC_defconfig > +++ b/configs/xilinx_zynqmp_zcu104_revC_defconfig > @@ -13,7 +13,6 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zcu106_revA_defconfig > b/configs/xilinx_zynqmp_zcu106_revA_defconfig > index 212de924a68a..1b685ca04925 100644 > --- a/configs/xilinx_zynqmp_zcu106_revA_defconfig > +++ b/configs/xilinx_zynqmp_zcu106_revA_defconfig > @@ -15,7 +15,6 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zcu111_revA_defconfig > b/configs/xilinx_zynqmp_zcu111_revA_defconfig > index dec894787e21..74106d7ea8fa 100644 > --- a/configs/xilinx_zynqmp_zcu111_revA_defconfig > +++ b/configs/xilinx_zynqmp_zcu111_revA_defconfig > @@ -13,7 +13,6 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zcu1275_revA_defconfig > b/configs/xilinx_zynqmp_zcu1275_revA_defconfig > index c73a97a050cc..b9110ca3b936 100644 > --- a/configs/xilinx_zynqmp_zcu1275_revA_defconfig > +++ b/configs/xilinx_zynqmp_zcu1275_revA_defconfig > @@ -13,7 +13,6 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > diff --git a/configs/xilinx_zynqmp_zcu1275_revB_defconfig > b/configs/xilinx_zynqmp_zcu1275_revB_defconfig > index 0d4302ea737c..03372c77e637 100644 > --- a/configs/xilinx_zynqmp_zcu1275_revB_defconfig > +++ b/configs/xilinx_zynqmp_zcu1275_revB_defconfig > @@ -13,7 +13,6 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_DISPLAY_CPUINFO is not set > -CONFIG_SPL_TEXT_BASE=0xfffc0000 > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_RAM_SUPPORT=y > CONFIG_SPL_RAM_DEVICE=y > -- > 2.17.1 >
Applied. M -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot