diff options
author | Simon Glass <sjg@chromium.org> | 2022-10-21 03:22:39 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-10-31 18:01:31 +0300 |
commit | 984639039f4cfe32ec2cc531d6ace05326ac49eb (patch) | |
tree | 472bf7e47978335a73c5d6025d3b83b534f7192b /board | |
parent | 6f38d91158e7e4199753b79e0a25c1a65175aba4 (diff) | |
download | u-boot-984639039f4cfe32ec2cc531d6ace05326ac49eb.tar.xz |
Rename CONFIG_SYS_TEXT_BASE to CONFIG_TEXT_BASE
The current name is inconsistent with SPL which uses CONFIG_SPL_TEXT_BASE
and this makes it imposible to use CONFIG_VAL().
Rename it to resolve this problem.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board')
61 files changed, 70 insertions, 70 deletions
diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c index 173350b706..2b08930af6 100644 --- a/board/BuS/eb_cpu5282/eb_cpu5282.c +++ b/board/BuS/eb_cpu5282/eb_cpu5282.c @@ -26,7 +26,7 @@ DECLARE_GLOBAL_DATA_PTR; int checkboard (void) { puts("Board: EB+CPU5282 (BuS Elektronik GmbH & Co. KG)\n"); -#if (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) +#if (CONFIG_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) puts(" Boot from Internal FLASH\n"); #endif return 0; diff --git a/board/advantech/som-db5800-som-6867/Kconfig b/board/advantech/som-db5800-som-6867/Kconfig index 35d58fcd01..4070d5903c 100644 --- a/board/advantech/som-db5800-som-6867/Kconfig +++ b/board/advantech/som-db5800-som-6867/Kconfig @@ -12,7 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "som-db5800-som-6867" -config SYS_TEXT_BASE +config TEXT_BASE default 0xfff00000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig index a0314c6537..c7adae0ea7 100644 --- a/board/armltd/vexpress64/Kconfig +++ b/board/armltd/vexpress64/Kconfig @@ -54,9 +54,9 @@ config JUNO_DTB_PART device tree blob to configure U-Boot. config LNX_KRNL_IMG_TEXT_OFFSET_BASE - default SYS_TEXT_BASE + default TEXT_BASE -config SYS_TEXT_BASE +config TEXT_BASE default 0x88000000 if TARGET_VEXPRESS64_BASE_FVP default 0xe0000000 if TARGET_VEXPRESS64_JUNO default 0x00001000 if TARGET_VEXPRESS64_BASER_FVP diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c index 4b41c6fdaa..99fe1edfb3 100644 --- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c +++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c @@ -12,7 +12,7 @@ DECLARE_GLOBAL_DATA_PTR; int board_init(void) { /* address of boot parameters */ - gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000; + gd->bd->bi_boot_params = CONFIG_TEXT_BASE + 0x50000; return 0; } diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c index 07aeb0981c..aead6f099e 100644 --- a/board/broadcom/bcmstb/bcmstb.c +++ b/board/broadcom/bcmstb/bcmstb.c @@ -61,13 +61,13 @@ int dram_init_banksize(void) /* * On this SoC, U-Boot is running as an ELF file. Change the - * relocation address to CONFIG_SYS_TEXT_BASE, so that in + * relocation address to CONFIG_TEXT_BASE, so that in * setup_reloc, gd->reloc_off works out to 0, effectively * disabling relocation. Otherwise U-Boot hangs in the setup * instructions just before relocate_code in * arch/arm/lib/crt0.S. */ - gd->relocaddr = CONFIG_SYS_TEXT_BASE; + gd->relocaddr = CONFIG_TEXT_BASE; return 0; } diff --git a/board/cobra5272/README b/board/cobra5272/README index 1dad7e3eaf..ac62e557a0 100644 --- a/board/cobra5272/README +++ b/board/cobra5272/README @@ -89,9 +89,9 @@ please first check: => u-boot as single bootloader starting from flash - in board/cobra5272/config.mk CONFIG_SYS_TEXT_BASE should be + in board/cobra5272/config.mk CONFIG_TEXT_BASE should be - CONFIG_SYS_TEXT_BASE = 0xffe00000 + CONFIG_TEXT_BASE = 0xffe00000 => linking address for u-boot as single bootloader stored in flash @@ -128,9 +128,9 @@ please modify the settings: => u-boot as RAM version, chainloaded by another bootloader or using bdm cable - in board/cobra5272/config.mk CONFIG_SYS_TEXT_BASE should be + in board/cobra5272/config.mk CONFIG_TEXT_BASE should be - CONFIG_SYS_TEXT_BASE = 0x00020000 + CONFIG_TEXT_BASE = 0x00020000 => target linking address for RAM diff --git a/board/congatec/cgtqmx8/cgtqmx8.c b/board/congatec/cgtqmx8/cgtqmx8.c index a50a052df7..c211cb5839 100644 --- a/board/congatec/cgtqmx8/cgtqmx8.c +++ b/board/congatec/cgtqmx8/cgtqmx8.c @@ -425,7 +425,7 @@ int board_late_init(void) char *end_of_uboot; char command[256]; - end_of_uboot = (char *)(ulong)(CONFIG_SYS_TEXT_BASE + _end_ofs + end_of_uboot = (char *)(ulong)(CONFIG_TEXT_BASE + _end_ofs + fdt_totalsize(gd->fdt_blob)); end_of_uboot += 9; diff --git a/board/congatec/conga-qeval20-qa3-e3845/Kconfig b/board/congatec/conga-qeval20-qa3-e3845/Kconfig index 64692509fd..2cdc34c7c0 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/Kconfig +++ b/board/congatec/conga-qeval20-qa3-e3845/Kconfig @@ -11,7 +11,7 @@ config SYS_CONFIG_NAME default "conga-qeval20-qa3-e3845" if TARGET_CONGA_QEVAL20_QA3_E3845 default "theadorable-x86-conga-qa3-e3845" if TARGET_THEADORABLE_X86_CONGA_QA3_E3845 -config SYS_TEXT_BASE +config TEXT_BASE default 0xfff00000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/coreboot/coreboot/Kconfig b/board/coreboot/coreboot/Kconfig index 05e9b3b6f7..4f41ce1abf 100644 --- a/board/coreboot/coreboot/Kconfig +++ b/board/coreboot/coreboot/Kconfig @@ -9,7 +9,7 @@ config SYS_VENDOR config SYS_SOC default "coreboot" -config SYS_TEXT_BASE +config TEXT_BASE default 0x01110000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/cssi/MCR3000/Kconfig b/board/cssi/MCR3000/Kconfig index ecfd90fd4c..dbe2d5f0a3 100644 --- a/board/cssi/MCR3000/Kconfig +++ b/board/cssi/MCR3000/Kconfig @@ -9,7 +9,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "MCR3000" -config SYS_TEXT_BASE +config TEXT_BASE default 0x04000000 endif diff --git a/board/davinci/da8xxevm/README.da850 b/board/davinci/da8xxevm/README.da850 index 8cebdcc1bb..50ef401b7c 100644 --- a/board/davinci/da8xxevm/README.da850 +++ b/board/davinci/da8xxevm/README.da850 @@ -124,7 +124,7 @@ NOR Flash is XIP (execute-in-place), so no AIS (or SPL) is needed. The u-boot.bin is directy flashed, but CONFIT_DA850_LOWLEVEL must be set to initialize hardware that's normally done by SPL. -For this case, CONFIG_SYS_TEXT_BASE=0x60000000 which is the address to +For this case, CONFIG_TEXT_BASE=0x60000000 which is the address to which the bootloader jumps when powered on. Example: diff --git a/board/dfi/dfi-bt700/Kconfig b/board/dfi/dfi-bt700/Kconfig index 50c7b2a2f4..413f42a320 100644 --- a/board/dfi/dfi-bt700/Kconfig +++ b/board/dfi/dfi-bt700/Kconfig @@ -11,7 +11,7 @@ config SYS_CONFIG_NAME default "dfi-bt700" if TARGET_Q7X_151_DFI_BT700 default "theadorable-x86-dfi-bt700" if TARGET_THEADORABLE_X86_DFI_BT700 -config SYS_TEXT_BASE +config TEXT_BASE default 0xfff00000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/efi/efi-x86_payload/Kconfig b/board/efi/efi-x86_payload/Kconfig index 08dd0c2edd..6d06249934 100644 --- a/board/efi/efi-x86_payload/Kconfig +++ b/board/efi/efi-x86_payload/Kconfig @@ -12,7 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "efi-x86_payload" -config SYS_TEXT_BASE +config TEXT_BASE default 0x00200000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/emulation/qemu-arm/Kconfig b/board/emulation/qemu-arm/Kconfig index 95dbefa78b..ed9949651c 100644 --- a/board/emulation/qemu-arm/Kconfig +++ b/board/emulation/qemu-arm/Kconfig @@ -1,6 +1,6 @@ if TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT -config SYS_TEXT_BASE +config TEXT_BASE default 0x00000000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-riscv/Kconfig index f9883f18b0..6114e1b812 100644 --- a/board/emulation/qemu-riscv/Kconfig +++ b/board/emulation/qemu-riscv/Kconfig @@ -12,7 +12,7 @@ config SYS_CPU config SYS_CONFIG_NAME default "qemu-riscv" -config SYS_TEXT_BASE +config TEXT_BASE default 0x81200000 if SPL default 0x80000000 if !RISCV_SMODE default 0x80200000 if RISCV_SMODE && ARCH_RV64I diff --git a/board/emulation/qemu-x86/Kconfig b/board/emulation/qemu-x86/Kconfig index 9bb8a726ed..787751abba 100644 --- a/board/emulation/qemu-x86/Kconfig +++ b/board/emulation/qemu-x86/Kconfig @@ -12,7 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "qemu-x86" -config SYS_TEXT_BASE +config TEXT_BASE default 0xfff00000 if !SUPPORT_SPL default 0x01110000 if SUPPORT_SPL diff --git a/board/freescale/imx8qm_mek/uboot-container.cfg b/board/freescale/imx8qm_mek/uboot-container.cfg index 93c5d39ae9..e25aa76fe1 100644 --- a/board/freescale/imx8qm_mek/uboot-container.cfg +++ b/board/freescale/imx8qm_mek/uboot-container.cfg @@ -9,4 +9,4 @@ BOOT_FROM SD 0x400 SOC_TYPE IMX8QM CONTAINER IMAGE A35 bl31.bin 0x80000000 -IMAGE A35 u-boot.bin CONFIG_SYS_TEXT_BASE +IMAGE A35 u-boot.bin CONFIG_TEXT_BASE diff --git a/board/freescale/imx8qxp_mek/uboot-container.cfg b/board/freescale/imx8qxp_mek/uboot-container.cfg index b53896f235..b481c98f92 100644 --- a/board/freescale/imx8qxp_mek/uboot-container.cfg +++ b/board/freescale/imx8qxp_mek/uboot-container.cfg @@ -9,4 +9,4 @@ BOOT_FROM SD 0x400 SOC_TYPE IMX8QX CONTAINER IMAGE A35 bl31.bin 0x80000000 -IMAGE A35 u-boot.bin CONFIG_SYS_TEXT_BASE +IMAGE A35 u-boot.bin CONFIG_TEXT_BASE diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c index f016088670..245c9dfb18 100644 --- a/board/freescale/ls1021atsn/ls1021atsn.c +++ b/board/freescale/ls1021atsn/ls1021atsn.c @@ -188,7 +188,7 @@ void board_init_f(ulong dummy) * in last boot. */ if (is_warm_boot()) { - second_uboot = (void (*)(void))CONFIG_SYS_TEXT_BASE; + second_uboot = (void (*)(void))CONFIG_TEXT_BASE; second_uboot(); } diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index 746b35a678..fa87df7358 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -439,7 +439,7 @@ void board_init_f(ulong dummy) * in last boot. */ if (is_warm_boot()) { - second_uboot = (void (*)(void))CONFIG_SYS_TEXT_BASE; + second_uboot = (void (*)(void))CONFIG_TEXT_BASE; second_uboot(); } diff --git a/board/freescale/ls1028a/Kconfig b/board/freescale/ls1028a/Kconfig index 5c27f0f726..7d73d20c8f 100644 --- a/board/freescale/ls1028a/Kconfig +++ b/board/freescale/ls1028a/Kconfig @@ -15,7 +15,7 @@ config SYS_CONFIG_NAME config EMMC_BOOT bool "Support for booting from EMMC" -config SYS_TEXT_BASE +config TEXT_BASE default 0x96000000 if SD_BOOT || EMMC_BOOT default 0x82000000 if TFABOOT default 0x20100000 @@ -51,7 +51,7 @@ config SYS_CONFIG_NAME config EMMC_BOOT bool "Support for booting from EMMC" -config SYS_TEXT_BASE +config TEXT_BASE default 0x96000000 if SD_BOOT || EMMC_BOOT default 0x82000000 if TFABOOT default 0x20100000 diff --git a/board/google/chromebook_coral/Kconfig b/board/google/chromebook_coral/Kconfig index 53c651c3f9..ff656fbf3a 100644 --- a/board/google/chromebook_coral/Kconfig +++ b/board/google/chromebook_coral/Kconfig @@ -12,7 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "chromebook_coral" -config SYS_TEXT_BASE +config TEXT_BASE default 0xffe00000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/google/chromebook_link/Kconfig b/board/google/chromebook_link/Kconfig index dd29ddf694..a6c244f9f7 100644 --- a/board/google/chromebook_link/Kconfig +++ b/board/google/chromebook_link/Kconfig @@ -12,7 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "chromebook_link" -config SYS_TEXT_BASE +config TEXT_BASE default 0xfff00000 if !SUPPORT_SPL default 0x10000000 if SUPPORT_SPL diff --git a/board/google/chromebook_samus/Kconfig b/board/google/chromebook_samus/Kconfig index 9f66d79988..011968aefd 100644 --- a/board/google/chromebook_samus/Kconfig +++ b/board/google/chromebook_samus/Kconfig @@ -13,7 +13,7 @@ config SYS_CONFIG_NAME default "chromebook_samus" if TARGET_CHROMEBOOK_SAMUS default "chromebook_samus" if TARGET_CHROMEBOOK_SAMUS_TPL -config SYS_TEXT_BASE +config TEXT_BASE default 0xffe00000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/google/chromebox_panther/Kconfig b/board/google/chromebox_panther/Kconfig index 875df9d59f..423a9a25f1 100644 --- a/board/google/chromebox_panther/Kconfig +++ b/board/google/chromebox_panther/Kconfig @@ -12,7 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "chromebox_panther" -config SYS_TEXT_BASE +config TEXT_BASE default 0xfff00000 # Panther actually uses haswell, not ivybridge, so this is just a placeholder diff --git a/board/hoperun/hihope-rzg2/hihope-rzg2.c b/board/hoperun/hihope-rzg2/hihope-rzg2.c index c1db387b27..3372290120 100644 --- a/board/hoperun/hihope-rzg2/hihope-rzg2.c +++ b/board/hoperun/hihope-rzg2/hihope-rzg2.c @@ -39,7 +39,7 @@ int board_init(void) u32 i; /* address of boot parameters */ - gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000; + gd->bd->bi_boot_params = CONFIG_TEXT_BASE + 0x50000; /* Configure the HSUSB block */ mstp_clrbits_le32(SMSTPCR7, SMSTPCR7, HSUSB_MSTP704); diff --git a/board/hpe/gxp/Kconfig b/board/hpe/gxp/Kconfig index 5b154a3f6e..75364557bf 100644 --- a/board/hpe/gxp/Kconfig +++ b/board/hpe/gxp/Kconfig @@ -42,5 +42,5 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "gxp" -config SYS_TEXT_BASE +config TEXT_BASE default 0x50000000 diff --git a/board/imgtec/boston/Kconfig b/board/imgtec/boston/Kconfig index ab76a3c626..5537788001 100644 --- a/board/imgtec/boston/Kconfig +++ b/board/imgtec/boston/Kconfig @@ -9,7 +9,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "boston" -config SYS_TEXT_BASE +config TEXT_BASE default 0x9fc00000 if 32BIT default 0xffffffff9fc00000 if 64BIT diff --git a/board/imgtec/ci20/Kconfig b/board/imgtec/ci20/Kconfig index 82bf65d64f..953785fea3 100644 --- a/board/imgtec/ci20/Kconfig +++ b/board/imgtec/ci20/Kconfig @@ -9,7 +9,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "ci20" -config SYS_TEXT_BASE +config TEXT_BASE default 0x80000000 endif diff --git a/board/imgtec/malta/Kconfig b/board/imgtec/malta/Kconfig index 98eb4d16c7..4d124b3a1e 100644 --- a/board/imgtec/malta/Kconfig +++ b/board/imgtec/malta/Kconfig @@ -9,7 +9,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "malta" -config SYS_TEXT_BASE +config TEXT_BASE default 0xbe000000 if 32BIT default 0xffffffffbe000000 if 64BIT diff --git a/board/imgtec/xilfpga/Kconfig b/board/imgtec/xilfpga/Kconfig index b0782780f6..13e2d04176 100644 --- a/board/imgtec/xilfpga/Kconfig +++ b/board/imgtec/xilfpga/Kconfig @@ -9,7 +9,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "imgtec_xilfpga" -config SYS_TEXT_BASE +config TEXT_BASE default 0x80C00000 endif diff --git a/board/intel/bayleybay/Kconfig b/board/intel/bayleybay/Kconfig index a62249936f..97228d6308 100644 --- a/board/intel/bayleybay/Kconfig +++ b/board/intel/bayleybay/Kconfig @@ -12,7 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "bayleybay" -config SYS_TEXT_BASE +config TEXT_BASE default 0xfff00000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/intel/cherryhill/Kconfig b/board/intel/cherryhill/Kconfig index a4fa004bfe..009cd93b6d 100644 --- a/board/intel/cherryhill/Kconfig +++ b/board/intel/cherryhill/Kconfig @@ -12,7 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "cherryhill" -config SYS_TEXT_BASE +config TEXT_BASE default 0xffe00000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/intel/cougarcanyon2/Kconfig b/board/intel/cougarcanyon2/Kconfig index ed764485a5..32407025bc 100644 --- a/board/intel/cougarcanyon2/Kconfig +++ b/board/intel/cougarcanyon2/Kconfig @@ -12,7 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "cougarcanyon2" -config SYS_TEXT_BASE +config TEXT_BASE default 0xffe00000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/intel/crownbay/Kconfig b/board/intel/crownbay/Kconfig index 1eed227c75..eb2290cfaf 100644 --- a/board/intel/crownbay/Kconfig +++ b/board/intel/crownbay/Kconfig @@ -12,7 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "crownbay" -config SYS_TEXT_BASE +config TEXT_BASE default 0xfff00000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/intel/edison/Kconfig b/board/intel/edison/Kconfig index 23b2af4821..5efda4b3a5 100644 --- a/board/intel/edison/Kconfig +++ b/board/intel/edison/Kconfig @@ -15,7 +15,7 @@ config SYS_CONFIG_NAME config SYS_MALLOC_LEN default 0x08000000 -config SYS_TEXT_BASE +config TEXT_BASE default 0x01101000 config ROM_TABLE_ADDR diff --git a/board/intel/galileo/Kconfig b/board/intel/galileo/Kconfig index fb8d94fb5b..4c0451da48 100644 --- a/board/intel/galileo/Kconfig +++ b/board/intel/galileo/Kconfig @@ -12,7 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "galileo" -config SYS_TEXT_BASE +config TEXT_BASE default 0xfff10000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/intel/minnowmax/Kconfig b/board/intel/minnowmax/Kconfig index 82a6ca904e..a03ef86780 100644 --- a/board/intel/minnowmax/Kconfig +++ b/board/intel/minnowmax/Kconfig @@ -12,7 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "minnowmax" -config SYS_TEXT_BASE +config TEXT_BASE default 0xfff00000 config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/intel/slimbootloader/Kconfig b/board/intel/slimbootloader/Kconfig index 8c7e22cc33..015ed51dc8 100644 --- a/board/intel/slimbootloader/Kconfig +++ b/board/intel/slimbootloader/Kconfig @@ -16,7 +16,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "slimbootloader" -config SYS_TEXT_BASE +config TEXT_BASE default 0x00100000 config BOARD_SPECIFIC_OPTIONS diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 3999f48719..c8138dcf30 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -116,7 +116,7 @@ void check_for_uboot_update(void) } } printf("Check update: starting factory image @%08x ...\n", - CONFIG_SYS_TEXT_BASE); + CONFIG_TEXT_BASE); } else if (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE)) { /* * When running in field updated u-boot, make sure that @@ -124,7 +124,7 @@ void check_for_uboot_update(void) */ WARN_ON(bootcount > CONFIG_BOOTCOUNT_BOOTLIMIT); printf("Check update: updated u-boot starting @%08x ...\n", - CONFIG_SYS_TEXT_BASE); + CONFIG_TEXT_BASE); } } #endif diff --git a/board/kontron/sl28/Kconfig b/board/kontron/sl28/Kconfig index abcacc3185..2981e5703e 100644 --- a/board/kontron/sl28/Kconfig +++ b/board/kontron/sl28/Kconfig @@ -12,7 +12,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "kontron_sl28" -config SYS_TEXT_BASE +config TEXT_BASE default 0x96000000 config SL28_SPL_LOADS_ATF_BL31 diff --git a/board/microchip/mpfs_icicle/Kconfig b/board/microchip/mpfs_icicle/Kconfig index 092e411215..e37091373f 100644 --- a/board/microchip/mpfs_icicle/Kconfig +++ b/board/microchip/mpfs_icicle/Kconfig @@ -12,7 +12,7 @@ config SYS_CPU config SYS_CONFIG_NAME default "microchip_mpfs_icicle" -config SYS_TEXT_BASE +config TEXT_BASE default 0x80000000 if !RISCV_SMODE default 0x80200000 if RISCV_SMODE diff --git a/board/microchip/pic32mzda/Kconfig b/board/microchip/pic32mzda/Kconfig index 4f08e98b97..0c09766029 100644 --- a/board/microchip/pic32mzda/Kconfig +++ b/board/microchip/pic32mzda/Kconfig @@ -10,7 +10,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "pic32mzdask" -config SYS_TEXT_BASE +config TEXT_BASE default 0x9d004000 endif diff --git a/board/nokia/rx51/lowlevel_init.S b/board/nokia/rx51/lowlevel_init.S index 4b66e0a861..930052ea60 100644 --- a/board/nokia/rx51/lowlevel_init.S +++ b/board/nokia/rx51/lowlevel_init.S @@ -7,7 +7,7 @@ #include <config.h> kernoffs: /* offset of kernel image from this address */ - .word . - CONFIG_SYS_TEXT_BASE - KERNEL_OFFSET + .word . - CONFIG_TEXT_BASE - KERNEL_OFFSET kernaddr: /* address of kernel after copying */ .word KERNEL_ADDRESS @@ -37,13 +37,13 @@ save_boot_params: * * Nokia X-Loader is loading secondary image to address 0x80400000. * NOLO is loading boot image to random place, so it doesn't really - * matter what is set in CONFIG_SYS_TEXT_BASE. We have to detect + * matter what is set in CONFIG_TEXT_BASE. We have to detect * KERNEL_OFFSET from the current execution address and copy it to * absolute address KERNEL_ADDRESS. * * Note that U-Boot has to be compiled with CONFIG_POSITION_INDEPENDENT * because it is loaded at random address and not to the fixed address - * (CONFIG_SYS_TEXT_BASE). + * (CONFIG_TEXT_BASE). */ /* r0 - start of kernel before */ diff --git a/board/openpiton/riscv64/Kconfig b/board/openpiton/riscv64/Kconfig index 193c890046..eb0db8a64c 100644 --- a/board/openpiton/riscv64/Kconfig +++ b/board/openpiton/riscv64/Kconfig @@ -12,7 +12,7 @@ config SYS_CPU config SYS_CONFIG_NAME default "openpiton-riscv64" -config SYS_TEXT_BASE +config TEXT_BASE default 0x81000000 if SPL default 0x80000000 if !RISCV_SMODE default 0x81000000 if RISCV_SMODE diff --git a/board/qca/ap121/Kconfig b/board/qca/ap121/Kconfig index 4fd6a7167a..bf24d898a5 100644 --- a/board/qca/ap121/Kconfig +++ b/board/qca/ap121/Kconfig @@ -9,7 +9,7 @@ config SYS_BOARD config SYS_CONFIG_NAME default "ap121" -config SYS_TEXT_BASE +config TEXT_BASE default 0x9f000000 config SYS_DCACHE_SIZE diff --git a/board/qca/ap143/Kconfig b/board/qca/ap143/Kconfig index 74c632a03e..d2a0985f6f 100644 --- a/board/qca/ap143/Kconfig +++ b/board/qca/ap143/Kconfig @@ -9,7 +9,7 @@ config SYS_BOARD config SYS_CONFIG_NAME default "ap143" -config SYS_TEXT_BASE +config TEXT_BASE default 0x9f000000 config SYS_DCACHE_SIZE diff --git a/board/qca/ap152/Kconfig b/board/qca/ap152/Kconfig index f6ad498e85..fe28b1ff52 100644 --- a/board/qca/ap152/Kconfig +++ b/board/qca/ap152/Kconfig @@ -9,7 +9,7 @@ config SYS_BOARD config SYS_CONFIG_NAME default "ap152" -config SYS_TEXT_BASE +config TEXT_BASE default 0x9f000000 endif diff --git a/board/qualcomm/dragonboard820c/head.S b/board/qualcomm/dragonboard820c/head.S index 29be61a90d..b052a858fd 100644 --- a/board/qualcomm/dragonboard820c/head.S +++ b/board/qualcomm/dragonboard820c/head.S @@ -20,7 +20,7 @@ _arm64_header: b _start .word 0 - .quad CONFIG_SYS_TEXT_BASE-PHYS_SDRAM_1 /* Image load offset, LE */ + .quad CONFIG_TEXT_BASE-PHYS_SDRAM_1 /* Image load offset, LE */ .quad 0 /* Effective size of kernel image, little-endian */ .quad 0 /* kernel flags, little-endian */ .quad 0 /* reserved */ diff --git a/board/renesas/falcon/falcon.c b/board/renesas/falcon/falcon.c index 3e74384716..b0cb4e747b 100644 --- a/board/renesas/falcon/falcon.c +++ b/board/renesas/falcon/falcon.c @@ -84,7 +84,7 @@ int board_early_init_f(void) int board_init(void) { /* address of boot parameters */ - gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000; + gd->bd->bi_boot_params = CONFIG_TEXT_BASE + 0x50000; init_gic_v3(); diff --git a/board/siemens/capricorn/uboot-container.cfg b/board/siemens/capricorn/uboot-container.cfg index b53896f235..b481c98f92 100644 --- a/board/siemens/capricorn/uboot-container.cfg +++ b/board/siemens/capricorn/uboot-container.cfg @@ -9,4 +9,4 @@ BOOT_FROM SD 0x400 SOC_TYPE IMX8QX CONTAINER IMAGE A35 bl31.bin 0x80000000 -IMAGE A35 u-boot.bin CONFIG_SYS_TEXT_BASE +IMAGE A35 u-boot.bin CONFIG_TEXT_BASE diff --git a/board/sifive/unleashed/Kconfig b/board/sifive/unleashed/Kconfig index b3b4342a1f..5d842c36cf 100644 --- a/board/sifive/unleashed/Kconfig +++ b/board/sifive/unleashed/Kconfig @@ -12,7 +12,7 @@ config SYS_CPU config SYS_CONFIG_NAME default "sifive-unleashed" -config SYS_TEXT_BASE +config TEXT_BASE default 0x80200000 if SPL default 0x80000000 if !RISCV_SMODE default 0x80200000 if RISCV_SMODE diff --git a/board/sifive/unmatched/Kconfig b/board/sifive/unmatched/Kconfig index fe213fd504..bc1f33bde3 100644 --- a/board/sifive/unmatched/Kconfig +++ b/board/sifive/unmatched/Kconfig @@ -12,7 +12,7 @@ config SYS_CPU config SYS_CONFIG_NAME default "sifive-unmatched" -config SYS_TEXT_BASE +config TEXT_BASE default 0x80200000 if SPL default 0x80000000 if !RISCV_SMODE default 0x80200000 if RISCV_SMODE diff --git a/board/silinux/ek874/ek874.c b/board/silinux/ek874/ek874.c index 1e948489f3..6dc804a0c0 100644 --- a/board/silinux/ek874/ek874.c +++ b/board/silinux/ek874/ek874.c @@ -19,7 +19,7 @@ DECLARE_GLOBAL_DATA_PTR; int board_init(void) { /* address of boot parameters */ - gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x50000; + gd->bd->bi_boot_params = CONFIG_TEXT_BASE + 0x50000; return 0; } diff --git a/board/sipeed/maix/Kconfig b/board/sipeed/maix/Kconfig index b1d7a7ad93..2d212ec5a3 100644 --- a/board/sipeed/maix/Kconfig +++ b/board/sipeed/maix/Kconfig @@ -15,7 +15,7 @@ config SYS_CPU config SYS_CONFIG_NAME default "sipeed-maix" -config SYS_TEXT_BASE +config TEXT_BASE default 0x80000000 config DEFAULT_DEVICE_TREE diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index f9e1bc6316..33b72614d7 100644 --- a/board/socrates/socrates.c +++ b/board/socrates/socrates.c @@ -223,7 +223,7 @@ void *board_fdt_blob_setup(int *err) void *fw_dtb; *err = 0; - fw_dtb = (void *)(CONFIG_SYS_TEXT_BASE - CONFIG_ENV_SECT_SIZE); + fw_dtb = (void *)(CONFIG_TEXT_BASE - CONFIG_ENV_SECT_SIZE); if (fdt_magic(fw_dtb) != FDT_MAGIC) { printf("DTB is not passed via %x\n", (u32)fw_dtb); *err = -ENXIO; diff --git a/board/synopsys/axs10x/headerize-axs.py b/board/synopsys/axs10x/headerize-axs.py index fa6aaf350c..3275218dc2 100644 --- a/board/synopsys/axs10x/headerize-axs.py +++ b/board/synopsys/axs10x/headerize-axs.py @@ -65,7 +65,7 @@ def main(): arc_id = 0x53 # initial header values: place where preloader will store u-boot binary, - # should be equal to CONFIG_SYS_TEXT_BASE + # should be equal to CONFIG_TEXT_BASE image_copy_adr = 0x81000000 # initial constant header values, do not change these values diff --git a/board/synopsys/hsdk/headerize-hsdk.py b/board/synopsys/hsdk/headerize-hsdk.py index 7b047cf4a3..327c93cdba 100644 --- a/board/synopsys/hsdk/headerize-hsdk.py +++ b/board/synopsys/hsdk/headerize-hsdk.py @@ -55,7 +55,7 @@ def main(): uboot_scrypt_file = "u-boot-update.txt" # initial header values: place where preloader will store u-boot binary, - # should be equal to CONFIG_SYS_TEXT_BASE + # should be equal to CONFIG_TEXT_BASE image_copy_adr = 0x81000000 # initial constant header values, do not change these values diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c index 5ba3aa35a9..51e8de4b89 100644 --- a/board/ti/ks2_evm/board.c +++ b/board/ti/ks2_evm/board.c @@ -66,7 +66,7 @@ int dram_init(void) struct legacy_img_hdr *spl_get_load_buffer(ssize_t offset, size_t size) { - return (struct legacy_img_hdr *)(CONFIG_SYS_TEXT_BASE); + return (struct legacy_img_hdr *)(CONFIG_TEXT_BASE); } int board_init(void) diff --git a/board/tplink/wdr4300/Kconfig b/board/tplink/wdr4300/Kconfig index 67a0228773..bf0bd467a5 100644 --- a/board/tplink/wdr4300/Kconfig +++ b/board/tplink/wdr4300/Kconfig @@ -12,7 +12,7 @@ config SYS_BOARD config SYS_CONFIG_NAME default "tplink_wdr4300" -config SYS_TEXT_BASE +config TEXT_BASE default 0xa1000000 config SYS_DCACHE_SIZE diff --git a/board/tq/tqma6/Kconfig b/board/tq/tqma6/Kconfig index cb1b8749ce..1cd90718f4 100644 --- a/board/tq/tqma6/Kconfig +++ b/board/tq/tqma6/Kconfig @@ -84,7 +84,7 @@ config WRU4 endchoice -config SYS_TEXT_BASE +config TEXT_BASE default 0x2fc00000 if TQMA6S default 0x4fc00000 if TQMA6Q || TQMA6DL |