Browse Source

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>
tags/2020-06-01
Michal Simek 4 years ago
parent
commit
6ebf8a4a9d
14 changed files with 14 additions and 4 deletions
  1. +2
    -1
      Kconfig
  2. +1
    -0
      configs/topic_miami_defconfig
  3. +1
    -0
      configs/topic_miamiplus_defconfig
  4. +1
    -0
      configs/zynq_microzed_defconfig
  5. +1
    -0
      configs/zynq_picozed_defconfig
  6. +1
    -0
      configs/zynq_zc702_defconfig
  7. +1
    -0
      configs/zynq_zc706_defconfig
  8. +1
    -0
      configs/zynq_zc770_xm010_defconfig
  9. +1
    -0
      configs/zynq_zc770_xm011_defconfig
  10. +1
    -0
      configs/zynq_zc770_xm012_defconfig
  11. +1
    -0
      configs/zynq_zc770_xm013_defconfig
  12. +1
    -0
      configs/zynq_zed_defconfig
  13. +1
    -0
      configs/zynq_zybo_defconfig
  14. +0
    -3
      include/configs/zynq-common.h

+ 2
- 1
Kconfig View File

@@ -248,7 +248,8 @@ config SYS_EXTRA_OPTIONS

config SYS_TEXT_BASE
depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \
(M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS
(M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS || \
ARCH_ZYNQ
depends on !EFI_APP
hex "Text Base"
help


+ 1
- 0
configs/topic_miami_defconfig View File

@@ -3,6 +3,7 @@ CONFIG_SYS_VENDOR="topic"
CONFIG_SYS_CONFIG_NAME="topic_miami"
CONFIG_ARCH_ZYNQ=y
CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miami/ps7_regs.txt"
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miami"
CONFIG_BOOTDELAY=0
CONFIG_SYS_NO_FLASH=y


+ 1
- 0
configs/topic_miamiplus_defconfig View File

@@ -3,6 +3,7 @@ CONFIG_SYS_VENDOR="topic"
CONFIG_SYS_CONFIG_NAME="topic_miamiplus"
CONFIG_ARCH_ZYNQ=y
CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miamiplus/ps7_regs.txt"
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miamiplus"
CONFIG_BOOTDELAY=0
CONFIG_SYS_NO_FLASH=y


+ 1
- 0
configs/zynq_microzed_defconfig View File

@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y


+ 1
- 0
configs/zynq_picozed_defconfig View File

@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"
CONFIG_SYS_NO_FLASH=y
# CONFIG_DISPLAY_CPUINFO is not set


+ 1
- 0
configs/zynq_zc702_defconfig View File

@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="zynq_zc70x"
CONFIG_ARCH_ZYNQ=y
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y


+ 1
- 0
configs/zynq_zc706_defconfig View File

@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="zynq_zc70x"
CONFIG_ARCH_ZYNQ=y
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y


+ 1
- 0
configs/zynq_zc770_xm010_defconfig View File

@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y


+ 1
- 0
configs/zynq_zc770_xm011_defconfig View File

@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y
# CONFIG_MMC is not set
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm011"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y


+ 1
- 0
configs/zynq_zc770_xm012_defconfig View File

@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y
# CONFIG_MMC is not set
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y


+ 1
- 0
configs/zynq_zc770_xm013_defconfig View File

@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y
# CONFIG_MMC is not set
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y


+ 1
- 0
configs/zynq_zed_defconfig View File

@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y


+ 1
- 0
configs/zynq_zybo_defconfig View File

@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="zynq_zybo"
CONFIG_ARCH_ZYNQ=y
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y


+ 0
- 3
include/configs/zynq-common.h View File

@@ -247,9 +247,6 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)

/* Physical Memory map */
#define CONFIG_SYS_TEXT_BASE 0x4000000

#ifndef CONFIG_NR_DRAM_BANKS
# define CONFIG_NR_DRAM_BANKS 1
#endif