Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 6ebf8a4a9d9f77694d3e80a63040a274d16ee098

Authored by Michal Simek
1 parent 3d4eb334ec
Exists in smarc_8mq_lf_v2020.04 and in 22 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.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-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.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

ARM: zynq: Move CONFIG_SYS_TEXT_BASE to Kconfig 

Enable CONFIG_SYS_TEXT_BASE via Kconfig.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Showing 14 changed files with 14 additions and 4 deletions Side-by-side Diff

... ... @@ -248,7 +248,8 @@
248 248  
249 249 config SYS_TEXT_BASE
250 250 depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \
251   - (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS
  251 + (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS || \
  252 + ARCH_ZYNQ
252 253 depends on !EFI_APP
253 254 hex "Text Base"
254 255 help
configs/topic_miami_defconfig
Diff comments   View file @ 6ebf8a4
... ... @@ -3,6 +3,7 @@
3 3 CONFIG_SYS_CONFIG_NAME="topic_miami"
4 4 CONFIG_ARCH_ZYNQ=y
5 5 CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miami/ps7_regs.txt"
  6 +CONFIG_SYS_TEXT_BASE=0x4000000
6 7 CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miami"
7 8 CONFIG_BOOTDELAY=0
8 9 CONFIG_SYS_NO_FLASH=y
configs/topic_miamiplus_defconfig
Diff comments   View file @ 6ebf8a4
... ... @@ -3,6 +3,7 @@
3 3 CONFIG_SYS_CONFIG_NAME="topic_miamiplus"
4 4 CONFIG_ARCH_ZYNQ=y
5 5 CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miamiplus/ps7_regs.txt"
  6 +CONFIG_SYS_TEXT_BASE=0x4000000
6 7 CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miamiplus"
7 8 CONFIG_BOOTDELAY=0
8 9 CONFIG_SYS_NO_FLASH=y
configs/zynq_microzed_defconfig
Diff comments   View file @ 6ebf8a4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
  3 +CONFIG_SYS_TEXT_BASE=0x4000000
3 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed"
4 5 CONFIG_FIT=y
5 6 CONFIG_FIT_VERBOSE=y
configs/zynq_picozed_defconfig
Diff comments   View file @ 6ebf8a4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
  3 +CONFIG_SYS_TEXT_BASE=0x4000000
3 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"
4 5 CONFIG_SYS_NO_FLASH=y
5 6 # CONFIG_DISPLAY_CPUINFO is not set
configs/zynq_zc702_defconfig
Diff comments   View file @ 6ebf8a4
1 1 CONFIG_ARM=y
2 2 CONFIG_SYS_CONFIG_NAME="zynq_zc70x"
3 3 CONFIG_ARCH_ZYNQ=y
  4 +CONFIG_SYS_TEXT_BASE=0x4000000
4 5 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
5 6 CONFIG_FIT=y
6 7 CONFIG_FIT_VERBOSE=y
configs/zynq_zc706_defconfig
Diff comments   View file @ 6ebf8a4
1 1 CONFIG_ARM=y
2 2 CONFIG_SYS_CONFIG_NAME="zynq_zc70x"
3 3 CONFIG_ARCH_ZYNQ=y
  4 +CONFIG_SYS_TEXT_BASE=0x4000000
4 5 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706"
5 6 CONFIG_FIT=y
6 7 CONFIG_FIT_VERBOSE=y
configs/zynq_zc770_xm010_defconfig
Diff comments   View file @ 6ebf8a4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
  3 +CONFIG_SYS_TEXT_BASE=0x4000000
3 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
4 5 CONFIG_FIT=y
5 6 CONFIG_FIT_VERBOSE=y
configs/zynq_zc770_xm011_defconfig
Diff comments   View file @ 6ebf8a4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3 3 # CONFIG_MMC is not set
  4 +CONFIG_SYS_TEXT_BASE=0x4000000
4 5 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm011"
5 6 CONFIG_FIT=y
6 7 CONFIG_FIT_VERBOSE=y
configs/zynq_zc770_xm012_defconfig
Diff comments   View file @ 6ebf8a4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3 3 # CONFIG_MMC is not set
  4 +CONFIG_SYS_TEXT_BASE=0x4000000
4 5 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
5 6 CONFIG_FIT=y
6 7 CONFIG_FIT_VERBOSE=y
configs/zynq_zc770_xm013_defconfig
Diff comments   View file @ 6ebf8a4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3 3 # CONFIG_MMC is not set
  4 +CONFIG_SYS_TEXT_BASE=0x4000000
4 5 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
5 6 CONFIG_FIT=y
6 7 CONFIG_FIT_VERBOSE=y
configs/zynq_zed_defconfig
Diff comments   View file @ 6ebf8a4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
  3 +CONFIG_SYS_TEXT_BASE=0x4000000
3 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
4 5 CONFIG_FIT=y
5 6 CONFIG_FIT_VERBOSE=y
configs/zynq_zybo_defconfig
Diff comments   View file @ 6ebf8a4
1 1 CONFIG_ARM=y
2 2 CONFIG_SYS_CONFIG_NAME="zynq_zybo"
3 3 CONFIG_ARCH_ZYNQ=y
  4 +CONFIG_SYS_TEXT_BASE=0x4000000
4 5 CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
5 6 CONFIG_FIT=y
6 7 CONFIG_FIT_VERBOSE=y
include/configs/zynq-common.h
Diff comments   View file @ 6ebf8a4
... ... @@ -247,9 +247,6 @@
247 247 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
248 248 sizeof(CONFIG_SYS_PROMPT) + 16)
249 249  
250   -/* Physical Memory map */
251   -#define CONFIG_SYS_TEXT_BASE 0x4000000
252   -
253 250 #ifndef CONFIG_NR_DRAM_BANKS
254 251 # define CONFIG_NR_DRAM_BANKS 1
255 252 #endif