Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0413f9c3e6f44b80dad8eabef4cf286d3f365684

Authored by Michal Simek
1 parent 61ba1244b5
Exists in smarc_8mq_lf_v2020.04 and in 10 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

arm64: zynqmp: Define default SPL_TEXT_BASE address in Kconfig 

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.simek@xilinx.com>
Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>

Showing 23 changed files with 1 additions and 22 deletions Side-by-side Diff

... ... @@ -138,6 +138,7 @@
138 138 default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I
139 139 default 0x20060 if MACH_SUN50I_H6
140 140 default 0x00060 if ARCH_SUNXI
  141 + default 0xfffc0000 if ARCH_ZYNQMP
141 142 default 0x0
142 143 help
143 144 The address in memory that SPL will be running from.
configs/avnet_ultra96_rev1_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -8,7 +8,6 @@
8 8 CONFIG_ZYNQ_SDHCI_MAX_FREQ=15000000
9 9 CONFIG_ZYNQMP_USB=y
10 10 CONFIG_DEBUG_UART=y
11   -CONFIG_SPL_TEXT_BASE=0xfffc0000
12 11 CONFIG_DISTRO_DEFAULTS=y
13 12 CONFIG_FIT=y
14 13 CONFIG_FIT_VERBOSE=y
configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -9,7 +9,6 @@
9 9 CONFIG_SPL_SPI_SUPPORT=y
10 10 CONFIG_SPL_ZYNQMP_TWO_SDHCI=y
11 11 CONFIG_DEBUG_UART=y
12   -CONFIG_SPL_TEXT_BASE=0xfffc0000
13 12 CONFIG_DISTRO_DEFAULTS=y
14 13 CONFIG_FIT=y
15 14 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_mini_emmc0_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -7,7 +7,6 @@
7 7 CONFIG_NR_DRAM_BANKS=1
8 8 CONFIG_SPL=y
9 9 # CONFIG_CMD_ZYNQMP is not set
10   -CONFIG_SPL_TEXT_BASE=0xfffc0000
11 10 CONFIG_FIT=y
12 11 CONFIG_SUPPORT_RAW_INITRD=y
13 12 # CONFIG_BOARD_LATE_INIT is not set
configs/xilinx_zynqmp_mini_emmc1_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -7,7 +7,6 @@
7 7 CONFIG_NR_DRAM_BANKS=1
8 8 CONFIG_SPL=y
9 9 # CONFIG_CMD_ZYNQMP is not set
10   -CONFIG_SPL_TEXT_BASE=0xfffc0000
11 10 CONFIG_FIT=y
12 11 CONFIG_SUPPORT_RAW_INITRD=y
13 12 # CONFIG_BOARD_LATE_INIT is not set
configs/xilinx_zynqmp_mini_qspi_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -10,7 +10,6 @@
10 10 CONFIG_ZYNQMP_NO_DDR=y
11 11 # CONFIG_PSCI_RESET is not set
12 12 # CONFIG_CMD_ZYNQMP is not set
13   -CONFIG_SPL_TEXT_BASE=0xfffc0000
14 13 # CONFIG_EXPERT is not set
15 14 # CONFIG_LEGACY_IMAGE_FORMAT is not set
16 15 # CONFIG_BOARD_LATE_INIT is not set
configs/xilinx_zynqmp_zc1232_revA_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -8,7 +8,6 @@
8 8 # CONFIG_SPL_FS_FAT is not set
9 9 # CONFIG_SPL_LIBDISK_SUPPORT is not set
10 10 CONFIG_DEBUG_UART=y
11   -CONFIG_SPL_TEXT_BASE=0xfffc0000
12 11 CONFIG_DISTRO_DEFAULTS=y
13 12 CONFIG_FIT=y
14 13 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zc1254_revA_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -8,7 +8,6 @@
8 8 # CONFIG_SPL_FS_FAT is not set
9 9 # CONFIG_SPL_LIBDISK_SUPPORT is not set
10 10 CONFIG_DEBUG_UART=y
11   -CONFIG_SPL_TEXT_BASE=0xfffc0000
12 11 CONFIG_DISTRO_DEFAULTS=y
13 12 CONFIG_FIT=y
14 13 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -9,7 +9,6 @@
9 9 CONFIG_SPL_ZYNQMP_TWO_SDHCI=y
10 10 CONFIG_DEBUG_UART=y
11 11 CONFIG_AHCI=y
12   -CONFIG_SPL_TEXT_BASE=0xfffc0000
13 12 CONFIG_DISTRO_DEFAULTS=y
14 13 CONFIG_FIT=y
15 14 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -9,7 +9,6 @@
9 9 # CONFIG_SPL_LIBDISK_SUPPORT is not set
10 10 CONFIG_ZYNQMP_USB=y
11 11 CONFIG_DEBUG_UART=y
12   -CONFIG_SPL_TEXT_BASE=0xfffc0000
13 12 CONFIG_DISTRO_DEFAULTS=y
14 13 CONFIG_FIT=y
15 14 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -8,7 +8,6 @@
8 8 CONFIG_ZYNQMP_USB=y
9 9 CONFIG_DEBUG_UART=y
10 10 CONFIG_AHCI=y
11   -CONFIG_SPL_TEXT_BASE=0xfffc0000
12 11 CONFIG_DISTRO_DEFAULTS=y
13 12 CONFIG_FIT=y
14 13 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -6,7 +6,6 @@
6 6 CONFIG_DEBUG_UART_BASE=0xff000000
7 7 CONFIG_DEBUG_UART_CLOCK=100000000
8 8 CONFIG_DEBUG_UART=y
9   -CONFIG_SPL_TEXT_BASE=0xfffc0000
10 9 CONFIG_DISTRO_DEFAULTS=y
11 10 CONFIG_FIT=y
12 11 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -6,7 +6,6 @@
6 6 CONFIG_DEBUG_UART_BASE=0xff000000
7 7 CONFIG_DEBUG_UART_CLOCK=100000000
8 8 CONFIG_DEBUG_UART=y
9   -CONFIG_SPL_TEXT_BASE=0xfffc0000
10 9 CONFIG_DISTRO_DEFAULTS=y
11 10 CONFIG_FIT=y
12 11 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zcu100_revC_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -8,7 +8,6 @@
8 8 CONFIG_ZYNQ_SDHCI_MAX_FREQ=15000000
9 9 CONFIG_ZYNQMP_USB=y
10 10 CONFIG_DEBUG_UART=y
11   -CONFIG_SPL_TEXT_BASE=0xfffc0000
12 11 CONFIG_DISTRO_DEFAULTS=y
13 12 CONFIG_FIT=y
14 13 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -10,7 +10,6 @@
10 10 CONFIG_ZYNQMP_USB=y
11 11 CONFIG_DEBUG_UART=y
12 12 CONFIG_AHCI=y
13   -CONFIG_SPL_TEXT_BASE=0xfffc0000
14 13 CONFIG_DISTRO_DEFAULTS=y
15 14 CONFIG_FIT=y
16 15 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zcu102_revA_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -10,7 +10,6 @@
10 10 CONFIG_ZYNQMP_USB=y
11 11 CONFIG_DEBUG_UART=y
12 12 CONFIG_AHCI=y
13   -CONFIG_SPL_TEXT_BASE=0xfffc0000
14 13 CONFIG_DISTRO_DEFAULTS=y
15 14 CONFIG_FIT=y
16 15 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zcu102_revB_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -10,7 +10,6 @@
10 10 CONFIG_ZYNQMP_USB=y
11 11 CONFIG_DEBUG_UART=y
12 12 CONFIG_AHCI=y
13   -CONFIG_SPL_TEXT_BASE=0xfffc0000
14 13 CONFIG_DISTRO_DEFAULTS=y
15 14 CONFIG_FIT=y
16 15 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zcu104_revA_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -8,7 +8,6 @@
8 8 CONFIG_ZYNQMP_USB=y
9 9 CONFIG_DEBUG_UART=y
10 10 CONFIG_AHCI=y
11   -CONFIG_SPL_TEXT_BASE=0xfffc0000
12 11 CONFIG_DISTRO_DEFAULTS=y
13 12 CONFIG_FIT=y
14 13 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zcu104_revC_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -8,7 +8,6 @@
8 8 CONFIG_ZYNQMP_USB=y
9 9 CONFIG_DEBUG_UART=y
10 10 CONFIG_AHCI=y
11   -CONFIG_SPL_TEXT_BASE=0xfffc0000
12 11 CONFIG_DISTRO_DEFAULTS=y
13 12 CONFIG_FIT=y
14 13 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zcu106_revA_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -10,7 +10,6 @@
10 10 CONFIG_ZYNQMP_USB=y
11 11 CONFIG_DEBUG_UART=y
12 12 CONFIG_AHCI=y
13   -CONFIG_SPL_TEXT_BASE=0xfffc0000
14 13 CONFIG_DISTRO_DEFAULTS=y
15 14 CONFIG_FIT=y
16 15 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zcu111_revA_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -8,7 +8,6 @@
8 8 CONFIG_ZYNQMP_USB=y
9 9 CONFIG_DEBUG_UART=y
10 10 CONFIG_AHCI=y
11   -CONFIG_SPL_TEXT_BASE=0xfffc0000
12 11 CONFIG_DISTRO_DEFAULTS=y
13 12 CONFIG_FIT=y
14 13 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zcu1275_revA_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -8,7 +8,6 @@
8 8 # CONFIG_SPL_FS_FAT is not set
9 9 # CONFIG_SPL_LIBDISK_SUPPORT is not set
10 10 CONFIG_DEBUG_UART=y
11   -CONFIG_SPL_TEXT_BASE=0xfffc0000
12 11 CONFIG_DISTRO_DEFAULTS=y
13 12 CONFIG_FIT=y
14 13 CONFIG_FIT_VERBOSE=y
configs/xilinx_zynqmp_zcu1275_revB_defconfig
Diff comments   View file @ 0413f9c
... ... @@ -8,7 +8,6 @@
8 8 # CONFIG_SPL_FS_FAT is not set
9 9 # CONFIG_SPL_LIBDISK_SUPPORT is not set
10 10 CONFIG_DEBUG_UART=y
11   -CONFIG_SPL_TEXT_BASE=0xfffc0000
12 11 CONFIG_DISTRO_DEFAULTS=y
13 12 CONFIG_FIT=y
14 13 CONFIG_FIT_VERBOSE=y