diff options
1197 files changed, 3677 insertions, 1797 deletions
@@ -274,7 +274,7 @@ config HAS_CUSTOM_SYS_INIT_SP_ADDR config CUSTOM_SYS_INIT_SP_ADDR hex "Static location for the initial stack pointer" depends on HAS_CUSTOM_SYS_INIT_SP_ADDR - default SYS_TEXT_BASE if TFABOOT + default TEXT_BASE if TFABOOT config SYS_MALLOC_F bool "Enable malloc() pool before relocation" @@ -1028,7 +1028,7 @@ LDFLAGS_u-boot += -z notext $(call ld-option,--apply-dynamic-relocs) LDFLAGS_u-boot += --build-id=none ifeq ($(CONFIG_ARC)$(CONFIG_NIOS2)$(CONFIG_X86)$(CONFIG_XTENSA),) -LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE) +LDFLAGS_u-boot += -Ttext $(CONFIG_TEXT_BASE) endif # insure the checker run with the right endianness @@ -1311,7 +1311,7 @@ shell_cmd = { $(call echo-cmd,$(1)) $(cmd_$(1)); } quiet_cmd_objcopy_uboot = OBJCOPY $@ ifdef cmd_static_rela -cmd_objcopy_uboot = $(cmd_objcopy) && $(call shell_cmd,static_rela,$<,$@,$(CONFIG_SYS_TEXT_BASE)) || { rm -f $@; false; } +cmd_objcopy_uboot = $(cmd_objcopy) && $(call shell_cmd,static_rela,$<,$@,$(CONFIG_TEXT_BASE)) || { rm -f $@; false; } else cmd_objcopy_uboot = $(cmd_objcopy) endif @@ -1365,7 +1365,7 @@ u-boot.ldr.hex u-boot.ldr.srec: u-boot.ldr FORCE # from the SPL U-Boot version. # ifndef CONFIG_SYS_UBOOT_START -CONFIG_SYS_UBOOT_START := $(CONFIG_SYS_TEXT_BASE) +CONFIG_SYS_UBOOT_START := $(CONFIG_TEXT_BASE) endif # Boards with more complex image requirements can provide an .its source file @@ -1390,7 +1390,7 @@ endif ifdef CONFIG_SPL_LOAD_FIT MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ - -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -p $(CONFIG_FIT_EXTERNAL_OFFSET) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ $(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(DEVICE_TREE))) \ @@ -1398,10 +1398,10 @@ MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ $(patsubst %,-b arch/$(ARCH)/dts/%.dtbo,$(subst ",,$(CONFIG_OF_OVERLAY_LIST))) else MKIMAGEFLAGS_u-boot.img = -A $(ARCH) -T firmware -C none -O u-boot \ - -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" MKIMAGEFLAGS_u-boot-ivt.img = -A $(ARCH) -T firmware_ivt -C none -O u-boot \ - -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" u-boot-ivt.img: MKIMAGEOUTPUT = u-boot-ivt.img.log endif @@ -1420,10 +1420,10 @@ KWD_CONFIG_FILE = $(shell \ fi) MKIMAGEFLAGS_u-boot.kwb = -n $(KWD_CONFIG_FILE) \ - -T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) + -T kwbimage -a $(CONFIG_TEXT_BASE) -e $(CONFIG_TEXT_BASE) MKIMAGEFLAGS_u-boot-spl.kwb = -n $(KWD_CONFIG_FILE) \ - -T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) \ + -T kwbimage -a $(CONFIG_TEXT_BASE) -e $(CONFIG_TEXT_BASE) \ $(if $(KEYDIR),-k $(KEYDIR)) MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \ @@ -1432,7 +1432,7 @@ MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \ UBOOT_BIN := u-boot.bin MKIMAGEFLAGS_u-boot-lzma.img = -A $(ARCH) -T standalone -C lzma -O u-boot \ - -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" u-boot.bin.lzma: u-boot.bin FORCE @@ -1540,7 +1540,7 @@ u-boot.uim: u-boot.bin FORCE u-boot-with-spl.imx u-boot-with-nand-spl.imx: SPL $(if $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@ -MKIMAGEFLAGS_u-boot.ubl = -n $(UBL_CONFIG) -T ublimage -e $(CONFIG_SYS_TEXT_BASE) +MKIMAGEFLAGS_u-boot.ubl = -n $(UBL_CONFIG) -T ublimage -e $(CONFIG_TEXT_BASE) u-boot.ubl: u-boot-with-spl.bin FORCE $(call if_changed,mkimage) @@ -1684,8 +1684,8 @@ u-boot-img-spl-at-end.bin: u-boot.img spl/u-boot-spl.bin FORCE quiet_cmd_u-boot-elf ?= LD $@ cmd_u-boot-elf ?= $(LD) u-boot-elf.o -o $@ \ $(if $(CONFIG_SYS_BIG_ENDIAN),-EB,-EL) \ - -T u-boot-elf.lds --defsym=$(CONFIG_PLATFORM_ELFENTRY)=$(CONFIG_SYS_TEXT_BASE) \ - -Ttext=$(CONFIG_SYS_TEXT_BASE) + -T u-boot-elf.lds --defsym=$(CONFIG_PLATFORM_ELFENTRY)=$(CONFIG_TEXT_BASE) \ + -Ttext=$(CONFIG_TEXT_BASE) u-boot.elf: u-boot.bin u-boot-elf.lds $(Q)$(OBJCOPY) -I binary $(PLATFORM_ELFFLAGS) $< u-boot-elf.o $(call if_changed,u-boot-elf) @@ -1706,7 +1706,7 @@ u-boot-mtk.bin: u-boot-with-spl.bin $(call if_changed,copy) else MKIMAGEFLAGS_u-boot-mtk.bin = -T mtk_image \ - -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) \ + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_TEXT_BASE) \ -n "$(patsubst "%",%,$(CONFIG_MTK_BROM_HEADER_INFO))" u-boot-mtk.bin: u-boot.bin FORCE diff --git a/arch/arc/cpu/u-boot.lds b/arch/arc/cpu/u-boot.lds index 9f2973da659..6a52ce461e5 100644 --- a/arch/arc/cpu/u-boot.lds +++ b/arch/arc/cpu/u-boot.lds @@ -10,7 +10,7 @@ OUTPUT_ARCH(arc) ENTRY(_start) SECTIONS { - . = CONFIG_SYS_TEXT_BASE; + . = CONFIG_TEXT_BASE; __image_copy_start = .; . = ALIGN(1024); __ivt_start = .; diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8bc9aaf010b..710f171f87e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -93,7 +93,7 @@ config LNX_KRNL_IMG_TEXT_OFFSET_BASE depends on LINUX_KERNEL_IMAGE_HEADER hex help - The value subtracted from CONFIG_SYS_TEXT_BASE to calculate the + The value subtracted from CONFIG_TEXT_BASE to calculate the TEXT_OFFSET value written to the Linux kernel image header. config GICV2 diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S index 14029246844..5a1536539dc 100644 --- a/arch/arm/cpu/arm1176/start.S +++ b/arch/arm/cpu/arm1176/start.S @@ -88,7 +88,7 @@ cpu_init_crit: /* Prepare to disable the MMU */ adr r2, mmu_disable_phys - sub r2, r2, #(CONFIG_SYS_PHY_UBOOT_BASE - CONFIG_SYS_TEXT_BASE) + sub r2, r2, #(CONFIG_SYS_PHY_UBOOT_BASE - CONFIG_TEXT_BASE) b mmu_disable .align 5 diff --git a/arch/arm/cpu/arm926ejs/mxs/Makefile b/arch/arm/cpu/arm926ejs/mxs/Makefile index f60e61e4343..1638ef8fd8d 100644 --- a/arch/arm/cpu/arm926ejs/mxs/Makefile +++ b/arch/arm/cpu/arm926ejs/mxs/Makefile @@ -60,14 +60,14 @@ spl/u-boot-spl.ivt: spl/u-boot-spl.bin u-boot.ivt: u-boot.bin $(call if_changed,mkalign_mxs) - $(call if_changed,mkivt_mxs,$(CONFIG_SYS_TEXT_BASE),\ + $(call if_changed,mkivt_mxs,$(CONFIG_TEXT_BASE),\ 0x40001000,0x40001040) spl/u-boot-spl.csf: spl/u-boot-spl.ivt spl/u-boot-spl.bin board/$(VENDOR)/$(BOARD)/sign/u-boot-spl.csf $(call if_changed,mkcsfreq_mxs,$(CONFIG_SPL_TEXT_BASE),0x8000) u-boot.csf: u-boot.ivt u-boot.bin board/$(VENDOR)/$(BOARD)/sign/u-boot.csf - $(call if_changed,mkcsfreq_mxs,$(CONFIG_SYS_TEXT_BASE),0x40001000) + $(call if_changed,mkcsfreq_mxs,$(CONFIG_TEXT_BASE),0x40001000) %.sig: %.csf $(call if_changed,mkcst_mxs) diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index e63a905eda1..83f9882d0b3 100644 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c @@ -146,9 +146,9 @@ void ft_cpu_setup(void *blob, struct bd_info *bd) * Since second uboot binary has a head, that space need to be * reserved either(assuming its size is less than 0x1000). */ - off = fdt_add_mem_rsv(blob, CONFIG_SYS_TEXT_BASE - UBOOT_HEAD_LEN, - CONFIG_SYS_MONITOR_LEN + CONFIG_SYS_SPL_MALLOC_SIZE + - UBOOT_HEAD_LEN); + off = fdt_add_mem_rsv(blob, CONFIG_TEXT_BASE - UBOOT_HEAD_LEN, + CONFIG_SYS_MONITOR_LEN + + CONFIG_SYS_SPL_MALLOC_SIZE + UBOOT_HEAD_LEN); if (off < 0) printf("Failed to reserve memory for SD boot deep sleep: %s\n", fdt_strerror(off)); diff --git a/arch/arm/cpu/armv8/linux-kernel-image-header-vars.h b/arch/arm/cpu/armv8/linux-kernel-image-header-vars.h index b4220e4936f..b6394aee165 100644 --- a/arch/arm/cpu/armv8/linux-kernel-image-header-vars.h +++ b/arch/arm/cpu/armv8/linux-kernel-image-header-vars.h @@ -69,7 +69,7 @@ (__HEAD_FLAG_PAGE_SIZE << 1) | \ (__HEAD_FLAG_PHYS_BASE << 3)) -#define TEXT_OFFSET (CONFIG_SYS_TEXT_BASE - \ +#define TEXT_OFFSET (CONFIG_TEXT_BASE - \ CONFIG_LNX_KRNL_IMG_TEXT_OFFSET_BASE) /* diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 28f0df13f0d..f3ea8585770 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -35,7 +35,7 @@ _start: .globl _TEXT_BASE _TEXT_BASE: - .quad CONFIG_SYS_TEXT_BASE + .quad CONFIG_TEXT_BASE /* * These are defined in the linker script. diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi index 2dcb3c2a58f..08e7231793c 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi @@ -36,7 +36,7 @@ os = "u-boot"; arch = "arm"; compression = "none"; - load = <CONFIG_SYS_TEXT_BASE>; + load = <CONFIG_TEXT_BASE>; u-boot-nodtb { }; diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi index f792b421e89..a5e30f79948 100644 --- a/arch/arm/dts/imx8mm-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-u-boot.dtsi @@ -90,7 +90,7 @@ arch = "arm64"; compression = "none"; description = "U-Boot (64-bit)"; - load = <CONFIG_SYS_TEXT_BASE>; + load = <CONFIG_TEXT_BASE>; type = "standalone"; uboot-blob { diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi index 327d4070fc8..95f45ad2522 100644 --- a/arch/arm/dts/imx8mn-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-u-boot.dtsi @@ -152,7 +152,7 @@ arch = "arm64"; compression = "none"; description = "U-Boot (64-bit)"; - load = <CONFIG_SYS_TEXT_BASE>; + load = <CONFIG_TEXT_BASE>; type = "standalone"; uboot-blob { diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi index adb24cccc3b..b5d640df7e1 100644 --- a/arch/arm/dts/imx8mp-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -113,7 +113,7 @@ type = "standalone"; arch = "arm64"; compression = "none"; - load = <CONFIG_SYS_TEXT_BASE>; + load = <CONFIG_TEXT_BASE>; uboot_blob: blob-ext { filename = "u-boot-nodtb.bin"; diff --git a/arch/arm/dts/imx8mq-cm-u-boot.dtsi b/arch/arm/dts/imx8mq-cm-u-boot.dtsi index cb4e36c387d..354f911a8af 100644 --- a/arch/arm/dts/imx8mq-cm-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-cm-u-boot.dtsi @@ -77,7 +77,7 @@ type = "standalone"; arch = "arm64"; compression = "none"; - load = <CONFIG_SYS_TEXT_BASE>; + load = <CONFIG_TEXT_BASE>; uboot_blob: blob-ext { filename = "u-boot-nodtb.bin"; diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi index e8b5f83706e..c69c6cc58b9 100644 --- a/arch/arm/dts/imx8mq-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-u-boot.dtsi @@ -105,7 +105,7 @@ arch = "arm64"; compression = "none"; description = "U-Boot (64-bit)"; - load = <CONFIG_SYS_TEXT_BASE>; + load = <CONFIG_TEXT_BASE>; type = "standalone"; uboot-blob { diff --git a/arch/arm/dts/rockchip-optee.dtsi b/arch/arm/dts/rockchip-optee.dtsi index cde9b81b26b..328ba908450 100644 --- a/arch/arm/dts/rockchip-optee.dtsi +++ b/arch/arm/dts/rockchip-optee.dtsi @@ -21,7 +21,7 @@ os = "U-Boot"; arch = "arm"; compression = "none"; - load = <CONFIG_SYS_TEXT_BASE>; + load = <CONFIG_TEXT_BASE>; u-boot-nodtb { }; diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index 0f573e6d7ae..2028d5b6a90 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -47,7 +47,7 @@ os = "u-boot"; arch = "arm64"; compression = "none"; - load = <CONFIG_SYS_TEXT_BASE>; + load = <CONFIG_TEXT_BASE>; u-boot-nodtb { }; diff --git a/arch/arm/dts/tegra-u-boot.dtsi b/arch/arm/dts/tegra-u-boot.dtsi index fe19619919e..b3d0dec7757 100644 --- a/arch/arm/dts/tegra-u-boot.dtsi +++ b/arch/arm/dts/tegra-u-boot.dtsi @@ -1,7 +1,7 @@ #include <config.h> #ifdef CONFIG_SPL_TEXT_BASE -#define U_BOOT_OFFSET (CONFIG_SYS_TEXT_BASE - CONFIG_SPL_TEXT_BASE) +#define U_BOOT_OFFSET (CONFIG_TEXT_BASE - CONFIG_SPL_TEXT_BASE) #else #define U_BOOT_OFFSET 0 #endif diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h index 20ee863ac7e..17afd1b29e4 100644 --- a/arch/arm/include/asm/arch-mxs/sys_proto.h +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h @@ -85,7 +85,7 @@ static const struct mxs_pair mxs_boot_modes[] = { #define MXS_BM_SDMMC1_3V3 0x0a #define MXS_BM_SDMMC1_1V8 0x1a -#define MXS_SPL_DATA ((struct mxs_spl_data *)(CONFIG_SYS_TEXT_BASE - 0x200)) +#define MXS_SPL_DATA ((struct mxs_spl_data *)(CONFIG_TEXT_BASE - 0x200)) struct mxs_spl_data { uint8_t boot_mode_idx; diff --git a/arch/arm/include/asm/arch-sunxi/boot0.h b/arch/arm/include/asm/arch-sunxi/boot0.h index e8e8e38f055..46b7e073b59 100644 --- a/arch/arm/include/asm/arch-sunxi/boot0.h +++ b/arch/arm/include/asm/arch-sunxi/boot0.h @@ -47,7 +47,7 @@ #ifdef CONFIG_SPL_BUILD .word CONFIG_SPL_TEXT_BASE #else - .word CONFIG_SYS_TEXT_BASE + .word CONFIG_TEXT_BASE #endif .word fel_stash - . #else diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index fe6b4472b93..6d566dca5c8 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -144,7 +144,7 @@ ENTRY(_main) adr r0, _main ldr r1, _start_ofs add r0, r1 - ldr r1, =CONFIG_SYS_TEXT_BASE + ldr r1, =CONFIG_TEXT_BASE sub r1, r0 add lr, r1 #endif diff --git a/arch/arm/lib/relocate_64.S b/arch/arm/lib/relocate_64.S index 72e91f2704b..495a5f03ba7 100644 --- a/arch/arm/lib/relocate_64.S +++ b/arch/arm/lib/relocate_64.S @@ -37,7 +37,7 @@ ENTRY(relocate_code) * correctly apply relocations, we need to know the linked value. * * Linked &__image_copy_start, which we know was at - * CONFIG_SYS_TEXT_BASE, which is stored in _TEXT_BASE, as a non- + * CONFIG_TEXT_BASE, which is stored in _TEXT_BASE, as a non- * relocated value, since it isn't a symbol reference. */ ldr x1, _TEXT_BASE /* x1 <- Linked &__image_copy_start */ diff --git a/arch/arm/mach-apple/Kconfig b/arch/arm/mach-apple/Kconfig index 75ee21e0f4c..294690ec0e8 100644 --- a/arch/arm/mach-apple/Kconfig +++ b/arch/arm/mach-apple/Kconfig @@ -1,6 +1,6 @@ if ARCH_APPLE -config SYS_TEXT_BASE +config TEXT_BASE default 0x00000000 config SYS_CONFIG_NAME @@ -16,6 +16,6 @@ config SYS_MALLOC_F_LEN default 0x4000 config LNX_KRNL_IMG_TEXT_OFFSET_BASE - default SYS_TEXT_BASE + default TEXT_BASE endif diff --git a/arch/arm/mach-aspeed/Kconfig b/arch/arm/mach-aspeed/Kconfig index 9a725f195a3..1e7dc10e170 100644 --- a/arch/arm/mach-aspeed/Kconfig +++ b/arch/arm/mach-aspeed/Kconfig @@ -6,7 +6,7 @@ config SYS_ARCH config SYS_SOC default "aspeed" -config SYS_TEXT_BASE +config TEXT_BASE default 0x00000000 choice diff --git a/arch/arm/mach-at91/arm920t/lowlevel_init.S b/arch/arm/mach-at91/arm920t/lowlevel_init.S index 5e3cce03b7e..57e51c81059 100644 --- a/arch/arm/mach-at91/arm920t/lowlevel_init.S +++ b/arch/arm/mach-at91/arm920t/lowlevel_init.S @@ -22,9 +22,9 @@ _MTEXT_BASE: #undef START_FROM_MEM #ifdef START_FROM_MEM - .word CONFIG_SYS_TEXT_BASE-PHYS_FLASH_1 + .word CONFIG_TEXT_BASE-PHYS_FLASH_1 #else - .word CONFIG_SYS_TEXT_BASE + .word CONFIG_TEXT_BASE #endif .globl lowlevel_init diff --git a/arch/arm/mach-at91/arm926ejs/lowlevel_init.S b/arch/arm/mach-at91/arm926ejs/lowlevel_init.S index 994f42eb4a2..c51eee2f17e 100644 --- a/arch/arm/mach-at91/arm926ejs/lowlevel_init.S +++ b/arch/arm/mach-at91/arm926ejs/lowlevel_init.S @@ -32,7 +32,7 @@ lowlevel_init: POS1: adr r5, POS1 /* r5 = POS1 run time */ ldr r0, =POS1 /* r0 = POS1 compile */ - sub r5, r5, r0 /* r0 = CONFIG_SYS_TEXT_BASE-1 */ + sub r5, r5, r0 /* r0 = CONFIG_TEXT_BASE-1 */ /* memory control configuration 1 */ ldr r0, =SMRDATA diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c index 93fea9c749a..f5185390571 100644 --- a/arch/arm/mach-exynos/spl_boot.c +++ b/arch/arm/mach-exynos/spl_boot.c @@ -251,7 +251,7 @@ void copy_uboot_to_ram(void) #ifdef CONFIG_SPI_BOOTING case BOOT_MODE_SERIAL: /* Customised function to copy u-boot from SF */ - exynos_spi_copy(param->uboot_size, CONFIG_SYS_TEXT_BASE); + exynos_spi_copy(param->uboot_size, CONFIG_TEXT_BASE); break; #endif case BOOT_MODE_SD: @@ -267,7 +267,7 @@ void copy_uboot_to_ram(void) copy_bl2_from_emmc = get_irom_func(EMMC44_INDEX); end_bootop_from_emmc = get_irom_func(EMMC44_END_INDEX); - copy_bl2_from_emmc(BL2_SIZE_BLOC_COUNT, CONFIG_SYS_TEXT_BASE); + copy_bl2_from_emmc(BL2_SIZE_BLOC_COUNT, CONFIG_TEXT_BASE); end_bootop_from_emmc(); break; #endif @@ -279,7 +279,7 @@ void copy_uboot_to_ram(void) */ is_cr_z_set = config_branch_prediction(0); usb_copy = get_irom_func(USB_INDEX); - usb_copy(0, (u32 *)CONFIG_SYS_TEXT_BASE); + usb_copy(0, (u32 *)CONFIG_TEXT_BASE); config_branch_prediction(is_cr_z_set); break; #endif @@ -288,7 +288,7 @@ void copy_uboot_to_ram(void) } if (copy_bl2) - copy_bl2(offset, size, CONFIG_SYS_TEXT_BASE); + copy_bl2(offset, size, CONFIG_TEXT_BASE); } void memzero(void *s, size_t n) @@ -329,7 +329,7 @@ void board_init_f(unsigned long bootflag) copy_uboot_to_ram(); /* Jump to U-Boot image */ - uboot = (void *)CONFIG_SYS_TEXT_BASE; + uboot = (void *)CONFIG_TEXT_BASE; (*uboot)(); /* Never returns Here */ } diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 80c497e6d81..61b4f4f8cd3 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -126,7 +126,7 @@ DEPFILE_EXISTS := 0 endif MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \ - -T $(IMAGE_TYPE) -e $(CONFIG_SYS_TEXT_BASE) + -T $(IMAGE_TYPE) -e $(CONFIG_TEXT_BASE) u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE @@ -134,7 +134,7 @@ u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE ifeq ($(CONFIG_MULTI_DTB_FIT),y) MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \ - -T $(IMAGE_TYPE) -e $(CONFIG_SYS_TEXT_BASE) + -T $(IMAGE_TYPE) -e $(CONFIG_TEXT_BASE) u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log u-boot-dtb.imx: u-boot-fit-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE @@ -143,7 +143,7 @@ ifeq ($(DEPFILE_EXISTS),0) endif else ifeq ($(CONFIG_OF_SEPARATE),y) MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \ - -T $(IMAGE_TYPE) -e $(CONFIG_SYS_TEXT_BASE) + -T $(IMAGE_TYPE) -e $(CONFIG_TEXT_BASE) u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log u-boot-dtb.imx: u-boot-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE @@ -207,8 +207,8 @@ SPL: MKIMAGEOUTPUT = SPL.log SPL: spl/u-boot-spl.bin spl/u-boot-spl.cfgout $(PLUGIN).bin FORCE $(call if_changed,mkimage) -MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \ - -e $(CONFIG_SYS_TEXT_BASE) -C none -T firmware +MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_TEXT_BASE) \ + -e $(CONFIG_TEXT_BASE) -C none -T firmware u-boot.uim: u-boot.bin FORCE $(call if_changed,mkimage) diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index 936c8f865aa..be1f4edded1 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -313,8 +313,8 @@ phys_size_t get_effective_memsize(void) /* Find the memory region runs the U-Boot */ if (start >= phys_sdram_1_start && start <= end1 && - (start <= CONFIG_SYS_TEXT_BASE && - end >= CONFIG_SYS_TEXT_BASE)) { + (start <= CONFIG_TEXT_BASE && + end >= CONFIG_TEXT_BASE)) { if ((end + 1) <= ((sc_faddr_t)phys_sdram_1_start + phys_sdram_1_size)) diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig index 4f9f51c9b05..3c388183bc2 100644 --- a/arch/arm/mach-imx/mx7/Kconfig +++ b/arch/arm/mach-imx/mx7/Kconfig @@ -16,7 +16,7 @@ config MX7D select ROM_UNIFIED_SECTIONS imply CMD_FUSE -config SYS_TEXT_BASE +config TEXT_BASE default 0x87800000 config SPL_TEXT_BASE diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index ef00969a5e0..6b8f4115c4e 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -341,7 +341,7 @@ void *board_spl_fit_buffer_addr(ulong fit_size, int sectors, int bl_len) if (bl_len < 512) bl_len = 512; - return (void *)((CONFIG_SYS_TEXT_BASE - fit_size - bl_len - + return (void *)((CONFIG_TEXT_BASE - fit_size - bl_len - align_len) & ~align_len); } #endif diff --git a/arch/arm/mach-ipq40xx/Kconfig b/arch/arm/mach-ipq40xx/Kconfig index 4eef80e9352..f9db55c42aa 100644 --- a/arch/arm/mach-ipq40xx/Kconfig +++ b/arch/arm/mach-ipq40xx/Kconfig @@ -6,7 +6,7 @@ config SYS_SOC config SYS_MALLOC_F_LEN default 0x2000 -config SYS_TEXT_BASE +config TEXT_BASE default 0x87300000 config NR_DRAM_BANKS diff --git a/arch/arm/mach-k3/config_secure.mk b/arch/arm/mach-k3/config_secure.mk index 6d63c57665a..9cc1f9eb24f 100644 --- a/arch/arm/mach-k3/config_secure.mk +++ b/arch/arm/mach-k3/config_secure.mk @@ -30,7 +30,7 @@ tispl.bin_HS: $(obj)/u-boot-spl-nodtb.bin_HS $(patsubst %,$(obj)/dts/%.dtb_HS,$( $(call if_changed,mkfitimage) MKIMAGEFLAGS_u-boot.img_HS = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ - -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ $(patsubst %,-b arch/$(ARCH)/dts/%.dtb_HS,$(subst ",,$(CONFIG_OF_LIST))) diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c index aea640b5700..c4c5c371100 100644 --- a/arch/arm/mach-k3/sysfw-loader.c +++ b/arch/arm/mach-k3/sysfw-loader.c @@ -91,7 +91,7 @@ static void *sysfw_load_address; struct legacy_img_hdr *spl_get_load_buffer(ssize_t offset, size_t size) { if (sysfw_loaded) - return (struct legacy_img_hdr *)(CONFIG_SYS_TEXT_BASE + offset); + return (struct legacy_img_hdr *)(CONFIG_TEXT_BASE + offset); else if (sysfw_load_address) return sysfw_load_address; else diff --git a/arch/arm/mach-keystone/config.mk b/arch/arm/mach-keystone/config.mk index 5a16891f234..8eccbdb3018 100644 --- a/arch/arm/mach-keystone/config.mk +++ b/arch/arm/mach-keystone/config.mk @@ -27,7 +27,7 @@ u-boot-spi.gph: spl/u-boot-spl.gph u-boot.img FORCE ifndef CONFIG_SPL_BUILD MKIMAGEFLAGS_MLO = -A $(ARCH) -T gpimage -C none \ - -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -n U-Boot + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_TEXT_BASE) -n U-Boot MLO: u-boot.bin FORCE $(call if_changed,mkimage) @dd if=/dev/zero bs=8 count=1 2>/dev/null >> $@ diff --git a/arch/arm/mach-nexell/include/mach/boot0.h b/arch/arm/mach-nexell/include/mach/boot0.h index e05c07ece6a..29f37d3ba4c 100644 --- a/arch/arm/mach-nexell/include/mach/boot0.h +++ b/arch/arm/mach-nexell/include/mach/boot0.h @@ -5,7 +5,7 @@ * The NSIH (first 512 Bytes of u-boot.bin) is necessary for the * 2nd-Bootloader to get information like load address of U-Boot. * - * 0x400 must be added to CONFIG_SYS_TEXT_BASE to have the actual load and + * 0x400 must be added to CONFIG_TEXT_BASE to have the actual load and * start address because 2nd-Bootloader loads with an offset of 0x400 * (NSIH + 0x200 bytes are not loaded into RAM). * @@ -23,9 +23,9 @@ .word (_end - _start) + 20 * 1024 /* 0x50: load size * (bin + 20k for DTB) */ .space 0x4 - .word CONFIG_SYS_TEXT_BASE + 0x400 /* 0x58: load address */ + .word CONFIG_TEXT_BASE + 0x400 /* 0x58: load address */ .word 0x00000000 - .word CONFIG_SYS_TEXT_BASE + 0x400 /* 0x60: start address */ + .word CONFIG_TEXT_BASE + 0x400 /* 0x60: start address */ .space 0x198 .byte 'N' /* 0x1FC: "NSIH" signature */ .byte 'S' diff --git a/arch/arm/mach-npcm/Kconfig b/arch/arm/mach-npcm/Kconfig index 7f2f9ac0971..24bd2ad423f 100644 --- a/arch/arm/mach-npcm/Kconfig +++ b/arch/arm/mach-npcm/Kconfig @@ -3,7 +3,7 @@ if ARCH_NPCM config SYS_ARCH default "arm" -config SYS_TEXT_BASE +config TEXT_BASE default 0x8000 choice diff --git a/arch/arm/mach-octeontx/cpu.c b/arch/arm/mach-octeontx/cpu.c index 7bd74fe4f67..aa5f4585c6f 100644 --- a/arch/arm/mach-octeontx/cpu.c +++ b/arch/arm/mach-octeontx/cpu.c @@ -46,7 +46,7 @@ struct mm_region *mem_map = otx_mem_map; void mem_map_fill(void) { int banks = OTX_MEM_MAP_USED; - u32 dram_start = CONFIG_SYS_TEXT_BASE; + u32 dram_start = CONFIG_TEXT_BASE; if (otx_is_soc(CN83XX)) { otx_mem_map[banks].virt = 0x8c0000000000UL; diff --git a/arch/arm/mach-octeontx2/cpu.c b/arch/arm/mach-octeontx2/cpu.c index afa458c09b8..723deef719b 100644 --- a/arch/arm/mach-octeontx2/cpu.c +++ b/arch/arm/mach-octeontx2/cpu.c @@ -51,7 +51,7 @@ struct mm_region *mem_map = otx2_mem_map; void mem_map_fill(void) { int banks = OTX2_MEM_MAP_USED; - u32 dram_start = CONFIG_SYS_TEXT_BASE; + u32 dram_start = CONFIG_TEXT_BASE; for (int i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { otx2_mem_map[banks].virt = dram_start; diff --git a/arch/arm/mach-omap2/config_secure.mk b/arch/arm/mach-omap2/config_secure.mk index 0629afd0ee8..f76262bb0ce 100644 --- a/arch/arm/mach-omap2/config_secure.mk +++ b/arch/arm/mach-omap2/config_secure.mk @@ -10,7 +10,7 @@ cmd_mkomapsecimg = $(TI_SECURE_DEV_PKG)/scripts/create-boot-image.sh \ $(if $(KBUILD_VERBOSE:1=), >/dev/null) else cmd_mkomapsecimg = $(TI_SECURE_DEV_PKG)/scripts/create-boot-image.sh \ - $(patsubst u-boot_HS_%,%,$(@F)) $< $@ $(CONFIG_SYS_TEXT_BASE) \ + $(patsubst u-boot_HS_%,%,$(@F)) $< $@ $(CONFIG_TEXT_BASE) \ $(if $(KBUILD_VERBOSE:1=), >/dev/null) endif else @@ -102,7 +102,7 @@ u-boot_HS_XIP_X-LOADER: $(obj)/u-boot.bin FORCE ifdef CONFIG_SPL_LOAD_FIT MKIMAGEFLAGS_u-boot_HS.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ - -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ + -a $(CONFIG_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ $(patsubst %,-b arch/$(ARCH)/dts/%.dtb_HS,$(subst ",,$(CONFIG_OF_LIST))) diff --git a/arch/arm/mach-owl/Kconfig b/arch/arm/mach-owl/Kconfig index cde2ade30b8..76d3998884d 100644 --- a/arch/arm/mach-owl/Kconfig +++ b/arch/arm/mach-owl/Kconfig @@ -14,7 +14,7 @@ config MACH_S700 endchoice -config SYS_TEXT_BASE +config TEXT_BASE default 0x11000000 config SYS_CONFIG_NAME diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index b46cea2f91c..69d51ff3789 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -431,7 +431,7 @@ config ROCKCHIP_SPI_IMAGE is built by binman. U-Boot sits near the start of the image. config LNX_KRNL_IMG_TEXT_OFFSET_BASE - default SYS_TEXT_BASE + default TEXT_BASE source "arch/arm/mach-rockchip/px30/Kconfig" source "arch/arm/mach-rockchip/rk3036/Kconfig" diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index df44530e83a..503c82d388c 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -40,7 +40,7 @@ config SYS_MALLOC_F_LEN default 0x2000 if TARGET_SOCFPGA_ARRIA10 default 0x2000 if TARGET_SOCFPGA_GEN5 -config SYS_TEXT_BASE +config TEXT_BASE default 0x01000040 if TARGET_SOCFPGA_ARRIA10 default 0x01000040 if TARGET_SOCFPGA_GEN5 diff --git a/arch/arm/mach-stm32mp/Kconfig.13x b/arch/arm/mach-stm32mp/Kconfig.13x index 5fc000986e1..acc02a5a187 100644 --- a/arch/arm/mach-stm32mp/Kconfig.13x +++ b/arch/arm/mach-stm32mp/Kconfig.13x @@ -19,7 +19,7 @@ config TARGET_ST_STM32MP13x endchoice -config SYS_TEXT_BASE +config TEXT_BASE default 0xC0000000 config PRE_CON_BUF_ADDR diff --git a/arch/arm/mach-stm32mp/Kconfig.15x b/arch/arm/mach-stm32mp/Kconfig.15x index 5bd9b53a5d8..1d32f8bf339 100644 --- a/arch/arm/mach-stm32mp/Kconfig.15x +++ b/arch/arm/mach-stm32mp/Kconfig.15x @@ -93,7 +93,7 @@ config SPL_STM32MP15_PWR This config enables implementation of driver-model pmic and regulator uclass features for access to STM32MP15x PWR in SPL. -config SYS_TEXT_BASE +config TEXT_BASE default 0xC0100000 config PRE_CON_BUF_ADDR diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 220ed80ba79..86233637bfc 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -363,7 +363,7 @@ __weak void sunxi_sram_init(void) static bool sunxi_valid_emmc_boot(struct mmc *mmc) { struct blk_desc *bd = mmc_get_blk_desc(mmc); - uint32_t *buffer = (void *)(uintptr_t)CONFIG_SYS_TEXT_BASE; + u32 *buffer = (void *)(uintptr_t)CONFIG_TEXT_BASE; struct boot_file_head *egon_head = (void *)buffer; int bootpart = EXT_CSD_EXTRACT_BOOT_PART(mmc->part_config); uint32_t spl_size, emmc_checksum, chksum = 0; diff --git a/arch/arm/mach-sunxi/spl_spi_sunxi.c b/arch/arm/mach-sunxi/spl_spi_sunxi.c index 520f14e5155..81159cfee61 100644 --- a/arch/arm/mach-sunxi/spl_spi_sunxi.c +++ b/arch/arm/mach-sunxi/spl_spi_sunxi.c @@ -341,7 +341,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, struct legacy_img_hdr *header; uint32_t load_offset = sunxi_get_spl_size(); - header = (struct legacy_img_hdr *)CONFIG_SYS_TEXT_BASE; + header = (struct legacy_img_hdr *)CONFIG_TEXT_BASE; load_offset = max_t(uint32_t, load_offset, CONFIG_SYS_SPI_U_BOOT_OFFS); spi0_init(); diff --git a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh index 40ed23b0ba6..cdecb1c1d35 100755 --- a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh +++ b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh @@ -26,7 +26,7 @@ TEE_LOAD_ADDR_LOW=`printf 0x%x $((TEE_LOAD_ADDR & 0xffffffff))` TEE_LOAD_ADDR_HIGH=`printf 0x%x $((TEE_LOAD_ADDR >> 32))` if [ -z "$BL33_LOAD_ADDR" ];then - BL33_LOAD_ADDR=`awk '/CONFIG_SYS_TEXT_BASE/ { print $3 }' include/generated/autoconf.h` + BL33_LOAD_ADDR=`awk '/CONFIG_TEXT_BASE/ { print $3 }' include/generated/autoconf.h` fi BL33_LOAD_ADDR_LOW=`printf 0x%x $((BL33_LOAD_ADDR & 0xffffffff))` BL33_LOAD_ADDR_HIGH=`printf 0x%x $((BL33_LOAD_ADDR >> 32))` diff --git a/arch/m68k/cpu/mcf52x2/start.S b/arch/m68k/cpu/mcf52x2/start.S index 4488a6e4c7f..6dddbe76f3a 100644 --- a/arch/m68k/cpu/mcf52x2/start.S +++ b/arch/m68k/cpu/mcf52x2/start.S @@ -35,8 +35,8 @@ */ _vectors: .long 0x00000000 /* Flash offset is 0 until we setup CS0 */ -#if defined(CONFIG_M5282) && (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) -.long _start - CONFIG_SYS_TEXT_BASE +#if defined(CONFIG_M5282) && (CONFIG_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) +.long _start - CONFIG_TEXT_BASE #else .long _START #endif @@ -83,7 +83,7 @@ _vectors: #if defined(CONFIG_SYS_INT_FLASH_BASE) && \ (defined(CONFIG_M5282) || defined(CONFIG_M5281)) -#if (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) +#if (CONFIG_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) .long 0x55AA55AA,0xAA55AA55 /* CFM Backdoorkey */ .long 0xFFFFFFFF /* all sectors protected */ .long 0x00000000 /* supervisor/User restriction */ @@ -130,7 +130,7 @@ _start: movec %d0, %RAMBAR1 #if defined(CONFIG_M5282) -#if (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) +#if (CONFIG_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) /* * Setup code in SRAM to initialize FLASHBAR, * if start from internal Flash @@ -156,7 +156,7 @@ _after_flashbar_copy: /* Setup code to initialize FLASHBAR, if start from external Memory */ move.l #(CONFIG_SYS_INT_FLASH_BASE + CONFIG_SYS_INT_FLASH_ENABLE), %d0 movec %d0, %FLASHBAR -#endif /* (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) */ +#endif /* (CONFIG_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) */ #endif #endif @@ -165,7 +165,7 @@ _after_flashbar_copy: * therefore no VBR to set */ #if !defined(CONFIG_MONITOR_IS_IN_RAM) -#if defined(CONFIG_M5282) && (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) +#if defined(CONFIG_M5282) && (CONFIG_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) move.l #CONFIG_SYS_INT_FLASH_BASE, %d0 #else move.l #CONFIG_SYS_FLASH_BASE, %d0 diff --git a/arch/m68k/cpu/mcf530x/start.S b/arch/m68k/cpu/mcf530x/start.S index 287e8e7873c..644c372bdd2 100644 --- a/arch/m68k/cpu/mcf530x/start.S +++ b/arch/m68k/cpu/mcf530x/start.S @@ -39,8 +39,8 @@ _vectors: /* Flash offset is 0 until we setup CS0 */ .long 0x00000000 #if defined(CONFIG_M5307) && \ - (CONFIG_SYS_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) -.long _start - CONFIG_SYS_TEXT_BASE + (CONFIG_TEXT_BASE == CONFIG_SYS_INT_FLASH_BASE) +.long _start - CONFIG_TEXT_BASE #else .long _START #endif diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S index 27bcd40c5c1..aea8f3090fe 100644 --- a/arch/m68k/cpu/mcf5445x/start.S +++ b/arch/m68k/cpu/mcf5445x/start.S @@ -26,10 +26,10 @@ rte; #if defined(CONFIG_SERIAL_BOOT) -#define ASM_DRAMINIT (asm_dram_init - CONFIG_SYS_TEXT_BASE + \ +#define ASM_DRAMINIT (asm_dram_init - CONFIG_TEXT_BASE + \ CONFIG_SYS_INIT_RAM_ADDR) -#define ASM_DRAMINIT_N (asm_dram_init - CONFIG_SYS_TEXT_BASE) -#define ASM_SBF_IMG_HDR (asm_sbf_img_hdr - CONFIG_SYS_TEXT_BASE + \ +#define ASM_DRAMINIT_N (asm_dram_init - CONFIG_TEXT_BASE) +#define ASM_SBF_IMG_HDR (asm_sbf_img_hdr - CONFIG_TEXT_BASE + \ CONFIG_SYS_INIT_RAM_ADDR) #endif @@ -116,7 +116,7 @@ vector192_255: asm_sbf_img_hdr: .long 0x00000000 /* checksum, not yet implemented */ .long 0x00040000 /* image length */ - .long CONFIG_SYS_TEXT_BASE /* image to be relocated at */ + .long CONFIG_TEXT_BASE /* image to be relocated at */ asm_dram_init: move.w #0x2700,%sr /* Mask off Interrupt */ @@ -271,7 +271,7 @@ asm_dspi_rd_loop2: jsr asm_dspi_rd_status /* jump to memory and execute */ - move.l #(CONFIG_SYS_TEXT_BASE + 0x400), %a0 + move.l #(CONFIG_TEXT_BASE + 0x400), %a0 jmp (%a0) asm_dspi_wr_status: @@ -298,7 +298,7 @@ asm_dspi_rd_status: /* copy 4 boot pages to dram as soon as possible */ /* each page is 996 bytes (1056 total with 60 ECC bytes */ move.l #0x00000000, %a1 /* src */ - move.l #CONFIG_SYS_TEXT_BASE, %a2 /* dst */ + move.l #CONFIG_TEXT_BASE, %a2 /* dst */ move.l #0x3E0, %d0 /* sz in long */ asm_boot_nand_copy: @@ -381,7 +381,7 @@ asm_nand_init: move.l #4, %d2 /* start at 4 */ move.l #0xFC0FFF04, %a0 /* cmd2 */ move.l #0xFC0FFF0C, %a1 /* rar */ - move.l #(CONFIG_SYS_TEXT_BASE + 0xF80), %a2 + move.l #(CONFIG_TEXT_BASE + 0xF80), %a2 asm_nand_read: move.l #0x11000000, %d0 /* rar */ @@ -419,7 +419,7 @@ asm_nand_copy: bgt asm_nand_read /* jump to memory and execute */ - move.l #(CONFIG_SYS_TEXT_BASE + 0x400), %a0 + move.l #(CONFIG_TEXT_BASE + 0x400), %a0 jmp (%a0) #endif /* CONFIG_SYS_NAND_BOOT */ diff --git a/arch/microblaze/cpu/relocate.c b/arch/microblaze/cpu/relocate.c index b00d02b1dfc..7a15fb2ec39 100644 --- a/arch/microblaze/cpu/relocate.c +++ b/arch/microblaze/cpu/relocate.c @@ -19,7 +19,7 @@ * @rela_start: rela section start * @rela_end: rela section end * @dyn_start: dynamic section start - * @origin_addr: address where u-boot starts(doesn't need to be CONFIG_SYS_TEXT_BASE) + * @origin_addr: address where u-boot starts(doesn't need to be CONFIG_TEXT_BASE) */ void mb_fix_rela(u32 reloc_addr, u32 verbose, u32 rela_start, u32 rela_end, u32 dyn_start, u32 origin_addr) @@ -29,9 +29,9 @@ void mb_fix_rela(u32 reloc_addr, u32 verbose, u32 rela_start, /* * Return in case u-boot.elf is used directly. * Skip it when u-boot.bin is loaded to different address than - * CONFIG_SYS_TEXT_BASE. In this case relocation is necessary to run. + * CONFIG_TEXT_BASE. In this case relocation is necessary to run. */ - if (reloc_addr == CONFIG_SYS_TEXT_BASE) { + if (reloc_addr == CONFIG_TEXT_BASE) { debug_cond(verbose, "Relocation address is the same - skip relocation\n"); return; diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S index a877db305e4..7079d9e1704 100644 --- a/arch/microblaze/cpu/start.S +++ b/arch/microblaze/cpu/start.S @@ -55,15 +55,15 @@ uboot_sym_start: add r6, r0, r0 lwi r7, r20, ALIGNMENT_ADDR - addi r7, r7, -CONFIG_SYS_TEXT_BASE + addi r7, r7, -CONFIG_TEXT_BASE add r7, r7, r5 lwi r8, r20, ALIGNMENT_ADDR + 0x4 - addi r8, r8, -CONFIG_SYS_TEXT_BASE + addi r8, r8, -CONFIG_TEXT_BASE add r8, r8, r5 lwi r9, r20, ALIGNMENT_ADDR + 0x8 - addi r9, r9, -CONFIG_SYS_TEXT_BASE + addi r9, r9, -CONFIG_TEXT_BASE add r9, r9, r5 - addi r10, r0, CONFIG_SYS_TEXT_BASE + addi r10, r0, CONFIG_TEXT_BASE brlid r15, mb_fix_rela nop diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c index 4c40bd86fd8..cff98b0a770 100644 --- a/arch/mips/mach-jz47xx/jz4780/jz4780.c +++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c @@ -58,7 +58,7 @@ void board_init_f(ulong dummy) if (ret) hang(); - header = (struct legacy_img_hdr *)(CONFIG_SYS_TEXT_BASE - + header = (struct legacy_img_hdr *)(CONFIG_TEXT_BASE - sizeof(struct legacy_img_hdr)); count = blk_dread(mmc_get_blk_desc(mmc), @@ -68,7 +68,7 @@ void board_init_f(ulong dummy) hang(); image_entry_noargs_t image_entry = - (image_entry_noargs_t)CONFIG_SYS_TEXT_BASE; + (image_entry_noargs_t)CONFIG_TEXT_BASE; image_entry(); diff --git a/arch/mips/mach-mscc/lowlevel_init.S b/arch/mips/mach-mscc/lowlevel_init.S index 91f29ae252c..0c24cb5f22d 100644 --- a/arch/mips/mach-mscc/lowlevel_init.S +++ b/arch/mips/mach-mscc/lowlevel_init.S @@ -21,7 +21,7 @@ LEAF(lowlevel_init) /* Modify ra/s0 such we return to physical NOR location */ li t0, 0x0fffffff - li t1, CONFIG_SYS_TEXT_BASE + li t1, CONFIG_TEXT_BASE and s0, ra, t0 add s0, s0, t1 diff --git a/arch/mips/mach-mtmips/Kconfig b/arch/mips/mach-mtmips/Kconfig index d46be503a2b..15b2792e619 100644 --- a/arch/mips/mach-mtmips/Kconfig +++ b/arch/mips/mach-mtmips/Kconfig @@ -28,7 +28,7 @@ config SYS_ICACHE_LINE_SIZE config SYS_SCACHE_LINE_SIZE default 32 if SOC_MT7621 -config SYS_TEXT_BASE +config TEXT_BASE default 0x9c000000 if !SPL && !SOC_MT7621 default 0x80200000 if SPL || SOC_MT7621 diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c index 1bba216371b..8d629d3b960 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c @@ -30,7 +30,7 @@ void setup_ifc(void) _mas0 = MAS0_TLBSEL(1) | MAS0_ESEL(15); _mas1 = MAS1_VALID | MAS1_TID(0) | MAS1_TS | MAS1_IPROT | MAS1_TSIZE(BOOKE_PAGESZ_4M); - _mas2 = FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE, MAS2_I|MAS2_G); + _mas2 = FSL_BOOKE_MAS2(CONFIG_TEXT_BASE, MAS2_I | MAS2_G); _mas3 = FSL_BOOKE_MAS3(flash_phys, 0, MAS3_SW|MAS3_SR|MAS3_SX); _mas7 = FSL_BOOKE_MAS7(flash_phys); @@ -58,7 +58,7 @@ void setup_ifc(void) MAS0_ESEL(CONFIG_SYS_PPC_E500_DEBUG_TLB); _mas1 = MAS1_VALID | MAS1_TID(0) | MAS1_IPROT | MAS1_TSIZE(BOOKE_PAGESZ_4M); - _mas2 = FSL_BOOKE_MAS2(CONFIG_SYS_TEXT_BASE, MAS2_I|MAS2_G); + _mas2 = FSL_BOOKE_MAS2(CONFIG_TEXT_BASE, MAS2_I | MAS2_G); _mas3 = FSL_BOOKE_MAS3(flash_phys, 0, MAS3_SW|MAS3_SR|MAS3_SX); _mas7 = FSL_BOOKE_MAS7(flash_phys); diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds index c766f20cb03..fa3aa954cbb 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds @@ -18,7 +18,7 @@ SECTIONS { /* Optional boot sector */ #if defined(CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR) && !defined(CONFIG_SPL) - .bootsect CONFIG_SYS_TEXT_BASE - CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA * 512 : { + .bootsect CONFIG_TEXT_BASE - CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA * 512 : { KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootsect)) . = CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA * 512; } diff --git a/arch/powerpc/dts/kmcent2-u-boot.dtsi b/arch/powerpc/dts/kmcent2-u-boot.dtsi index eeaa688b657..28f303b749e 100644 --- a/arch/powerpc/dts/kmcent2-u-boot.dtsi +++ b/arch/powerpc/dts/kmcent2-u-boot.dtsi @@ -77,13 +77,13 @@ binman { filename = "u-boot.bin"; - skip-at-start = <CONFIG_SYS_TEXT_BASE>; + skip-at-start = <CONFIG_TEXT_BASE>; sort-by-offset; pad-byte = <0xff>; size = <CONFIG_SYS_MONITOR_LEN>; u-boot-with-ucode-ptr { - offset = <CONFIG_SYS_TEXT_BASE>; + offset = <CONFIG_TEXT_BASE>; optional-ucode; }; diff --git a/arch/powerpc/dts/u-boot.dtsi b/arch/powerpc/dts/u-boot.dtsi index 6588bb7fa5e..b4b5257362e 100644 --- a/arch/powerpc/dts/u-boot.dtsi +++ b/arch/powerpc/dts/u-boot.dtsi @@ -10,13 +10,13 @@ / { binman { filename = "u-boot.bin"; - skip-at-start = <CONFIG_SYS_TEXT_BASE>; + skip-at-start = <CONFIG_TEXT_BASE>; sort-by-offset; pad-byte = <0xff>; size = <CONFIG_SYS_MONITOR_LEN>; u-boot-with-ucode-ptr { - offset = <CONFIG_SYS_TEXT_BASE>; + offset = <CONFIG_TEXT_BASE>; optional-ucode; }; diff --git a/arch/riscv/dts/binman.dtsi b/arch/riscv/dts/binman.dtsi index 5757ef65ea4..b8fc8f7f35e 100644 --- a/arch/riscv/dts/binman.dtsi +++ b/arch/riscv/dts/binman.dtsi @@ -27,7 +27,7 @@ os = "U-Boot"; arch = "riscv"; compression = "none"; - load = <CONFIG_SYS_TEXT_BASE>; + load = <CONFIG_TEXT_BASE>; uboot_blob: blob-ext { filename = "u-boot-nodtb.bin"; diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c index 1d49a9bd102..0faf34cc00a 100644 --- a/arch/sandbox/cpu/spl.c +++ b/arch/sandbox/cpu/spl.c @@ -49,13 +49,14 @@ void board_init_f(ulong flag) preloader_console_init(); } -u32 spl_boot_device(void) +void board_boot_order(u32 *spl_boot_list) { - return BOOT_DEVICE_BOARD; + spl_boot_list[0] = BOOT_DEVICE_VBE; + spl_boot_list[1] = BOOT_DEVICE_BOARD; } -static int spl_board_load_image(struct spl_image_info *spl_image, - struct spl_boot_device *bootdev) +static int spl_board_load_file(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev) { char fname[256]; int ret; @@ -74,10 +75,52 @@ static int spl_board_load_image(struct spl_image_info *spl_image, if (!spl_image->arg) return log_msg_ret("exec", -ENOMEM); strcpy(spl_image->arg, fname); + spl_image->flags = SPL_SANDBOXF_ARG_IS_FNAME; return 0; } -SPL_LOAD_IMAGE_METHOD("sandbox", 9, BOOT_DEVICE_BOARD, spl_board_load_image); +SPL_LOAD_IMAGE_METHOD("sandbox_file", 9, BOOT_DEVICE_BOARD, + spl_board_load_file); + +static int load_from_image(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev) +{ + struct sandbox_state *state = state_get_current(); + enum u_boot_phase next_phase; + const char *fname; + ulong pos, size; + int full_size; + void *buf; + int ret; + + if (!IS_ENABLED(CONFIG_SANDBOX_VPL)) + return -ENOENT; + + next_phase = spl_next_phase(); + pos = spl_get_image_pos(); + size = spl_get_image_size(); + if (pos == BINMAN_SYM_MISSING || size == BINMAN_SYM_MISSING) { + log_debug("No image found\n"); + return -ENOENT; + } + log_info("Reading from pos %lx size %lx\n", pos, size); + + /* + * Set up spl_image to boot from jump_to_image_no_args(). Allocate this + * outside the RAM buffer (i.e. don't use strdup()). + */ + fname = state->prog_fname ? state->prog_fname : state->argv[0]; + ret = os_read_file(fname, &buf, &full_size); + if (ret) + return log_msg_ret("rd", -ENOMEM); + spl_image->flags = SPL_SANDBOXF_ARG_IS_BUF; + spl_image->arg = buf; + spl_image->offset = pos; + spl_image->size = size; + + return 0; +} +SPL_LOAD_IMAGE_METHOD("sandbox_image", 7, BOOT_DEVICE_BOARD, load_from_image); void spl_board_init(void) { @@ -89,20 +132,37 @@ void spl_board_init(void) int ret; ret = ut_run_list("spl", NULL, tests, count, - state->select_unittests, 1); + state->select_unittests, 1, false); /* continue execution into U-Boot */ } } void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) { - const char *fname = spl_image->arg; + switch (spl_image->flags) { + case SPL_SANDBOXF_ARG_IS_FNAME: { + const char *fname = spl_image->arg; + + if (fname) { + os_fd_restore(); + os_spl_to_uboot(fname); + } else { + log_err("No filename provided for U-Boot\n"); + } + break; + } + case SPL_SANDBOXF_ARG_IS_BUF: { + int ret; - if (fname) { - os_fd_restore(); - os_spl_to_uboot(fname); - } else { - printf("No filename provided for U-Boot\n"); + ret = os_jump_to_image(spl_image->arg + spl_image->offset, + spl_image->size); + if (ret) + log_err("Failed to load image\n"); + break; + } + default: + log_err("Invalid flags\n"); + break; } hang(); } diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index 642be164a39..622df41f54c 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -244,6 +244,36 @@ static int sandbox_cmdline_cb_jump(struct sandbox_state *state, } SANDBOX_CMDLINE_OPT_SHORT(jump, 'j', 1, "Jumped from previous U-Boot"); +static int sandbox_cmdline_cb_program(struct sandbox_state *state, + const char *arg) +{ + /* + * Record the program name to use when jumping to future phases. This + * is the original executable which holds all the phases. We need to + * use this instead of argv[0] since each phase is started by + * extracting a particular binary from the full program, then running + * it. Therefore in that binary, argv[0] contains only the + * current-phase executable. + * + * For example, sandbox TPL may be started using image file: + * + * ./image.bin + * + * but then TPL needs to run VPL, which it does by extracting the VPL + * image from the image.bin file. + * + * ./temp-vpl + * + * When VPL runs it needs access to the original image.bin so it can + * extract the next phase (SPL). This works if we use '-f image.bin' + * when starting the original image.bin file. + */ + state->prog_fname = arg; + + return 0; +} +SANDBOX_CMDLINE_OPT_SHORT(program, 'p', 1, "U-Boot program name"); + static int sandbox_cmdline_cb_memory(struct sandbox_state *state, const char *arg) { diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c index fcc4a337e59..a681e472ab6 100644 --- a/arch/sandbox/cpu/state.c +++ b/arch/sandbox/cpu/state.c @@ -470,7 +470,7 @@ int state_uninit(void) int err; if (state->write_ram_buf || state->write_state) - log_info("Writing sandbox state\n"); + log_debug("Writing sandbox state\n"); state = &main_state; /* Finish the bloblist, so that it is correct before writing memory */ diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts index 21f00fcab5e..1b60914a01c 100644 --- a/arch/sandbox/dts/sandbox.dts +++ b/arch/sandbox/dts/sandbox.dts @@ -21,6 +21,9 @@ spi0 = &spi; }; + binman: binman { + }; + memory { reg = <0 CONFIG_SYS_SDRAM_SIZE>; }; @@ -103,3 +106,7 @@ #include "sandbox.dtsi" #include "cros-ec-keyboard.dtsi" #include "sandbox_pmic.dtsi" + +#ifdef CONFIG_SANDBOX_VPL +#include "sandbox_vpl.dtsi" +#endif diff --git a/arch/sandbox/dts/sandbox_vpl.dtsi b/arch/sandbox/dts/sandbox_vpl.dtsi new file mode 100644 index 00000000000..1fba537f135 --- /dev/null +++ b/arch/sandbox/dts/sandbox_vpl.dtsi @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Devicetree file for VPL (Verifying Program Loader) + */ + +&binman { + u-boot-tpl-elf { + no-expanded; + }; + u-boot-vpl-elf { + no-expanded; + }; + fw-update { + type = "section"; + + /* + * provide plenty of space for ELF files with debug info so that + * gdb can be used + */ + offset = <0x400000>; + size = <0xdffc00>; + + fit { + fit,external-offset = <0>; + description = "AP firmware"; + images { + spl { + description = "U-Boot SPL"; + type = "firmware"; + phase = "spl"; + arch = "sandbox"; + os = "u-boot"; + compression = "none"; + + hash-1 { + algo = "sha256"; + }; + + u-boot-spl-elf { + }; + }; + u-boot { + description = "U-Boot"; + type = "firmware"; + phase = "u-boot"; + arch = "sandbox"; + os = "u-boot"; + compression = "none"; + + hash-1 { + algo = "sha256"; + }; + + u-boot-elf { + }; + }; + }; + + configurations { + conf-1 { + compatible = "sandbox"; + description = "AP Firmware v1"; + firmware = "spl", "u-boot"; + signature { + algo = "sha1,rsa2048"; + key-name-hint = "dev"; + sign-images = "firmware"; + }; + }; + }; + }; + }; + state { + type = "fill"; + size = <0x200>; + }; + version { + type = "text"; + text = "1.2.3"; + size = <0x200>; + }; + fdtmap { + }; +}; diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index db72c64b1ed..25fd2bcab87 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -37,6 +37,8 @@ i2c0 = "/i2c@0"; mmc0 = "/mmc0"; mmc1 = "/mmc1"; + mmc2 = "/mmc2"; + mmc3 = "/mmc3"; pci0 = &pci0; pci1 = &pci1; pci2 = &pci2; @@ -64,7 +66,7 @@ osd0 = "/osd"; }; - binman { + binman: binman { }; config { @@ -78,6 +80,7 @@ }; bootstd { + u-boot,dm-vpl; compatible = "u-boot,boot-std"; filename-prefixes = "/", "/boot/"; @@ -90,6 +93,46 @@ efi { compatible = "u-boot,distro-efi"; }; + + /* + * This is used for the VBE OS-request tests. A FAT filesystem + * created in a partition with the VBE information appearing + * before the parititon starts + */ + firmware0 { + u-boot,dm-vpl; + compatible = "fwupd,vbe-simple"; + storage = "mmc1"; + skip-offset = <0x200>; + area-start = <0x400>; + area-size = <0x1000>; + state-offset = <0x400>; + state-size = <0x40>; + version-offset = <0x800>; + version-size = <0x100>; + }; + + /* + * This is used for the VBE VPL tests. The MMC device holds the + * binman image.bin file. The test progresses through each phase + * of U-Boot, loading each in turn from MMC. + * + * Note that the test enables this node (and mmc3) before + * running U-Boot + */ + firmware1 { + u-boot,dm-vpl; + status = "disabled"; + compatible = "fwupd,vbe-simple"; + storage = "mmc3"; + skip-offset = <0x400000>; + area-start = <0>; + area-size = <0xe00000>; + state-offset = <0xdffc00>; + state-size = <0x40>; + version-offset = <0xdffe00>; + version-size = <0x100>; + }; }; fuzzing-engine { @@ -962,6 +1005,14 @@ compatible = "sandbox,mmc"; }; + /* This is used for VBE VPL tests */ + mmc3 { + status = "disabled"; + compatible = "sandbox,mmc"; + filename = "image.bin"; + non-removable; + }; + pch { compatible = "sandbox,pch"; }; @@ -1404,21 +1455,6 @@ compatible = "denx,u-boot-fdt-test"; reg = <9 1>; }; - - fwupd { - compatible = "simple-bus"; - firmware0 { - compatible = "fwupd,vbe-simple"; - storage = "mmc1"; - area-start = <0x400>; - area-size = <0x1000>; - skip-offset = <0x200>; - state-offset = <0x400>; - state-size = <0x40>; - version-offset = <0x800>; - version-size = <0x100>; - }; - }; }; translation-test@8000 { @@ -1708,3 +1744,7 @@ #include "sandbox_pmic.dtsi" #include "cros-ec-keyboard.dtsi" + +#ifdef CONFIG_SANDBOX_VPL +#include "sandbox_vpl.dtsi" +#endif diff --git a/arch/sandbox/include/asm/spl.h b/arch/sandbox/include/asm/spl.h index bf5a585622b..2f8b5fcfcfe 100644 --- a/arch/sandbox/include/asm/spl.h +++ b/arch/sandbox/include/asm/spl.h @@ -7,7 +7,11 @@ #define __asm_spl_h enum { + BOOT_DEVICE_MMC1, + BOOT_DEVICE_MMC2, + BOOT_DEVICE_MMC2_2, BOOT_DEVICE_BOARD, + BOOT_DEVICE_VBE, }; /** diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h index fd42daad51c..49ea483d332 100644 --- a/arch/sandbox/include/asm/state.h +++ b/arch/sandbox/include/asm/state.h @@ -71,7 +71,8 @@ struct sandbox_state { const char *parse_err; /* Error to report from parsing */ int argc; /* Program arguments */ char **argv; /* Command line arguments */ - const char *jumped_fname; /* Jumped from previous U_Boot */ + const char *jumped_fname; /* Jumped from previous U-Boot */ + const char *prog_fname; /* U-Boot executable filename */ uint8_t *ram_buf; /* Emulated RAM buffer */ unsigned long ram_size; /* Size of RAM buffer */ const char *ram_buf_fname; /* Filename to use for RAM buffer */ diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds index ff80ce78f3e..85ee547b4aa 100644 --- a/arch/sh/cpu/u-boot.lds +++ b/arch/sh/cpu/u-boot.lds @@ -25,7 +25,7 @@ ENTRY(_start) SECTIONS { - . = CONFIG_SYS_TEXT_BASE; + . = CONFIG_TEXT_BASE; reloc_dst = .; PROVIDE (_ftext = .); diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a2da080eaed..93f1c77be3f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -924,8 +924,8 @@ config CACHE_QOS_SIZE_PER_BIT config X86_OFFSET_U_BOOT hex "Offset of U-Boot in ROM image" - depends on HAVE_SYS_TEXT_BASE - default SYS_TEXT_BASE + depends on HAVE_TEXT_BASE + default TEXT_BASE config X86_OFFSET_SPL hex "Offset of SPL in ROM image" diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c index f2d25734c60..6078d5a200e 100644 --- a/arch/x86/cpu/apollolake/spl.c +++ b/arch/x86/cpu/apollolake/spl.c @@ -118,7 +118,7 @@ static int spl_fast_spi_load_image(struct spl_image_info *spl_image, spl_image->size = CONFIG_SYS_MONITOR_LEN; /* We don't know SPL size */ spl_image->entry_point = spl_phase() == PHASE_TPL ? - CONFIG_SPL_TEXT_BASE : CONFIG_SYS_TEXT_BASE; + CONFIG_SPL_TEXT_BASE : CONFIG_TEXT_BASE; spl_image->load_addr = spl_image->entry_point; spl_image->os = IH_OS_U_BOOT; spl_image->name = "U-Boot"; diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c index e016fae04f9..0a1fbb34d40 100644 --- a/arch/x86/cpu/quark/quark.c +++ b/arch/x86/cpu/quark/quark.c @@ -49,7 +49,7 @@ static void quark_setup_mtrr(void) /* variable range MTRR#0: ROM area */ mask = ~(CONFIG_SYS_MONITOR_LEN - 1); - base = CONFIG_SYS_TEXT_BASE & mask; + base = CONFIG_TEXT_BASE & mask; msg_port_write(MSG_PORT_HOST_BRIDGE, MTRR_VAR_PHYBASE(MTRR_VAR_ROM), base | MTRR_TYPE_WRBACK); msg_port_write(MSG_PORT_HOST_BRIDGE, MTRR_VAR_PHYMASK(MTRR_VAR_ROM), diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index 897fd926c0a..0ef27cc5a00 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -237,15 +237,15 @@ multiboot_header: /* checksum */ .long -0x1BADB002 - (1 << 16) /* header addr */ - .long multiboot_header - _x86boot_start + CONFIG_SYS_TEXT_BASE + .long multiboot_header - _x86boot_start + CONFIG_TEXT_BASE /* load addr */ - .long CONFIG_SYS_TEXT_BASE + .long CONFIG_TEXT_BASE /* load end addr */ .long 0 /* bss end addr */ .long 0 /* entry addr */ - .long CONFIG_SYS_TEXT_BASE + .long CONFIG_TEXT_BASE #ifdef CONFIG_X86_LOAD_FROM_32_BIT /* diff --git a/arch/x86/cpu/u-boot-64.lds b/arch/x86/cpu/u-boot-64.lds index 53c56043a9e..d0398ff00d7 100644 --- a/arch/x86/cpu/u-boot-64.lds +++ b/arch/x86/cpu/u-boot-64.lds @@ -15,8 +15,8 @@ SECTIONS /DISCARD/ : { *(__u_boot_list_2_cmd_*) } #endif -#ifdef CONFIG_SYS_TEXT_BASE - . = CONFIG_SYS_TEXT_BASE; /* Location of bootcode in flash */ +#ifdef CONFIG_TEXT_BASE + . = CONFIG_TEXT_BASE; /* Location of bootcode in flash */ #endif __text_start = .; diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds index 7c872098342..a31f4220a00 100644 --- a/arch/x86/cpu/u-boot.lds +++ b/arch/x86/cpu/u-boot.lds @@ -15,7 +15,7 @@ SECTIONS /DISCARD/ : { *(__u_boot_list_2_cmd_*) } #endif - . = CONFIG_SYS_TEXT_BASE; /* Location of bootcode in flash */ + . = CONFIG_TEXT_BASE; /* Location of bootcode in flash */ __text_start = .; .text.start : { *(.text.start); } diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index 9060d19d46a..5b1b420a643 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -162,10 +162,10 @@ int do_elf_reloc_fixups(void) if (re_src == re_end) panic("No relocation data"); -#ifdef CONFIG_SYS_TEXT_BASE - text_base = CONFIG_SYS_TEXT_BASE; +#ifdef CONFIG_TEXT_BASE + text_base = CONFIG_TEXT_BASE; #else - panic("No CONFIG_SYS_TEXT_BASE"); + panic("No CONFIG_TEXT_BASE"); #endif #if CONFIG_IS_ENABLED(X86_64) do_elf_reloc_fixups64(text_base, size, re_src, re_end); diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index 2d50c62964c..34ef68f2bb7 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -66,7 +66,7 @@ static int x86_spl_init(void) * TODO(sjg@chromium.org): We use this area of RAM for the stack * and global_data in SPL. Once U-Boot starts up and releocates it * is not needed. We could make this a CONFIG option or perhaps - * place it immediately below CONFIG_SYS_TEXT_BASE. + * place it immediately below CONFIG_TEXT_BASE. */ __maybe_unused char *ptr = (char *)0x110000; #else @@ -209,8 +209,8 @@ static int spl_board_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { spl_image->size = CONFIG_SYS_MONITOR_LEN; - spl_image->entry_point = CONFIG_SYS_TEXT_BASE; - spl_image->load_addr = CONFIG_SYS_TEXT_BASE; + spl_image->entry_point = CONFIG_TEXT_BASE; + spl_image->load_addr = CONFIG_TEXT_BASE; spl_image->os = IH_OS_U_BOOT; spl_image->name = "U-Boot"; diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c index 173350b7061..2b08930af6f 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 35d58fcd019..4070d5903ce 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 a0314c65379..c7adae0ea71 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 4b41c6fdaa2..99fe1edfb33 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 07aeb0981c0..aead6f099e8 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 1dad7e3eaf6..ac62e557a07 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 a50a052df76..c211cb58396 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 64692509fd7..2cdc34c7c0c 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 05e9b3b6f75..4f41ce1abf1 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 ecfd90fd4c4..dbe2d5f0a3a 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 8cebdcc1bb7..50ef401b7c9 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 50c7b2a2f42..413f42a3205 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 08dd0c2edd7..6d062499346 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 95dbefa78ba..ed9949651c4 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 f9883f18b0b..6114e1b8120 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 9bb8a726ed9..787751abba4 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 93c5d39ae9b..e25aa76fe18 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 b53896f2354..b481c98f929 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 f016088670f..245c9dfb18e 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 746b35a678b..fa87df73582 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 5c27f0f726d..7d73d20c8f0 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 53c651c3f9e..ff656fbf3a0 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 dd29ddf694b..a6c244f9f76 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 9f66d799887..011968aefdb 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 875df9d59ff..423a9a25f1b 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 c1db387b275..3372290120b 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 5b154a3f6e5..75364557bfc 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 ab76a3c6268..5537788001a 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 82bf65d64f1..953785fea3d 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 98eb4d16c71..4d124b3a1e9 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 b0782780f64..13e2d041769 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 a62249936fa..97228d63087 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 a4fa004bfe0..009cd93b6d4 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 ed764485a51..32407025bc1 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 1eed227c75f..eb2290cfafb 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 23b2af4821d..5efda4b3a55 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 fb8d94fb5b1..4c0451da48d 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 82a6ca904e9..a03ef867801 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 8c7e22cc339..015ed51dc89 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 3999f487192..c8138dcf305 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 abcacc3185f..2981e5703eb 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 092e4112151..e37091373ff 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 4f08e98b97a..0c097660296 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 4b66e0a8614..930052ea60f 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 193c890046e..eb0db8a64c8 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 4fd6a7167a5..bf24d898a55 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 74c632a03e7..d2a0985f6f0 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 f6ad498e85c..fe28b1ff526 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 29be61a90dd..b052a858fd3 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 3e743847167..b0cb4e747b6 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 b53896f2354..b481c98f929 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 b3b4342a1fb..5d842c36cfc 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 fe213fd5047..bc1f33bde30 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 1e948489f36..6dc804a0c06 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 b1d7a7ad936..2d212ec5a34 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 f9e1bc63164..33b72614d76 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 fa6aaf350c2..3275218dc20 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 7b047cf4a38..327c93cdbaf 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 5ba3aa35a9f..51e8de4b891 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 67a0228773b..bf0bd467a5f 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 cb1b8749cea..1cd90718f4a 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 diff --git a/boot/Kconfig b/boot/Kconfig index 45f86e946cd..d5c582ebe8c 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -292,6 +292,56 @@ config SPL_FIT_GENERATOR endif # SPL +if VPL + +config VPL_FIT + bool "Support Flattened Image Tree within VPL" + depends on VPL + default y + select VPL_HASH + select VPL_OF_LIBFDT + +config VPL_FIT_PRINT + bool "Support FIT printing within VPL" + depends on VPL_FIT + default y + help + Support printing the content of the fitImage in a verbose manner in VPL. + +config VPL_FIT_FULL_CHECK + bool "Do a full check of the FIT before using it" + default y + help + Enable this do a full check of the FIT to make sure it is valid. This + helps to protect against carefully crafted FITs which take advantage + of bugs or omissions in the code. This includes a bad structure, + multiple root nodes and the like. + +config VPL_FIT_SIGNATURE + bool "Enable signature verification of FIT firmware within VPL" + depends on VPL_DM + default y + select FIT_SIGNATURE + select VPL_FIT + select VPL_CRYPTO + select VPL_HASH + imply VPL_RSA + imply VPL_RSA_VERIFY + select VPL_IMAGE_SIGN_INFO + select VPL_FIT_FULL_CHECK + +config VPL_FIT_SIGNATURE_MAX_SIZE + hex "Max size of signed FIT structures in VPL" + depends on VPL_FIT_SIGNATURE + default 0x10000000 + help + This option sets a max size in bytes for verified FIT uImages. + A sane value of 256MB protects corrupted DTB structures from overlapping + device memory. Assure this size does not extend past expected storage + space. + +endif # VPL + endif # FIT config PXE_UTILS @@ -334,6 +384,26 @@ config BOOTSTD_FULL - support for selecting the ordering of bootdevs using the devicetree as well as the "boot_targets" environment variable +config SPL_BOOTSTD + bool "Standard boot support in VPL" + depends on SPL && SPL_DM && SPL_OF_CONTROL && SPL_BLK + default y if VPL + help + This enables standard boot in SPL. This is neeeded so that VBE + (Verified Boot for Embedded) can be used, since it depends on standard + boot. It is enabled by default since the main purpose of VPL is to + handle the firmware part of VBE. + +config VPL_BOOTSTD + bool "Standard boot support in VPL" + depends on VPL && VPL_DM && VPL_OF_CONTROL && VPL_BLK + default y + help + This enables standard boot in SPL. This is neeeded so that VBE + (Verified Boot for Embedded) can be used, since it depends on standard + boot. It is enabled by default since the main purpose of VPL is to + handle the firmware part of VBE. + if BOOTSTD config BOOTSTD_BOOTCOMMAND @@ -408,6 +478,24 @@ config BOOTMETH_VBE supports selection of various firmware components, seleciton of an OS to boot as well as updating these using fwupd. +config SPL_BOOTMETH_VBE + bool "Bootdev support for Verified Boot for Embedded (SPL)" + depends on SPL && FIT + default y if VPL + help + Enables support for VBE boot. This is a standard boot method which + supports selection of various firmware components, seleciton of an OS to + boot as well as updating these using fwupd. + +config VPL_BOOTMETH_VBE + bool "Bootdev support for Verified Boot for Embedded (VPL)" + depends on VPL && FIT + default y + help + Enables support for VBE boot. This is a standard boot method which + supports selection of various firmware components, seleciton of an OS to + boot as well as updating these using fwupd. + if BOOTMETH_VBE config BOOTMETH_VBE_SIMPLE @@ -418,6 +506,54 @@ config BOOTMETH_VBE_SIMPLE firmware image in boot media such as MMC. It does not support any sort of rollback, recovery or A/B boot. +config BOOTMETH_VBE_SIMPLE_OS + bool "Bootdev support for VBE 'simple' method OS phase" + default y + help + Enables support for the OS parts of VBE 'simple' boot. This includes + fixing up the device tree with the required VBE information, ready + for booting into the OS. This option is only enabled for U-Boot + proper, since it is the phase where device tree fixups happen. + +config SPL_BOOTMETH_VBE_SIMPLE + bool "Bootdev support for VBE 'simple' method (SPL)" + depends on SPL + default y if VPL + help + Enables support for VBE 'simple' boot. This allows updating a single + firmware image in boot media such as MMC. It does not support any sort + of rollback, recovery or A/B boot. + +config VPL_BOOTMETH_VBE_SIMPLE + bool "Bootdev support for VBE 'simple' method (VPL)" + depends on VPL + default y + help + Enables support for VBE 'simple' boot. This allows updating a single + firmware image in boot media such as MMC. It does not support any sort + of rollback, recovery or A/B boot. + +config SPL_BOOTMETH_VBE_SIMPLE_FW + bool "Bootdev support for VBE 'simple' method firmware phase (SPL)" + depends on VPL + default y + help + Enables support for the firmware parts of VBE 'simple' boot. This + includes an SPL loader which locates the correct U-Boot to boot into. + This option should really only be enabled for VPL, since it is the + phase where the SPL + U-Boot decision should be made. But for now, + SPL does its own FIT-configuration selection. + +config VPL_BOOTMETH_VBE_SIMPLE_FW + bool "Bootdev support for VBE 'simple' method firmware phase (VPL)" + depends on VPL + default y + help + Enables support for the firmware parts of VBE 'simple' boot. This + includes an SPL loader which locates the correct SPL to boot into. + This option enabled for VPL, since it is the phase where the SPL + decision is made. + endif # BOOTMETH_VBE config BOOTMETH_SANDBOX @@ -487,14 +623,14 @@ config OF_STDOUT_VIA_ALIAS incorrect when used with device tree as this option does not exist / should not be used. -config HAVE_SYS_TEXT_BASE +config HAVE_TEXT_BASE bool depends on !NIOS2 && !XTENSA depends on !EFI_APP default y -config SYS_TEXT_BASE - depends on HAVE_SYS_TEXT_BASE +config TEXT_BASE + depends on HAVE_TEXT_BASE default 0x0 if POSITION_INDEPENDENT default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3 default 0x81700000 if MACH_SUNIV @@ -515,10 +651,10 @@ config HAVE_SYS_MONITOR_BASE config SYS_MONITOR_BASE depends on HAVE_SYS_MONITOR_BASE hex "Physical start address of boot monitor code" - default SYS_TEXT_BASE + default TEXT_BASE help The physical start address of boot monitor code (which is the same as - CONFIG_SYS_TEXT_BASE when linking) and the same as CONFIG_SYS_FLASH_BASE + CONFIG_TEXT_BASE when linking) and the same as CONFIG_SYS_FLASH_BASE when booting from flash. config SPL_SYS_MONITOR_BASE diff --git a/boot/Makefile b/boot/Makefile index dd45d786f8c..f0c31549213 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -47,5 +47,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o endif -obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += vbe.o vbe_fixup.o +obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += vbe.o vbe_request.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_SIMPLE) += vbe_simple.o +obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_SIMPLE_FW) += vbe_simple_fw.o +obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_SIMPLE_OS) += vbe_simple_os.o diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c index 9d98bee4549..affe0d3e04e 100644 --- a/boot/bootdev-uclass.c +++ b/boot/bootdev-uclass.c @@ -440,10 +440,7 @@ int bootdev_get_bootflow(struct udevice *dev, struct bootflow_iter *iter, if (!ops->get_bootflow) return -ENOSYS; - memset(bflow, '\0', sizeof(*bflow)); - bflow->dev = dev; - bflow->method = iter->method; - bflow->state = BOOTFLOWST_BASE; + bootflow_init(bflow, dev, iter->method); return ops->get_bootflow(dev, iter, bflow); } diff --git a/boot/bootflow.c b/boot/bootflow.c index 5d94a27ff84..f9ad4099244 100644 --- a/boot/bootflow.c +++ b/boot/bootflow.c @@ -339,6 +339,15 @@ int bootflow_scan_next(struct bootflow_iter *iter, struct bootflow *bflow) } while (1); } +void bootflow_init(struct bootflow *bflow, struct udevice *bootdev, + struct udevice *meth) +{ + memset(bflow, '\0', sizeof(*bflow)); + bflow->dev = bootdev; + bflow->method = meth; + bflow->state = BOOTFLOWST_BASE; +} + void bootflow_free(struct bootflow *bflow) { free(bflow->name); diff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c index 2d7652edeab..25552dd96f6 100644 --- a/boot/bootmeth-uclass.c +++ b/boot/bootmeth-uclass.c @@ -77,10 +77,7 @@ int bootmeth_get_bootflow(struct udevice *dev, struct bootflow *bflow) if (!ops->read_bootflow) return -ENOSYS; - memset(bflow, '\0', sizeof(*bflow)); - bflow->dev = NULL; - bflow->method = dev; - bflow->state = BOOTFLOWST_BASE; + bootflow_init(bflow, NULL, dev); return ops->read_bootflow(dev, bflow); } diff --git a/boot/image-fit.c b/boot/image-fit.c index 6e503f827dd..3cc556b727f 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -802,6 +802,40 @@ int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp) return 0; } +/** + * fit_image_get_phase() - get the phase for a configuration node + * @fit: pointer to the FIT format image header + * @offset: configuration-node offset + * @phasep: returns the phase + * + * Finds the phase property in a given configuration node. If the property is + * found, its (string) value is translated to the numeric id which is returned + * to the caller. + * + * Returns: 0 on success, -ENOENT if missing, -EINVAL for invalid value + */ +int fit_image_get_phase(const void *fit, int offset, enum image_phase_t *phasep) +{ + const void *data; + int len, ret; + + /* Get phase name from property data */ + data = fdt_getprop(fit, offset, FIT_PHASE_PROP, &len); + if (!data) { + fit_get_debug(fit, offset, FIT_PHASE_PROP, len); + *phasep = 0; + return -ENOENT; + } + + /* Translate phase name to id */ + ret = genimg_get_phase_id(data); + if (ret < 0) + return ret; + *phasep = ret; + + return 0; +} + static int fit_image_get_address(const void *fit, int noffset, char *name, ulong *load) { @@ -1686,49 +1720,6 @@ int fit_check_format(const void *fit, ulong size) return 0; } -/** - * fit_conf_find_compat - * @fit: pointer to the FIT format image header - * @fdt: pointer to the device tree to compare against - * - * fit_conf_find_compat() attempts to find the configuration whose fdt is the - * most compatible with the passed in device tree. - * - * Example: - * - * / o image-tree - * |-o images - * | |-o fdt-1 - * | |-o fdt-2 - * | - * |-o configurations - * |-o config-1 - * | |-fdt = fdt-1 - * | - * |-o config-2 - * |-fdt = fdt-2 - * - * / o U-Boot fdt - * |-compatible = "foo,bar", "bim,bam" - * - * / o kernel fdt1 - * |-compatible = "foo,bar", - * - * / o kernel fdt2 - * |-compatible = "bim,bam", "baz,biz" - * - * Configuration 1 would be picked because the first string in U-Boot's - * compatible list, "foo,bar", matches a compatible string in the root of fdt1. - * "bim,bam" in fdt2 matches the second string which isn't as good as fdt1. - * - * As an optimization, the compatible property from the FDT's root node can be - * copied into the configuration node in the FIT image. This is required to - * match configurations with compressed FDTs. - * - * returns: - * offset to the configuration to use if one was found - * -1 otherwise - */ int fit_conf_find_compat(const void *fit, const void *fdt) { int ndepth = 0; @@ -1910,10 +1901,37 @@ int fit_conf_get_prop_node_index(const void *fit, int noffset, return fit_image_get_node(fit, uname); } -int fit_conf_get_prop_node(const void *fit, int noffset, - const char *prop_name) +int fit_conf_get_prop_node(const void *fit, int noffset, const char *prop_name, + enum image_phase_t sel_phase) { - return fit_conf_get_prop_node_index(fit, noffset, prop_name, 0); + int i, count; + + if (sel_phase == IH_PHASE_NONE) + return fit_conf_get_prop_node_index(fit, noffset, prop_name, 0); + + count = fit_conf_get_prop_node_count(fit, noffset, prop_name); + if (count < 0) + return count; + + /* check each image in the list */ + for (i = 0; i < count; i++) { + enum image_phase_t phase; + int ret, node; + + node = fit_conf_get_prop_node_index(fit, noffset, prop_name, i); + ret = fit_image_get_phase(fit, node, &phase); + + /* if the image is for any phase, let's use it */ + if (ret == -ENOENT) + return node; + else if (ret < 0) + return ret; + + if (phase == sel_phase) + return node; + } + + return -ENOENT; } static int fit_get_data_tail(const void *fit, int noffset, @@ -1949,7 +1967,8 @@ int fit_get_data_conf_prop(const void *fit, const char *prop_name, { int noffset = fit_conf_get_node(fit, NULL); - noffset = fit_conf_get_prop_node(fit, noffset, prop_name); + noffset = fit_conf_get_prop_node(fit, noffset, prop_name, + IH_PHASE_NONE); return fit_get_data_tail(fit, noffset, data, size); } @@ -1987,7 +2006,8 @@ int fit_get_node_from_config(struct bootm_headers *images, return -EINVAL; } - noffset = fit_conf_get_prop_node(fit_hdr, cfg_noffset, prop_name); + noffset = fit_conf_get_prop_node(fit_hdr, cfg_noffset, prop_name, + IH_PHASE_NONE); if (noffset < 0) { debug("* %s: no '%s' in config\n", prop_name, prop_name); return -ENOENT; @@ -2033,9 +2053,10 @@ static const char *fit_get_image_type_property(int type) int fit_image_load(struct bootm_headers *images, ulong addr, const char **fit_unamep, const char **fit_uname_configp, - int arch, int image_type, int bootstage_id, + int arch, int ph_type, int bootstage_id, enum fit_load_op load_op, ulong *datap, ulong *lenp) { + int image_type = image_ph_type(ph_type); int cfg_noffset, noffset; const char *fit_uname; const char *fit_uname_config; @@ -2081,8 +2102,7 @@ int fit_image_load(struct bootm_headers *images, ulong addr, if (IS_ENABLED(CONFIG_FIT_BEST_MATCH) && !fit_uname_config) { cfg_noffset = fit_conf_find_compat(fit, gd_fdt_blob()); } else { - cfg_noffset = fit_conf_get_node(fit, - fit_uname_config); + cfg_noffset = fit_conf_get_node(fit, fit_uname_config); } if (cfg_noffset < 0) { puts("Could not find configuration node\n"); @@ -2110,8 +2130,8 @@ int fit_image_load(struct bootm_headers *images, ulong addr, bootstage_mark(BOOTSTAGE_ID_FIT_CONFIG); - noffset = fit_conf_get_prop_node(fit, cfg_noffset, - prop_name); + noffset = fit_conf_get_prop_node(fit, cfg_noffset, prop_name, + image_ph_phase(ph_type)); fit_uname = fit_get_name(fit, noffset, NULL); } if (noffset < 0) { diff --git a/boot/image.c b/boot/image.c index 9f95b3260a8..b33d1dfc6b3 100644 --- a/boot/image.c +++ b/boot/image.c @@ -194,6 +194,13 @@ static const table_entry_t uimage_comp[] = { { -1, "", "", }, }; +static const table_entry_t uimage_phase[] = { + { IH_PHASE_NONE, "none", "any", }, + { IH_PHASE_U_BOOT, "u-boot", "U-Boot phase", }, + { IH_PHASE_SPL, "spl", "SPL Phase", }, + { -1, "", "", }, +}; + struct table_info { const char *desc; int count; @@ -215,6 +222,7 @@ static const struct table_info table_info[IH_COUNT] = { { "compression", IH_COMP_COUNT, uimage_comp }, { "operating system", IH_OS_COUNT, uimage_os }, { "image type", IH_TYPE_COUNT, uimage_type }, + { "phase", IH_PHASE_COUNT, uimage_phase }, }; /*****************************************************************************/ @@ -656,6 +664,11 @@ const char *genimg_get_comp_name(uint8_t comp) comp)); } +const char *genimg_get_phase_name(enum image_phase_t phase) +{ + return get_table_entry_name(uimage_phase, "Unknown Phase", phase); +} + static const char *genimg_get_short_name(const table_entry_t *table, int val) { table = get_table_entry(table, val); @@ -731,3 +744,8 @@ int genimg_get_comp_id(const char *name) { return (get_table_entry_id(uimage_comp, "Compression", name)); } + +int genimg_get_phase_id(const char *name) +{ + return get_table_entry_id(uimage_phase, "Phase", name); +} diff --git a/boot/vbe_fixup.c b/boot/vbe_request.c index 53d88678c92..45f1d2b7e17 100644 --- a/boot/vbe_fixup.c +++ b/boot/vbe_request.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Verified Boot for Embedded (VBE) device tree fixup functions + * Verified Boot for Embedded (VBE) OS request (device tree fixup) functions * * Copyright 2022 Google LLC * Written by Simon Glass <sjg@chromium.org> @@ -36,7 +36,7 @@ static int handle_random_req(ofnode node, int default_size, u32 size; int ret; - if (!IS_ENABLED(CONFIG_DM_RNG)) + if (!CONFIG_IS_ENABLED(DM_RNG)) return -ENOTSUPP; if (ofnode_read_u32(node, "vbe,size", &size)) { @@ -195,8 +195,8 @@ static int bootmeth_vbe_ft_fixup(void *ctx, struct event *event) ret = vbe_process_request(dest, &result); if (ret) { result.errnum = ret; - log_err("Failed to process VBE request %s (err=%d)\n", - ofnode_get_name(dest), ret); + log_warning("Failed to process VBE request %s (err=%d)\n", + ofnode_get_name(dest), ret); if (*result.err_str) { char *msg = strdup(result.err_str); diff --git a/boot/vbe_simple.c b/boot/vbe_simple.c index 076b650c25a..59676d8613f 100644 --- a/boot/vbe_simple.c +++ b/boot/vbe_simple.c @@ -9,55 +9,18 @@ #define LOG_CATEGORY LOGC_BOOT #include <common.h> -#include <log.h> -#include <memalign.h> -#include <part.h> +#include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> #include <dm.h> +#include <log.h> +#include <memalign.h> #include <mmc.h> #include <vbe.h> -#include <version_string.h> #include <dm/device-internal.h> #include <dm/ofnode.h> #include <u-boot/crc.h> - -enum { - MAX_VERSION_LEN = 256, - - NVD_HDR_VER_SHIFT = 0, - NVD_HDR_VER_MASK = 0xf, - NVD_HDR_SIZE_SHIFT = 4, - NVD_HDR_SIZE_MASK = 0xf << NVD_HDR_SIZE_SHIFT, - - /* Firmware key-version is in the top 16 bits of fw_ver */ - FWVER_KEY_SHIFT = 16, - FWVER_FW_MASK = 0xffff, - - NVD_HDR_VER_CUR = 1, /* current version */ -}; - -/** struct simple_priv - information read from the device tree */ -struct simple_priv { - u32 area_start; - u32 area_size; - u32 skip_offset; - u32 state_offset; - u32 state_size; - u32 version_offset; - u32 version_size; - const char *storage; -}; - -/** struct simple_state - state information read from media - * - * @fw_version: Firmware version string - * @fw_vernum: Firmware version number - */ -struct simple_state { - char fw_version[MAX_VERSION_LEN]; - u32 fw_vernum; -}; +#include "vbe_simple.h" /** struct simple_nvdata - storage format for non-volatile data */ struct simple_nvdata { @@ -127,7 +90,7 @@ static int simple_read_nvdata(struct udevice *dev, struct blk_desc *desc, return 0; } -static int simple_read_state(struct udevice *dev, struct simple_state *state) +int vbe_simple_read_state(struct udevice *dev, struct simple_state *state) { ALLOC_CACHE_ALIGN_BUFFER(u8, buf, MMC_MAX_BLOCK_LEN); struct simple_priv *priv = dev_get_priv(dev); @@ -168,7 +131,7 @@ static int vbe_simple_get_state_desc(struct udevice *dev, char *buf, struct simple_state state; int ret; - ret = simple_read_state(dev, &state); + ret = vbe_simple_read_state(dev, &state); if (ret) return log_msg_ret("read", ret); @@ -183,88 +146,39 @@ static int vbe_simple_get_state_desc(struct udevice *dev, char *buf, static int vbe_simple_read_bootflow(struct udevice *dev, struct bootflow *bflow) { - /* To be implemented */ - - return -EINVAL; -} - -static struct bootmeth_ops bootmeth_vbe_simple_ops = { - .get_state_desc = vbe_simple_get_state_desc, - .read_bootflow = vbe_simple_read_bootflow, - .read_file = bootmeth_common_read_file, -}; - -int vbe_simple_fixup_node(ofnode node, struct simple_state *state) -{ - char *version; int ret; - version = strdup(state->fw_version); - if (!version) - return log_msg_ret("dup", -ENOMEM); - - ret = ofnode_write_string(node, "cur-version", version); - if (ret) - return log_msg_ret("ver", ret); - ret = ofnode_write_u32(node, "cur-vernum", state->fw_vernum); - if (ret) - return log_msg_ret("num", ret); - ret = ofnode_write_string(node, "bootloader-version", version_string); - if (ret) - return log_msg_ret("bl", ret); + if (vbe_phase() == VBE_PHASE_FIRMWARE) { + ret = vbe_simple_read_bootflow_fw(dev, bflow); + if (ret) + return log_msg_ret("fw", ret); + return 0; + } - return 0; + return -EINVAL; } -/** - * bootmeth_vbe_simple_ft_fixup() - Write out all VBE simple data to the DT - * - * @ctx: Context for event - * @event: Event to process - * @return 0 if OK, -ve on error - */ -static int bootmeth_vbe_simple_ft_fixup(void *ctx, struct event *event) +static int vbe_simple_read_file(struct udevice *dev, struct bootflow *bflow, + const char *file_path, ulong addr, ulong *sizep) { - oftree tree = event->data.ft_fixup.tree; - struct udevice *dev; - - /* - * Ideally we would have driver model support for fixups, but that does - * not exist yet. It is a step too far to try to do this before VBE is - * in place. - */ - for (vbe_find_first_device(&dev); dev; vbe_find_next_device(&dev)) { - struct simple_state state; - ofnode node, subnode; - int ret; - - if (strcmp("vbe_simple", dev->driver->name)) - continue; - - /* Check if there is a node to fix up */ - node = oftree_path(tree, "/chosen/fwupd"); - if (!ofnode_valid(node)) - continue; - subnode = ofnode_find_subnode(node, dev->name); - if (!ofnode_valid(subnode)) - continue; - - log_debug("Fixing up: %s\n", dev->name); - ret = device_probe(dev); - if (ret) - return log_msg_ret("probe", ret); - ret = simple_read_state(dev, &state); - if (ret) - return log_msg_ret("read", ret); + int ret; - ret = vbe_simple_fixup_node(subnode, &state); + if (vbe_phase() == VBE_PHASE_OS) { + ret = bootmeth_common_read_file(dev, bflow, file_path, addr, + sizep); if (ret) - return log_msg_ret("fix", ret); + return log_msg_ret("os", ret); } - return 0; + /* To be implemented */ + return -EINVAL; } -EVENT_SPY(EVT_FT_FIXUP, bootmeth_vbe_simple_ft_fixup); + +static struct bootmeth_ops bootmeth_vbe_simple_ops = { + .get_state_desc = vbe_simple_get_state_desc, + .read_bootflow = vbe_simple_read_bootflow, + .read_file = vbe_simple_read_file, +}; static int bootmeth_vbe_simple_probe(struct udevice *dev) { diff --git a/boot/vbe_simple.h b/boot/vbe_simple.h new file mode 100644 index 00000000000..56d319206f2 --- /dev/null +++ b/boot/vbe_simple.h @@ -0,0 +1,71 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Verified Boot for Embedded (VBE) vbe-simple common file + * + * Copyright 2022 Google LLC + * Written by Simon Glass <sjg@chromium.org> + */ + +#ifndef __VBE_SIMPLE_H +#define __VBE_SIMPLE_H + +enum { + MAX_VERSION_LEN = 256, + + NVD_HDR_VER_SHIFT = 0, + NVD_HDR_VER_MASK = 0xf, + NVD_HDR_SIZE_SHIFT = 4, + NVD_HDR_SIZE_MASK = 0xf << NVD_HDR_SIZE_SHIFT, + + /* Firmware key-version is in the top 16 bits of fw_ver */ + FWVER_KEY_SHIFT = 16, + FWVER_FW_MASK = 0xffff, + + NVD_HDR_VER_CUR = 1, /* current version */ +}; + +/** struct simple_priv - information read from the device tree */ +struct simple_priv { + u32 area_start; + u32 area_size; + u32 skip_offset; + u32 state_offset; + u32 state_size; + u32 version_offset; + u32 version_size; + const char *storage; +}; + +/** struct simple_state - state information read from media + * + * @fw_version: Firmware version string + * @fw_vernum: Firmware version number + */ +struct simple_state { + char fw_version[MAX_VERSION_LEN]; + u32 fw_vernum; +}; + +/** + * vbe_simple_read_fw_bootflow() - Read a bootflow for firmware + * + * Locates and loads the firmware image (FIT) needed for the next phase. The FIT + * should ideally use external data, to reduce the amount of it that needs to be + * read. + * + * @bdev: bootdev device containing the firmwre + * @blow: Place to put the created bootflow, on success + * @return 0 if OK, -ve on error + */ +int vbe_simple_read_bootflow_fw(struct udevice *dev, struct bootflow *bflow); + +/** + * vbe_simple_read_state() - Read the VBE simple state information + * + * @dev: VBE bootmeth + * @state: Place to put the state + * @return 0 if OK, -ve on error + */ +int vbe_simple_read_state(struct udevice *dev, struct simple_state *state); + +#endif /* __VBE_SIMPLE_H */ diff --git a/boot/vbe_simple_fw.c b/boot/vbe_simple_fw.c new file mode 100644 index 00000000000..0a49d286703 --- /dev/null +++ b/boot/vbe_simple_fw.c @@ -0,0 +1,206 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Verified Boot for Embedded (VBE) loading firmware phases + * + * Copyright 2022 Google LLC + * Written by Simon Glass <sjg@chromium.org> + */ + +#define LOG_CATEGORY LOGC_BOOT + +#include <common.h> +#include <bloblist.h> +#include <bootdev.h> +#include <bootflow.h> +#include <bootmeth.h> +#include <bootstage.h> +#include <dm.h> +#include <image.h> +#include <log.h> +#include <mapmem.h> +#include <memalign.h> +#include <mmc.h> +#include <spl.h> +#include <vbe.h> +#include <dm/device-internal.h> +#include "vbe_simple.h" + +/** + * vbe_simple_read_bootflow_fw() - Create a bootflow for firmware + * + * Locates and loads the firmware image (FIT) needed for the next phase. The FIT + * should ideally use external data, to reduce the amount of it that needs to be + * read. + * + * @bdev: bootdev device containing the firmwre + * @meth: VBE simple bootmeth + * @blow: Place to put the created bootflow, on success + * @return 0 if OK, -ve on error + */ +int vbe_simple_read_bootflow_fw(struct udevice *dev, struct bootflow *bflow) +{ + ALLOC_CACHE_ALIGN_BUFFER(u8, sbuf, MMC_MAX_BLOCK_LEN); + struct udevice *media = dev_get_parent(bflow->dev); + struct udevice *meth = bflow->method; + struct simple_priv *priv = dev_get_priv(meth); + const char *fit_uname, *fit_uname_config; + struct bootm_headers images = {}; + ulong offset, size, blknum, addr, len, load_addr, num_blks; + enum image_phase_t phase; + struct blk_desc *desc; + struct udevice *blk; + int node, ret; + void *buf; + + log_debug("media=%s\n", media->name); + ret = blk_get_from_parent(media, &blk); + if (ret) + return log_msg_ret("med", ret); + log_debug("blk=%s\n", blk->name); + desc = dev_get_uclass_plat(blk); + + offset = priv->area_start + priv->skip_offset; + + /* read in one block to find the FIT size */ + blknum = offset / desc->blksz; + log_debug("read at %lx, blknum %lx\n", offset, blknum); + ret = blk_read(blk, blknum, 1, sbuf); + if (ret < 0) + return log_msg_ret("rd", ret); + + ret = fdt_check_header(sbuf); + if (ret < 0) + return log_msg_ret("fdt", -EINVAL); + size = fdt_totalsize(sbuf); + if (size > priv->area_size) + return log_msg_ret("fdt", -E2BIG); + log_debug("FIT size %lx\n", size); + + /* + * Load the FIT into the SPL memory. This is typically a FIT with + * external data, so this is quite small, perhaps a few KB. + */ + addr = CONFIG_VAL(TEXT_BASE); + buf = map_sysmem(addr, size); + num_blks = DIV_ROUND_UP(size, desc->blksz); + log_debug("read %lx, %lx blocks to %lx / %p\n", size, num_blks, addr, + buf); + ret = blk_read(blk, blknum, num_blks, buf); + if (ret < 0) + return log_msg_ret("rd", ret); + + /* figure out the phase to load */ + phase = IS_ENABLED(CONFIG_VPL_BUILD) ? IH_PHASE_SPL : IH_PHASE_U_BOOT; + + /* + * Load the image from the FIT. We ignore any load-address information + * so in practice this simply locates the image in the external-data + * region and returns its address and size. Since we only loaded the FIT + * itself, only a part of the image will be present, at best. + */ + fit_uname = NULL; + fit_uname_config = NULL; + log_debug("loading FIT\n"); + ret = fit_image_load(&images, addr, &fit_uname, &fit_uname_config, + IH_ARCH_SANDBOX, image_ph(phase, IH_TYPE_FIRMWARE), + BOOTSTAGE_ID_FIT_SPL_START, FIT_LOAD_IGNORED, + &load_addr, &len); + if (ret < 0) + return log_msg_ret("ld", ret); + node = ret; + log_debug("loaded to %lx\n", load_addr); + + /* For FIT external data, read in the external data */ + if (load_addr + len > addr + size) { + ulong base, full_size; + void *base_buf; + + /* Find the start address to load from */ + base = ALIGN_DOWN(load_addr, desc->blksz); + + /* + * Get the total number of bytes to load, taking care of + * block alignment + */ + full_size = load_addr + len - base; + + /* + * Get the start block number, number of blocks and the address + * to load to, then load the blocks + */ + blknum = (offset + base - addr) / desc->blksz; + num_blks = DIV_ROUND_UP(full_size, desc->blksz); + base_buf = map_sysmem(base, full_size); + ret = blk_read(blk, blknum, num_blks, base_buf); + log_debug("read %lx %lx, %lx blocks to %lx / %p: ret=%d\n", + blknum, full_size, num_blks, base, base_buf, ret); + if (ret < 0) + return log_msg_ret("rd", ret); + } + + /* set up the bootflow with the info we obtained */ + bflow->name = strdup(fdt_get_name(buf, node, NULL)); + if (!bflow->name) + return log_msg_ret("name", -ENOMEM); + bflow->blk = blk; + bflow->buf = map_sysmem(load_addr, len); + bflow->size = len; + + return 0; +} + +static int simple_load_from_image(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev) +{ + struct udevice *meth, *bdev; + struct simple_priv *priv; + struct bootflow bflow; + struct vbe_handoff *handoff; + int ret; + + if (spl_phase() != PHASE_VPL && spl_phase() != PHASE_SPL) + return -ENOENT; + + ret = bloblist_ensure_size(BLOBLISTT_VBE, sizeof(struct vbe_handoff), + 0, (void **)&handoff); + if (ret) + return log_msg_ret("ro", ret); + + vbe_find_first_device(&meth); + if (!meth) + return log_msg_ret("vd", -ENODEV); + log_debug("vbe dev %s\n", meth->name); + ret = device_probe(meth); + if (ret) + return log_msg_ret("probe", ret); + + priv = dev_get_priv(meth); + log_debug("simple %s\n", priv->storage); + ret = bootdev_find_by_label(priv->storage, &bdev); + if (ret) + return log_msg_ret("bd", ret); + log_debug("bootdev %s\n", bdev->name); + + bootflow_init(&bflow, bdev, meth); + ret = bootmeth_read_bootflow(meth, &bflow); + log_debug("\nfw ret=%d\n", ret); + if (ret) + return log_msg_ret("rd", ret); + + /* jump to the image */ + spl_image->flags = SPL_SANDBOXF_ARG_IS_BUF; + spl_image->arg = bflow.buf; + spl_image->size = bflow.size; + log_debug("Image: %s at %p size %x\n", bflow.name, bflow.buf, + bflow.size); + + /* this is not used from now on, so free it */ + bootflow_free(&bflow); + + /* Record that VBE was used in this phase */ + handoff->phases |= 1 << spl_phase(); + + return 0; +} +SPL_LOAD_IMAGE_METHOD("vbe_simple", 5, BOOT_DEVICE_VBE, + simple_load_from_image); diff --git a/boot/vbe_simple_os.c b/boot/vbe_simple_os.c new file mode 100644 index 00000000000..b2041a95a30 --- /dev/null +++ b/boot/vbe_simple_os.c @@ -0,0 +1,104 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Verified Boot for Embedded (VBE) loading firmware phases + * + * Copyright 2022 Google LLC + * Written by Simon Glass <sjg@chromium.org> + */ + +#define LOG_CATEGORY LOGC_BOOT + +#include <common.h> +#include <dm.h> +#include <bootflow.h> +#include <vbe.h> +#include <version_string.h> +#include <dm/device-internal.h> +#include "vbe_simple.h" + +int vbe_simple_fixup_node(ofnode node, struct simple_state *state) +{ + const char *version, *str; + int ret; + + version = strdup(state->fw_version); + if (!version) + return log_msg_ret("dup", -ENOMEM); + + ret = ofnode_write_string(node, "cur-version", version); + if (ret) + return log_msg_ret("ver", ret); + ret = ofnode_write_u32(node, "cur-vernum", state->fw_vernum); + if (ret) + return log_msg_ret("num", ret); + + /* Drop the 'U-Boot ' at the start */ + str = version_string; + if (!strncmp("U-Boot ", str, 7)) + str += 7; + ret = ofnode_write_string(node, "bootloader-version", str); + if (ret) + return log_msg_ret("bl", ret); + + return 0; +} + +/** + * bootmeth_vbe_simple_ft_fixup() - Write out all VBE simple data to the DT + * + * @ctx: Context for event + * @event: Event to process + * @return 0 if OK, -ve on error + */ +static int bootmeth_vbe_simple_ft_fixup(void *ctx, struct event *event) +{ + oftree tree = event->data.ft_fixup.tree; + struct udevice *dev; + + /* + * Ideally we would have driver model support for fixups, but that does + * not exist yet. It is a step too far to try to do this before VBE is + * in place. + */ + for (vbe_find_first_device(&dev); dev; vbe_find_next_device(&dev)) { + struct simple_state state; + ofnode node, subnode, chosen; + int ret; + + if (strcmp("vbe_simple", dev->driver->name)) + continue; + + /* Check if there is a node to fix up, adding if not */ + chosen = oftree_path(tree, "/chosen"); + if (!ofnode_valid(chosen)) + continue; + ret = ofnode_add_subnode(chosen, "fwupd", &node); + if (ret && ret != -EEXIST) + return log_msg_ret("fwu", ret); + + ret = ofnode_add_subnode(node, dev->name, &subnode); + if (ret && ret != -EEXIST) + return log_msg_ret("dev", ret); + + ret = device_probe(dev); + if (ret) + return log_msg_ret("probe", ret); + + /* Copy over the vbe properties for fwupd */ + log_debug("Fixing up: %s\n", dev->name); + ret = ofnode_copy_props(dev_ofnode(dev), subnode); + if (ret) + return log_msg_ret("cp", ret); + + ret = vbe_simple_read_state(dev, &state); + if (ret) + return log_msg_ret("read", ret); + + ret = vbe_simple_fixup_node(subnode, &state); + if (ret) + return log_msg_ret("fix", ret); + } + + return 0; +} +EVENT_SPY(EVT_FT_FIXUP, bootmeth_vbe_simple_ft_fixup); @@ -558,7 +558,7 @@ static int do_spi_flash_test(int argc, char *const argv[]) return 1; } - from = map_sysmem(CONFIG_SYS_TEXT_BASE, 0); + from = map_sysmem(CONFIG_TEXT_BASE, 0); memcpy(buf, from, len); ret = spi_flash_test(flash, buf, len, offset, vbuf); free(vbuf); diff --git a/cmd/vbe.c b/cmd/vbe.c index a5737edc047..befaf07c64d 100644 --- a/cmd/vbe.c +++ b/cmd/vbe.c @@ -7,9 +7,11 @@ */ #include <common.h> +#include <bloblist.h> #include <bootmeth.h> #include <bootstd.h> #include <command.h> +#include <spl.h> #include <vbe.h> static int do_vbe_list(struct cmd_tbl *cmdtp, int flag, int argc, @@ -74,14 +76,41 @@ static int do_vbe_info(struct cmd_tbl *cmdtp, int flag, int argc, return 0; } +static int do_vbe_state(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + struct vbe_handoff *handoff; + int i; + + handoff = bloblist_find(BLOBLISTT_VBE, sizeof(struct vbe_handoff)); + if (!handoff) { + printf("No VBE state\n"); + return CMD_RET_FAILURE; + } + + printf("Phases:"); + for (i = PHASE_NONE; i < PHASE_COUNT; i++) { + if (handoff->phases & (1 << i)) + printf(" %s", spl_phase_name(i)); + + } + if (!handoff->phases) + printf(" (none)"); + printf("\n"); + + return 0; +} + #ifdef CONFIG_SYS_LONGHELP static char vbe_help_text[] = "list - list VBE bootmeths\n" "vbe select - select a VBE bootmeth by sequence or name\n" - "vbe info - show information about a VBE bootmeth"; + "vbe info - show information about a VBE bootmeth\n" + "vbe state - show VBE state"; #endif U_BOOT_CMD_WITH_SUBCMDS(vbe, "Verified Boot for Embedded", vbe_help_text, U_BOOT_SUBCMD_MKENT(list, 1, 1, do_vbe_list), U_BOOT_SUBCMD_MKENT(select, 2, 1, do_vbe_select), + U_BOOT_SUBCMD_MKENT(state, 2, 1, do_vbe_state), U_BOOT_SUBCMD_MKENT(info, 2, 1, do_vbe_info)); diff --git a/common/Kconfig b/common/Kconfig index 62e7fb5d0e9..21434c5cf16 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -113,6 +113,28 @@ config SILENT_CONSOLE GD_FLG_SILENT flag is set. Changing the environment variable later will update the flag. +config SPL_SILENT_CONSOLE + bool "Use a silent console in SPL" + default y if SILENT_CONSOLE && !SANDBOX + help + This selects a silent console in SPL. When enabled it drops some + output messages. The GD_FLG_SILENT flag is not used in SPL so there + is no run-time control of console messages in SPL. + + Future work may allow the SPL console to be silenced completely using + this option. + +config TPL_SILENT_CONSOLE + bool "Use a silent console in TPL" + default y if SILENT_CONSOLE && !SANDBOX + help + This selects a silent console in TPL. When enabled it drops some + output messages. The GD_FLG_SILENT flag is not used in TPL so there + is no run-time control of console messages in TPL. + + Future work may allow the TPL console to be silenced completely using + this option. + config SILENT_U_BOOT_ONLY bool "Only silence the U-Boot console" depends on SILENT_CONSOLE @@ -1043,6 +1065,13 @@ config SPL_IMAGE_SIGN_INFO help Enable image_sign_info helper functions in SPL. +config VPL_IMAGE_SIGN_INFO + bool + select SHA1 + select SHA256 + help + Enable image_sign_info helper functions in SPL. + endif config FDT_SIMPLEFB diff --git a/common/autoboot.c b/common/autoboot.c index cdafe76309b..ea44fdf6add 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -424,19 +424,19 @@ static int abortboot(int bootdelay) static void process_fdt_options(const void *blob) { -#ifdef CONFIG_SYS_TEXT_BASE +#ifdef CONFIG_TEXT_BASE ulong addr; /* Add an env variable to point to a kernel payload, if available */ addr = ofnode_conf_read_int("kernel-offset", 0); if (addr) - env_set_addr("kernaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr)); + env_set_addr("kernaddr", (void *)(CONFIG_TEXT_BASE + addr)); /* Add an env variable to point to a root disk, if available */ addr = ofnode_conf_read_int("rootdisk-offset", 0); if (addr) - env_set_addr("rootaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr)); -#endif /* CONFIG_SYS_TEXT_BASE */ + env_set_addr("rootaddr", (void *)(CONFIG_TEXT_BASE + addr)); +#endif /* CONFIG_TEXT_BASE */ } const char *bootdelay_process(void) diff --git a/common/bloblist.c b/common/bloblist.c index 8488663354b..0d63b6e8817 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -4,7 +4,6 @@ * Written by Simon Glass <sjg@chromium.org> */ -#define LOG_DEBUG #define LOG_CATEGORY LOGC_BLOBLIST #include <common.h> diff --git a/common/board_f.c b/common/board_f.c index 51ba5931899..faa096479b3 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -127,8 +127,8 @@ static int display_text_info(void) bss_start = (ulong)&__bss_start; bss_end = (ulong)&__bss_end; -#ifdef CONFIG_SYS_TEXT_BASE - text_base = CONFIG_SYS_TEXT_BASE; +#ifdef CONFIG_TEXT_BASE + text_base = CONFIG_TEXT_BASE; #else text_base = CONFIG_SYS_MONITOR_BASE; #endif @@ -689,7 +689,7 @@ static int reloc_bloblist(void) static int setup_reloc(void) { if (!(gd->flags & GD_FLG_SKIP_RELOC)) { -#ifdef CONFIG_SYS_TEXT_BASE +#ifdef CONFIG_TEXT_BASE #ifdef ARM gd->reloc_off = gd->relocaddr - (unsigned long)__image_copy_start; #elif defined(CONFIG_MICROBLAZE) @@ -699,9 +699,9 @@ static int setup_reloc(void) * On all ColdFire arch cpu, monitor code starts always * just after the default vector table location, so at 0x400 */ - gd->reloc_off = gd->relocaddr - (CONFIG_SYS_TEXT_BASE + 0x400); + gd->reloc_off = gd->relocaddr - (CONFIG_TEXT_BASE + 0x400); #elif !defined(CONFIG_SANDBOX) - gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE; + gd->reloc_off = gd->relocaddr - CONFIG_TEXT_BASE; #endif #endif } diff --git a/common/board_r.c b/common/board_r.c index 92ca2066ee3..98653de0553 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -369,7 +369,7 @@ static int initr_flash(void) #if defined(CONFIG_OXC) || defined(CONFIG_RMU) /* flash mapped at end of memory map */ - bd->bi_flashoffset = CONFIG_SYS_TEXT_BASE + flash_size; + bd->bi_flashoffset = CONFIG_TEXT_BASE + flash_size; #elif CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE bd->bi_flashoffset = monitor_flash_len; /* reserved area for monitor */ #endif diff --git a/common/spl/Kconfig.vpl b/common/spl/Kconfig.vpl index f33162276d9..ae1a3c724f3 100644 --- a/common/spl/Kconfig.vpl +++ b/common/spl/Kconfig.vpl @@ -133,6 +133,36 @@ config VPL_I2C_SUPPORT Enable support for the I2C bus in VPL. Vee SPL_I2C_SUPPORT for details. +config VPL_MMC + bool "Support MMC in VPL" + depends on VPL && MMC + default y if MMC + help + Enable support for MMC (Multimedia Card) within VPL This enables + the MMC protocol implementation and allows any enabled drivers to + be used within VPL. MMC can be used with or without disk partition + support depending on the application (SPL_LIBDISK_SUPPORT). Enable + this option to build the drivers in drivers/mmc as part of an VPL + build. + +config VPL_DM_MMC + bool "Enable MMC controllers using Driver Model in VPL" + depends on VPL_DM && DM_MMC + default y + help + This enables the MultiMediaCard (MMC) uclass which supports MMC and + Secure Digital I/O (SDIO) cards. Both removable (SD, micro-SD, etc.) + and non-removable (e.g. eMMC chip) devices are supported. These + appear as block devices in U-Boot and can support filesystems such + as EXT4 and FAT. + +config VPL_MMC_WRITE + bool "MMC/SD/SDIO card support for write operations in VPL" + depends on VPL_MMC + default y + help + Enable write access to MMC and SD Cards in VPL + config VPL_PCH_SUPPORT bool "Support PCH drivers" default y if TPL_PCH_SUPPORT diff --git a/common/spl/spl.c b/common/spl/spl.c index 752b5b247cb..6f2014b0e22 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -44,7 +44,7 @@ DECLARE_GLOBAL_DATA_PTR; DECLARE_BINMAN_MAGIC_SYM; #ifndef CONFIG_SYS_UBOOT_START -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_START CONFIG_TEXT_BASE #endif #ifndef CONFIG_SYS_MONITOR_LEN /* Unknown U-Boot size, let's assume it will not be more than 200 KB */ @@ -59,13 +59,13 @@ binman_sym_declare(ulong, u_boot_any, image_pos); binman_sym_declare(ulong, u_boot_any, size); #ifdef CONFIG_TPL -binman_sym_declare(ulong, u_boot_spl, image_pos); -binman_sym_declare(ulong, u_boot_spl, size); +binman_sym_declare(ulong, u_boot_spl_any, image_pos); +binman_sym_declare(ulong, u_boot_spl_any, size); #endif #ifdef CONFIG_VPL -binman_sym_declare(ulong, u_boot_vpl, image_pos); -binman_sym_declare(ulong, u_boot_vpl, size); +binman_sym_declare(ulong, u_boot_vpl_any, image_pos); +binman_sym_declare(ulong, u_boot_vpl_any, size); #endif #endif /* BINMAN_UBOOT_SYMBOLS */ @@ -164,10 +164,10 @@ ulong spl_get_image_pos(void) #ifdef CONFIG_VPL if (spl_next_phase() == PHASE_VPL) - return binman_sym(ulong, u_boot_vpl, image_pos); + return binman_sym(ulong, u_boot_vpl_any, image_pos); #endif return spl_next_phase() == PHASE_SPL ? - binman_sym(ulong, u_boot_spl, image_pos) : + binman_sym(ulong, u_boot_spl_any, image_pos) : binman_sym(ulong, u_boot_any, image_pos); } @@ -178,10 +178,10 @@ ulong spl_get_image_size(void) #ifdef CONFIG_VPL if (spl_next_phase() == PHASE_VPL) - return binman_sym(ulong, u_boot_vpl, size); + return binman_sym(ulong, u_boot_vpl_any, size); #endif return spl_next_phase() == PHASE_SPL ? - binman_sym(ulong, u_boot_spl, size) : + binman_sym(ulong, u_boot_spl_any, size) : binman_sym(ulong, u_boot_any, size); } @@ -192,7 +192,7 @@ ulong spl_get_image_text_base(void) return CONFIG_VPL_TEXT_BASE; #endif return spl_next_phase() == PHASE_SPL ? CONFIG_SPL_TEXT_BASE : - CONFIG_SYS_TEXT_BASE; + CONFIG_TEXT_BASE; } /* @@ -229,7 +229,7 @@ __weak void spl_board_prepare_for_boot(void) __weak struct legacy_img_hdr *spl_get_load_buffer(ssize_t offset, size_t size) { - return map_sysmem(CONFIG_SYS_TEXT_BASE + offset, 0); + return map_sysmem(CONFIG_TEXT_BASE + offset, 0); } void spl_set_header_raw_uboot(struct spl_image_info *spl_image) @@ -249,7 +249,7 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image) spl_image->load_addr = u_boot_pos; } else { spl_image->entry_point = CONFIG_SYS_UBOOT_START; - spl_image->load_addr = CONFIG_SYS_TEXT_BASE; + spl_image->load_addr = CONFIG_TEXT_BASE; } spl_image->os = IH_OS_U_BOOT; spl_image->name = "U-Boot"; @@ -630,23 +630,6 @@ __weak void board_boot_order(u32 *spl_boot_list) spl_boot_list[0] = spl_boot_device(); } -static struct spl_image_loader *spl_ll_find_loader(uint boot_device) -{ - struct spl_image_loader *drv = - ll_entry_start(struct spl_image_loader, spl_image_loader); - const int n_ents = - ll_entry_count(struct spl_image_loader, spl_image_loader); - struct spl_image_loader *entry; - - for (entry = drv; entry != drv + n_ents; entry++) { - if (boot_device == entry->boot_device) - return entry; - } - - /* Not found */ - return NULL; -} - __weak int spl_check_board_image(struct spl_image_info *spl_image, const struct spl_boot_device *bootdev) { @@ -693,6 +676,10 @@ static int spl_load_image(struct spl_image_info *spl_image, static int boot_from_devices(struct spl_image_info *spl_image, u32 spl_boot_list[], int count) { + struct spl_image_loader *drv = + ll_entry_start(struct spl_image_loader, spl_image_loader); + const int n_ents = + ll_entry_count(struct spl_image_loader, spl_image_loader); int ret = -ENODEV; int i; @@ -702,22 +689,27 @@ static int boot_from_devices(struct spl_image_info *spl_image, if (CONFIG_IS_ENABLED(SHOW_ERRORS)) ret = -ENXIO; - loader = spl_ll_find_loader(bootdev); - if (CONFIG_IS_ENABLED(SERIAL) && - CONFIG_IS_ENABLED(LIBCOMMON_SUPPORT) && - !IS_ENABLED(CONFIG_SILENT_CONSOLE)) { - if (loader) - printf("Trying to boot from %s\n", - spl_loader_name(loader)); - else if (CONFIG_IS_ENABLED(SHOW_ERRORS)) - printf(SPL_TPL_PROMPT - "Unsupported Boot Device %d\n", bootdev); - else - puts(SPL_TPL_PROMPT "Unsupported Boot Device!\n"); - } - if (loader && !spl_load_image(spl_image, loader)) { - spl_image->boot_device = bootdev; - return 0; + for (loader = drv; loader != drv + n_ents; loader++) { + if (bootdev != loader->boot_device) + continue; + if (!CONFIG_IS_ENABLED(SILENT_CONSOLE)) { + if (loader) + printf("Trying to boot from %s\n", + spl_loader_name(loader)); + else if (CONFIG_IS_ENABLED(SHOW_ERRORS)) { + printf(SPL_TPL_PROMPT + "Unsupported Boot Device %d\n", + bootdev); + } else { + puts(SPL_TPL_PROMPT + "Unsupported Boot Device!\n"); + } + } + if (loader && + !spl_load_image(spl_image, loader)) { + spl_image->boot_device = bootdev; + return 0; + } } } diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index bae5c010c8c..2c10252834f 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -254,7 +254,7 @@ uintptr_t spl_fit_images_get_entry(void *blob, int node) void spl_invoke_atf(struct spl_image_info *spl_image) { uintptr_t bl32_entry = 0; - uintptr_t bl33_entry = CONFIG_SYS_TEXT_BASE; + uintptr_t bl33_entry = CONFIG_TEXT_BASE; void *blob = spl_image->fdt_addr; uintptr_t platform_param = (uintptr_t)blob; int node; diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 4f4c00f2a1b..25a38be65ed 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -157,11 +157,11 @@ static int spl_nand_load_image(struct spl_image_info *spl_image, */ nand_spl_load_image(CONFIG_CMD_SPL_NAND_OFS, CONFIG_CMD_SPL_WRITE_SIZE, - (void *)CONFIG_SYS_TEXT_BASE); + (void *)CONFIG_TEXT_BASE); /* copy to destintion */ for (dst = (int *)CONFIG_SYS_SPL_ARGS_ADDR, - src = (int *)CONFIG_SYS_TEXT_BASE; - src < (int *)(CONFIG_SYS_TEXT_BASE + + src = (int *)CONFIG_TEXT_BASE; + src < (int *)(CONFIG_TEXT_BASE + CONFIG_CMD_SPL_WRITE_SIZE); src++, dst++) { writel(readl(src), dst); diff --git a/common/spl/spl_optee.S b/common/spl/spl_optee.S index 8bd1949ddf3..a269904d386 100644 --- a/common/spl/spl_optee.S +++ b/common/spl/spl_optee.S @@ -7,6 +7,6 @@ #include <asm/assembler.h> ENTRY(spl_optee_entry) - ldr lr, =CONFIG_SYS_TEXT_BASE + ldr lr, =CONFIG_TEXT_BASE mov pc, r3 ENDPROC(spl_optee_entry) diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig index 9513b02d874..255a4f12c17 100644 --- a/configs/M5208EVBE_defconfig +++ b/configs/M5208EVBE_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0x0 +CONFIG_TEXT_BASE=0x0 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SECT_SIZE=0x2000 diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig index 6a2b700fc78..b5842c7d55a 100644 --- a/configs/M5235EVB_Flash32_defconfig +++ b/configs/M5235EVB_Flash32_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0xFFC00000 +CONFIG_TEXT_BASE=0xFFC00000 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig index 09f3602611b..3e9cacc4403 100644 --- a/configs/M5235EVB_defconfig +++ b/configs/M5235EVB_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0xFFE00000 +CONFIG_TEXT_BASE=0xFFE00000 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig index e4fb7ab96a8..5c6bd24de36 100644 --- a/configs/M5249EVB_defconfig +++ b/configs/M5249EVB_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0xFFE00000 +CONFIG_TEXT_BASE=0xFFE00000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig index a73aca082c3..2510774cba3 100644 --- a/configs/M5253DEMO_defconfig +++ b/configs/M5253DEMO_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0xFF800000 +CONFIG_TEXT_BASE=0xFF800000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SECT_SIZE=0x1000 diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig index 3be9296cd24..fda10e77f67 100644 --- a/configs/M5272C3_defconfig +++ b/configs/M5272C3_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0xFFE00000 +CONFIG_TEXT_BASE=0xFFE00000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig index 977d38ab64d..49caafc6f17 100644 --- a/configs/M5275EVB_defconfig +++ b/configs/M5275EVB_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0xFFE00000 +CONFIG_TEXT_BASE=0xFFE00000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig index 4b393abe112..4519e5651c6 100644 --- a/configs/M5282EVB_defconfig +++ b/configs/M5282EVB_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0xFFE00000 +CONFIG_TEXT_BASE=0xFFE00000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig index 986a9322ea9..fa32e1454b3 100644 --- a/configs/M53017EVB_defconfig +++ b/configs/M53017EVB_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0x0 +CONFIG_TEXT_BASE=0x0 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SECT_SIZE=0x8000 diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig index 0d513b75917..0c2fbaf1a08 100644 --- a/configs/M5329AFEE_defconfig +++ b/configs/M5329AFEE_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0x0 +CONFIG_TEXT_BASE=0x0 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig index f3c2d9f179c..f4b9b2d2c21 100644 --- a/configs/M5329BFEE_defconfig +++ b/configs/M5329BFEE_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0x0 +CONFIG_TEXT_BASE=0x0 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig index f462b1bb28c..922f345d6d7 100644 --- a/configs/M5373EVB_defconfig +++ b/configs/M5373EVB_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0x0 +CONFIG_TEXT_BASE=0x0 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 diff --git a/configs/MCR3000_defconfig b/configs/MCR3000_defconfig index d34163515a1..307f2be436c 100644 --- a/configs/MCR3000_defconfig +++ b/configs/MCR3000_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x4000000 +CONFIG_TEXT_BASE=0x4000000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="mcr3000" diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig index 6188e88cc31..ebbbac3b9ed 100644 --- a/configs/MPC837XERDB_defconfig +++ b/configs/MPC837XERDB_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xFE000000 +CONFIG_TEXT_BASE=0xFE000000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SECT_SIZE=0x10000 diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig index 50bc6d6bdb2..38335968b85 100644 --- a/configs/MPC8548CDS_36BIT_defconfig +++ b/configs/MPC8548CDS_36BIT_defconfig @@ -1,6 +1,6 @@ CONFIG_PPC=y CONFIG_SYS_IMMR=0xE0000000 -CONFIG_SYS_TEXT_BASE=0xFFF80000 +CONFIG_TEXT_BASE=0xFFF80000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig index 535b65e5fce..bdfd91f01cd 100644 --- a/configs/MPC8548CDS_defconfig +++ b/configs/MPC8548CDS_defconfig @@ -1,6 +1,6 @@ CONFIG_PPC=y CONFIG_SYS_IMMR=0xE0000000 -CONFIG_SYS_TEXT_BASE=0xFFF80000 +CONFIG_TEXT_BASE=0xFFF80000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig index bd865daae32..ef92c7bb279 100644 --- a/configs/MPC8548CDS_legacy_defconfig +++ b/configs/MPC8548CDS_legacy_defconfig @@ -1,6 +1,6 @@ CONFIG_PPC=y CONFIG_SYS_IMMR=0xE0000000 -CONFIG_SYS_TEXT_BASE=0xFFF80000 +CONFIG_TEXT_BASE=0xFFF80000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig index c2e79fda7ed..a234a5464af 100644 --- a/configs/P1010RDB-PA_36BIT_NAND_defconfig +++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig index 0764bda6672..d3080f0076a 100644 --- a/configs/P1010RDB-PA_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig index 2b3cfa09809..333bf0c206a 100644 --- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig +++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig index 7114c0ee5e5..b1a323e2072 100644 --- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig +++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig index e5064dfd4bc..d212cbd00d7 100644 --- a/configs/P1010RDB-PA_NAND_defconfig +++ b/configs/P1010RDB-PA_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig index d83b61aaaac..c7f2670087c 100644 --- a/configs/P1010RDB-PA_NOR_defconfig +++ b/configs/P1010RDB-PA_NOR_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig index 079dc8477d8..e0e06158337 100644 --- a/configs/P1010RDB-PA_SDCARD_defconfig +++ b/configs/P1010RDB-PA_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig index 54a7dc1d8df..2a9dd648141 100644 --- a/configs/P1010RDB-PA_SPIFLASH_defconfig +++ b/configs/P1010RDB-PA_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig index bd431c26721..135cd03577e 100644 --- a/configs/P1010RDB-PB_36BIT_NAND_defconfig +++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig index 4e482f8bc14..f684ee15fb0 100644 --- a/configs/P1010RDB-PB_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig index e80e39bfbb3..85af0796d1e 100644 --- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig +++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig index 6dd33e302a1..ce85806b5ba 100644 --- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig +++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig index de3a96d8f6d..953ceee845d 100644 --- a/configs/P1010RDB-PB_NAND_defconfig +++ b/configs/P1010RDB-PB_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig index 6637090ecd7..b11d0161211 100644 --- a/configs/P1010RDB-PB_NOR_defconfig +++ b/configs/P1010RDB-PB_NOR_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig index f096fbc5e7a..aab790311c7 100644 --- a/configs/P1010RDB-PB_SDCARD_defconfig +++ b/configs/P1010RDB-PB_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig index 5da7ccbea23..665d3a901c8 100644 --- a/configs/P1010RDB-PB_SPIFLASH_defconfig +++ b/configs/P1010RDB-PB_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig index 4f5e89c0e9d..6d0160bf6b6 100644 --- a/configs/P1020RDB-PC_36BIT_NAND_defconfig +++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig index 2f8dc8ab8ed..43def85f9c7 100644 --- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig +++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig index b0c60524c8d..31e4606c8b2 100644 --- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig +++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig index 4ad8ac80158..2553c6c7823 100644 --- a/configs/P1020RDB-PC_36BIT_defconfig +++ b/configs/P1020RDB-PC_36BIT_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig index a82ba02020d..f7e514154ab 100644 --- a/configs/P1020RDB-PC_NAND_defconfig +++ b/configs/P1020RDB-PC_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig index 51fb0e6acee..8092737cf92 100644 --- a/configs/P1020RDB-PC_SDCARD_defconfig +++ b/configs/P1020RDB-PC_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig index b6d49d799af..4418eb3ca14 100644 --- a/configs/P1020RDB-PC_SPIFLASH_defconfig +++ b/configs/P1020RDB-PC_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig index c553f2ea079..6db4ae1294e 100644 --- a/configs/P1020RDB-PC_defconfig +++ b/configs/P1020RDB-PC_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig index eb921d99322..a4086a375e0 100644 --- a/configs/P1020RDB-PD_NAND_defconfig +++ b/configs/P1020RDB-PD_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig index 3197c3487c6..6ca5d18c517 100644 --- a/configs/P1020RDB-PD_SDCARD_defconfig +++ b/configs/P1020RDB-PD_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig index 80a8273143c..79ed4f54d65 100644 --- a/configs/P1020RDB-PD_SPIFLASH_defconfig +++ b/configs/P1020RDB-PD_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig index 31f0c9a1aab..175d58610dd 100644 --- a/configs/P1020RDB-PD_defconfig +++ b/configs/P1020RDB-PD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig index bfa59af3bf0..cd9dd709081 100644 --- a/configs/P2020RDB-PC_36BIT_NAND_defconfig +++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig index fed2a0d542c..458ab5883f2 100644 --- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig +++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig index 6071fe1456c..b28872c2e17 100644 --- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig index 51200f85fe2..bafd17cca5e 100644 --- a/configs/P2020RDB-PC_36BIT_defconfig +++ b/configs/P2020RDB-PC_36BIT_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig index 4e1a91268d3..66f2596b44b 100644 --- a/configs/P2020RDB-PC_NAND_defconfig +++ b/configs/P2020RDB-PC_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig index d6e1903a5a4..ad98ddece70 100644 --- a/configs/P2020RDB-PC_SDCARD_defconfig +++ b/configs/P2020RDB-PC_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig index b048e44eef3..09619d5cdf8 100644 --- a/configs/P2020RDB-PC_SPIFLASH_defconfig +++ b/configs/P2020RDB-PC_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x11000000 +CONFIG_TEXT_BASE=0x11000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig index 21b473c61cf..5f349994509 100644 --- a/configs/P2020RDB-PC_defconfig +++ b/configs/P2020RDB-PC_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/P2041RDB_NAND_defconfig b/configs/P2041RDB_NAND_defconfig index b1c6f9dd5ce..3b65d84dd41 100644 --- a/configs/P2041RDB_NAND_defconfig +++ b/configs/P2041RDB_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xFFF40000 +CONFIG_TEXT_BASE=0xFFF40000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xE0000 diff --git a/configs/P2041RDB_SDCARD_defconfig b/configs/P2041RDB_SDCARD_defconfig index 66ce4a55e79..272724e2b80 100644 --- a/configs/P2041RDB_SDCARD_defconfig +++ b/configs/P2041RDB_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xFFF40000 +CONFIG_TEXT_BASE=0xFFF40000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xCF400 diff --git a/configs/P2041RDB_SPIFLASH_defconfig b/configs/P2041RDB_SPIFLASH_defconfig index e82b6289a64..6250d0cc049 100644 --- a/configs/P2041RDB_SPIFLASH_defconfig +++ b/configs/P2041RDB_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xFFF40000 +CONFIG_TEXT_BASE=0xFFF40000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig index a5f7a08bcfa..f67aa8031c9 100644 --- a/configs/P2041RDB_defconfig +++ b/configs/P2041RDB_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig index 69899760f19..70045882f89 100644 --- a/configs/SBx81LIFKW_defconfig +++ b/configs/SBx81LIFKW_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/alliedtelesis/SBx81LIFKW/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x00600000 +CONFIG_TEXT_BASE=0x00600000 CONFIG_TARGET_SBx81LIFKW=y CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xC0000 diff --git a/configs/SBx81LIFXCAT_defconfig b/configs/SBx81LIFXCAT_defconfig index 84ac69dcc97..c8c8d5b635e 100644 --- a/configs/SBx81LIFXCAT_defconfig +++ b/configs/SBx81LIFXCAT_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/alliedtelesis/SBx81LIFXCAT/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x00600000 +CONFIG_TEXT_BASE=0x00600000 CONFIG_TARGET_SBx81LIFXCAT=y CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xC0000 diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig index 1c8944e89b8..71aa43ae874 100644 --- a/configs/T1024RDB_NAND_defconfig +++ b/configs/T1024RDB_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x30000000 +CONFIG_TEXT_BASE=0x30000000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig index 8ee3c2eb44c..cb316529842 100644 --- a/configs/T1024RDB_SDCARD_defconfig +++ b/configs/T1024RDB_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x30000000 +CONFIG_TEXT_BASE=0x30000000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig index 374f222d03b..fb3ba552aef 100644 --- a/configs/T1024RDB_SPIFLASH_defconfig +++ b/configs/T1024RDB_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x30000000 +CONFIG_TEXT_BASE=0x30000000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig index d354fb889bb..fa3b5b287d1 100644 --- a/configs/T1024RDB_defconfig +++ b/configs/T1024RDB_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig index 438ffbd46f0..0a1d405409d 100644 --- a/configs/T1042D4RDB_NAND_defconfig +++ b/configs/T1042D4RDB_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x30000000 +CONFIG_TEXT_BASE=0x30000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig index 0101620d962..30e2b6fc0e5 100644 --- a/configs/T1042D4RDB_SDCARD_defconfig +++ b/configs/T1042D4RDB_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x30000000 +CONFIG_TEXT_BASE=0x30000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig index dca2dd01999..44694cd9a32 100644 --- a/configs/T1042D4RDB_SPIFLASH_defconfig +++ b/configs/T1042D4RDB_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x30000000 +CONFIG_TEXT_BASE=0x30000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig index 3b124af21c2..064aba238b3 100644 --- a/configs/T1042D4RDB_defconfig +++ b/configs/T1042D4RDB_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="t1042d4rdb" diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig index aa21c367009..44afe115194 100644 --- a/configs/T2080QDS_NAND_defconfig +++ b/configs/T2080QDS_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig index bdb3c5d4d7d..91236b2490a 100644 --- a/configs/T2080QDS_SDCARD_defconfig +++ b/configs/T2080QDS_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig index 55ea54b146d..9b3ffe550aa 100644 --- a/configs/T2080QDS_SECURE_BOOT_defconfig +++ b/configs/T2080QDS_SECURE_BOOT_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="t2080qds" CONFIG_MPC85xx=y diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig index 6c2671bdb7e..7ed03d2a7a2 100644 --- a/configs/T2080QDS_SPIFLASH_defconfig +++ b/configs/T2080QDS_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig index f3c0b93dabd..efa8d45bb1d 100644 --- a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xFFF40000 +CONFIG_TEXT_BASE=0xFFF40000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="t2080qds" CONFIG_ENV_ADDR=0xFFE20000 diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig index 8b966cc22ef..c9df2d1e5c4 100644 --- a/configs/T2080QDS_defconfig +++ b/configs/T2080QDS_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="t2080qds" diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig index 2a278ac7c8d..e53e4ffd0f1 100644 --- a/configs/T2080RDB_NAND_defconfig +++ b/configs/T2080RDB_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig index cc26ade01f2..46e603bb574 100644 --- a/configs/T2080RDB_SDCARD_defconfig +++ b/configs/T2080RDB_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig index d8216b00dfa..b64eafc367e 100644 --- a/configs/T2080RDB_SPIFLASH_defconfig +++ b/configs/T2080RDB_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig index afeba15ea33..98ac77ccee0 100644 --- a/configs/T2080RDB_defconfig +++ b/configs/T2080RDB_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="t2080rdb" diff --git a/configs/T2080RDB_revD_NAND_defconfig b/configs/T2080RDB_revD_NAND_defconfig index 6d43071143f..3f0489d0088 100644 --- a/configs/T2080RDB_revD_NAND_defconfig +++ b/configs/T2080RDB_revD_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/T2080RDB_revD_SDCARD_defconfig b/configs/T2080RDB_revD_SDCARD_defconfig index 03254fc1173..86cade4758e 100644 --- a/configs/T2080RDB_revD_SDCARD_defconfig +++ b/configs/T2080RDB_revD_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/T2080RDB_revD_SPIFLASH_defconfig b/configs/T2080RDB_revD_SPIFLASH_defconfig index 1fab5d9abf1..cf4bf315a3a 100644 --- a/configs/T2080RDB_revD_SPIFLASH_defconfig +++ b/configs/T2080RDB_revD_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/T2080RDB_revD_defconfig b/configs/T2080RDB_revD_defconfig index fbfd4a428f7..e01dbc5dd2c 100644 --- a/configs/T2080RDB_revD_defconfig +++ b/configs/T2080RDB_revD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="t2080rdb" diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig index bff883901d0..8540abdd5cf 100644 --- a/configs/T4240RDB_SDCARD_defconfig +++ b/configs/T4240RDB_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x2000 diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig index 361769d9c22..689b644eb32 100644 --- a/configs/T4240RDB_defconfig +++ b/configs/T4240RDB_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xEFF40000 +CONFIG_TEXT_BASE=0xEFF40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="t4240rdb" diff --git a/configs/a3y17lte_defconfig b/configs/a3y17lte_defconfig index 9c0427236b9..124fb8d4761 100644 --- a/configs/a3y17lte_defconfig +++ b/configs/a3y17lte_defconfig @@ -3,7 +3,7 @@ CONFIG_SYS_CONFIG_NAME="exynos78x0-common" CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=26000000 CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x40001000 +CONFIG_TEXT_BASE=0x40001000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS7=y CONFIG_TARGET_A3Y17LTE=y diff --git a/configs/a5y17lte_defconfig b/configs/a5y17lte_defconfig index ea0773e7a26..ffb0b3f474a 100644 --- a/configs/a5y17lte_defconfig +++ b/configs/a5y17lte_defconfig @@ -3,7 +3,7 @@ CONFIG_SYS_CONFIG_NAME="exynos78x0-common" CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=26000000 CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x40001000 +CONFIG_TEXT_BASE=0x40001000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS7=y CONFIG_TARGET_A5Y17LTE=y diff --git a/configs/a7y17lte_defconfig b/configs/a7y17lte_defconfig index 952c72b760d..8c1229d8d5e 100644 --- a/configs/a7y17lte_defconfig +++ b/configs/a7y17lte_defconfig @@ -3,7 +3,7 @@ CONFIG_SYS_CONFIG_NAME="exynos78x0-common" CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=26000000 CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x40001000 +CONFIG_TEXT_BASE=0x40001000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS7=y CONFIG_TARGET_A7Y17LTE=y diff --git a/configs/ae350_rv32_defconfig b/configs/ae350_rv32_defconfig index b73755d9d1e..cbfc97dc3df 100644 --- a/configs/ae350_rv32_defconfig +++ b/configs/ae350_rv32_defconfig @@ -1,5 +1,5 @@ CONFIG_RISCV=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SECT_SIZE=0x1000 diff --git a/configs/ae350_rv32_spl_defconfig b/configs/ae350_rv32_spl_defconfig index 98d39eea09a..201f754ade4 100644 --- a/configs/ae350_rv32_spl_defconfig +++ b/configs/ae350_rv32_spl_defconfig @@ -1,5 +1,5 @@ CONFIG_RISCV=y -CONFIG_SYS_TEXT_BASE=0x01200000 +CONFIG_TEXT_BASE=0x01200000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SECT_SIZE=0x1000 diff --git a/configs/ae350_rv32_spl_xip_defconfig b/configs/ae350_rv32_spl_xip_defconfig index 67c1e35c557..f7ac0b5110f 100644 --- a/configs/ae350_rv32_spl_xip_defconfig +++ b/configs/ae350_rv32_spl_xip_defconfig @@ -1,5 +1,5 @@ CONFIG_RISCV=y -CONFIG_SYS_TEXT_BASE=0x01200000 +CONFIG_TEXT_BASE=0x01200000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SECT_SIZE=0x1000 diff --git a/configs/ae350_rv32_xip_defconfig b/configs/ae350_rv32_xip_defconfig index f5bbece8eba..64be1ee30d5 100644 --- a/configs/ae350_rv32_xip_defconfig +++ b/configs/ae350_rv32_xip_defconfig @@ -1,5 +1,5 @@ CONFIG_RISCV=y -CONFIG_SYS_TEXT_BASE=0x80000000 +CONFIG_TEXT_BASE=0x80000000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SECT_SIZE=0x1000 diff --git a/configs/ae350_rv64_defconfig b/configs/ae350_rv64_defconfig index a2bbdd8c89d..65b3fc646f3 100644 --- a/configs/ae350_rv64_defconfig +++ b/configs/ae350_rv64_defconfig @@ -1,5 +1,5 @@ CONFIG_RISCV=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SECT_SIZE=0x1000 diff --git a/configs/ae350_rv64_spl_defconfig b/configs/ae350_rv64_spl_defconfig index 7186ef4d701..4c3e1beb005 100644 --- a/configs/ae350_rv64_spl_defconfig +++ b/configs/ae350_rv64_spl_defconfig @@ -1,5 +1,5 @@ CONFIG_RISCV=y -CONFIG_SYS_TEXT_BASE=0x01200000 +CONFIG_TEXT_BASE=0x01200000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SECT_SIZE=0x1000 diff --git a/configs/ae350_rv64_spl_xip_defconfig b/configs/ae350_rv64_spl_xip_defconfig index baee9bfe4a5..3c6408a12ad 100644 --- a/configs/ae350_rv64_spl_xip_defconfig +++ b/configs/ae350_rv64_spl_xip_defconfig @@ -1,5 +1,5 @@ CONFIG_RISCV=y -CONFIG_SYS_TEXT_BASE=0x01200000 +CONFIG_TEXT_BASE=0x01200000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SECT_SIZE=0x1000 diff --git a/configs/ae350_rv64_xip_defconfig b/configs/ae350_rv64_xip_defconfig index 4bf778b8b89..f4deee6871c 100644 --- a/configs/ae350_rv64_xip_defconfig +++ b/configs/ae350_rv64_xip_defconfig @@ -1,5 +1,5 @@ CONFIG_RISCV=y -CONFIG_SYS_TEXT_BASE=0x80000000 +CONFIG_TEXT_BASE=0x80000000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SECT_SIZE=0x1000 diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 4549cd5d0d7..b43e8f4b6f7 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -4,7 +4,7 @@ CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index c6accc66ed8..4d3d02d2c8e 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index b5db55de389..0b759c8c2c4 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x30000000 +CONFIG_TEXT_BASE=0x30000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x110000 diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig index 6054e808638..14a6187b05b 100644 --- a/configs/amcore_defconfig +++ b/configs/amcore_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0xFFC00000 +CONFIG_TEXT_BASE=0xFFC00000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/ap121_defconfig b/configs/ap121_defconfig index f39051ecb39..1f4a79395ee 100644 --- a/configs/ap121_defconfig +++ b/configs/ap121_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0x9F000000 +CONFIG_TEXT_BASE=0x9F000000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x40000 diff --git a/configs/ap143_defconfig b/configs/ap143_defconfig index e49e74c30a2..b902657dce1 100644 --- a/configs/ap143_defconfig +++ b/configs/ap143_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0x9F000000 +CONFIG_TEXT_BASE=0x9F000000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_ENV_SIZE=0x10000 diff --git a/configs/ap152_defconfig b/configs/ap152_defconfig index fe3f752e0e4..b46b18121b8 100644 --- a/configs/ap152_defconfig +++ b/configs/ap152_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0x9F000000 +CONFIG_TEXT_BASE=0x9F000000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_ENV_SIZE=0x10000 diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig index 32e105a557a..6226d50c8ac 100644 --- a/configs/apalis-imx8_defconfig +++ b/configs/apalis-imx8_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y -CONFIG_SYS_TEXT_BASE=0x80020000 +CONFIG_TEXT_BASE=0x80020000 CONFIG_SYS_MALLOC_LEN=0x2800000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig index 47ac0ef2720..70ef62a778b 100644 --- a/configs/apalis-tk1_defconfig +++ b/configs/apalis-tk1_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_TEXT_BASE=0x80110000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index 2689e8d9846..2c0e165d725 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index d1d2c9047b8..587af469183 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_TEXT_BASE=0x80110000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/aristainetos2c_defconfig b/configs/aristainetos2c_defconfig index 3f6f579845f..5ff29548b0d 100644 --- a/configs/aristainetos2c_defconfig +++ b/configs/aristainetos2c_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_F_LEN=0x13000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0xD0000 diff --git a/configs/aristainetos2ccslb_defconfig b/configs/aristainetos2ccslb_defconfig index 62da1778d56..0a208543dfe 100644 --- a/configs/aristainetos2ccslb_defconfig +++ b/configs/aristainetos2ccslb_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_F_LEN=0x13000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0xD0000 diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig index 005eabf55a8..30c695001fc 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x43E00000 +CONFIG_TEXT_BASE=0x43E00000 CONFIG_SYS_MALLOC_LEN=0x5004000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS5=y diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index f0c91d4ca45..d920ab4900c 100644 --- a/configs/astro_mcf5373l_defconfig +++ b/configs/astro_mcf5373l_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x8000 CONFIG_ENV_SECT_SIZE=0x8000 diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig index df4bebeeb5b..05b99336252 100644 --- a/configs/at91sam9260ek_dataflash_cs0_defconfig +++ b/configs/at91sam9260ek_dataflash_cs0_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_AT91SAM9260EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig index 41bfed5dece..af17e37af2c 100644 --- a/configs/at91sam9260ek_dataflash_cs1_defconfig +++ b/configs/at91sam9260ek_dataflash_cs1_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_AT91SAM9260EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig index aa829b4661f..cd6bf9d6cbe 100644 --- a/configs/at91sam9260ek_nandflash_defconfig +++ b/configs/at91sam9260ek_nandflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_TARGET_AT91SAM9260EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig index 2fc0b8751d5..e81a6ddeaa1 100644 --- a/configs/at91sam9261ek_dataflash_cs0_defconfig +++ b/configs/at91sam9261ek_dataflash_cs0_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_AT91SAM9261EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig index 599b56024e4..65b8de62baa 100644 --- a/configs/at91sam9261ek_dataflash_cs3_defconfig +++ b/configs/at91sam9261ek_dataflash_cs3_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_AT91SAM9261EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig index a8ff0d2f819..dfddcad1c55 100644 --- a/configs/at91sam9261ek_nandflash_defconfig +++ b/configs/at91sam9261ek_nandflash_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_TARGET_AT91SAM9261EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig index 1fb3153cb1c..40200a7b22e 100644 --- a/configs/at91sam9263ek_dataflash_cs0_defconfig +++ b/configs/at91sam9263ek_dataflash_cs0_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21F00000 +CONFIG_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_AT91SAM9263EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig index 1fb3153cb1c..40200a7b22e 100644 --- a/configs/at91sam9263ek_dataflash_defconfig +++ b/configs/at91sam9263ek_dataflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21F00000 +CONFIG_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_AT91SAM9263EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig index 26f3932ddfe..7714a06a9c2 100644 --- a/configs/at91sam9263ek_nandflash_defconfig +++ b/configs/at91sam9263ek_nandflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21F00000 +CONFIG_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_TARGET_AT91SAM9263EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig index b0a01c2c689..057204b8dd8 100644 --- a/configs/at91sam9263ek_norflash_boot_defconfig +++ b/configs/at91sam9263ek_norflash_boot_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x0000000 +CONFIG_TEXT_BASE=0x0000000 CONFIG_SYS_MALLOC_LEN=0x50000 CONFIG_TARGET_AT91SAM9263EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig index fbf40ef5240..d70d12ffc6d 100644 --- a/configs/at91sam9263ek_norflash_defconfig +++ b/configs/at91sam9263ek_norflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21F00000 +CONFIG_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x50000 CONFIG_TARGET_AT91SAM9263EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig index d9178cd4962..ae850e8a9d5 100644 --- a/configs/at91sam9g10ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_AT91SAM9261EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig index cca871f847c..92d216457f3 100644 --- a/configs/at91sam9g10ek_dataflash_cs3_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_AT91SAM9261EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig index a85c01f941e..9c2bd621b0d 100644 --- a/configs/at91sam9g10ek_nandflash_defconfig +++ b/configs/at91sam9g10ek_nandflash_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_TARGET_AT91SAM9261EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig index fb4cb6db313..a0bcbdcdfee 100644 --- a/configs/at91sam9g20ek_2mmc_defconfig +++ b/configs/at91sam9g20ek_2mmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x23000 CONFIG_TARGET_AT91SAM9260EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig index 67567c5db62..7d68dcc467d 100644 --- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig +++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_TARGET_AT91SAM9260EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig index 4da431dcbc3..90a87327e2a 100644 --- a/configs/at91sam9g20ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_AT91SAM9260EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig index d9281d6b09d..42896548964 100644 --- a/configs/at91sam9g20ek_dataflash_cs1_defconfig +++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_AT91SAM9260EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig index ea0f171f542..3edcd40abf5 100644 --- a/configs/at91sam9g20ek_nandflash_defconfig +++ b/configs/at91sam9g20ek_nandflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_TARGET_AT91SAM9260EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig index dd088ed8c89..9b767e9b982 100644 --- a/configs/at91sam9m10g45ek_mmc_defconfig +++ b/configs/at91sam9m10g45ek_mmc_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x73f00000 +CONFIG_TEXT_BASE=0x73f00000 CONFIG_SYS_MALLOC_LEN=0x2c000 CONFIG_TARGET_AT91SAM9M10G45EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig index 64a2490857b..95e18a1b2b8 100644 --- a/configs/at91sam9m10g45ek_nandflash_defconfig +++ b/configs/at91sam9m10g45ek_nandflash_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x73f00000 +CONFIG_TEXT_BASE=0x73f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_TARGET_AT91SAM9M10G45EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig index 1902844803f..6ea55154c4f 100644 --- a/configs/at91sam9n12ek_mmc_defconfig +++ b/configs/at91sam9n12ek_mmc_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_AT91SAM9N12EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig index 5e727cfab83..65fefe123fd 100644 --- a/configs/at91sam9n12ek_nandflash_defconfig +++ b/configs/at91sam9n12ek_nandflash_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_AT91SAM9N12EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig index faa7eece3e7..b31291d0d65 100644 --- a/configs/at91sam9n12ek_spiflash_defconfig +++ b/configs/at91sam9n12ek_spiflash_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_AT91SAM9N12EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x3000 diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig index 53be4fd9d32..8daec289bc6 100644 --- a/configs/at91sam9rlek_dataflash_defconfig +++ b/configs/at91sam9rlek_dataflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21F00000 +CONFIG_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_AT91SAM9RLEK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig index 88093e0dbd0..bc5c9cf19cc 100644 --- a/configs/at91sam9rlek_mmc_defconfig +++ b/configs/at91sam9rlek_mmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21F00000 +CONFIG_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x2c000 CONFIG_TARGET_AT91SAM9RLEK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig index 1c33181ac9b..5ec0efc67ff 100644 --- a/configs/at91sam9rlek_nandflash_defconfig +++ b/configs/at91sam9rlek_nandflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21F00000 +CONFIG_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_TARGET_AT91SAM9RLEK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig index bfa83803989..c1dd6dfa798 100644 --- a/configs/at91sam9x5ek_dataflash_defconfig +++ b/configs/at91sam9x5ek_dataflash_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_TARGET_AT91SAM9X5EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index bd0576301b4..357cab97e96 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_TARGET_AT91SAM9X5EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig index 603433ba0f2..270aecc68e6 100644 --- a/configs/at91sam9x5ek_nandflash_defconfig +++ b/configs/at91sam9x5ek_nandflash_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_TARGET_AT91SAM9X5EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig index 31f245e03ae..a3f65bef001 100644 --- a/configs/at91sam9x5ek_spiflash_defconfig +++ b/configs/at91sam9x5ek_spiflash_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_TARGET_AT91SAM9X5EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig index df4bebeeb5b..05b99336252 100644 --- a/configs/at91sam9xeek_dataflash_cs0_defconfig +++ b/configs/at91sam9xeek_dataflash_cs0_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_AT91SAM9260EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig index 41bfed5dece..af17e37af2c 100644 --- a/configs/at91sam9xeek_dataflash_cs1_defconfig +++ b/configs/at91sam9xeek_dataflash_cs1_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_AT91SAM9260EK=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig index aa829b4661f..cd6bf9d6cbe 100644 --- a/configs/at91sam9xeek_nandflash_defconfig +++ b/configs/at91sam9xeek_nandflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21f00000 +CONFIG_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_TARGET_AT91SAM9260EK=y CONFIG_ATMEL_LEGACY=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 f04fa64450c..943b4da21d1 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 @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_ZYNQMP=y -CONFIG_SYS_TEXT_BASE=0x8000000 +CONFIG_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_LEN=0x4008000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_DM_GPIO=y diff --git a/configs/axm_defconfig b/configs/axm_defconfig index dd5efbca86d..b3e011324ee 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -7,7 +7,7 @@ CONFIG_SYS_THUMB_BUILD=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21000000 +CONFIG_TEXT_BASE=0x21000000 CONFIG_SYS_MALLOC_LEN=0x460000 CONFIG_TARGET_TAURUS=y CONFIG_AT91_GPIO_PULLUP=y diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig index 94e7752c77e..a5436db7ac7 100644 --- a/configs/axs101_defconfig +++ b/configs/axs101_defconfig @@ -1,6 +1,6 @@ CONFIG_ARC=y CONFIG_TARGET_AXS101=y -CONFIG_SYS_TEXT_BASE=0x81000000 +CONFIG_TEXT_BASE=0x81000000 CONFIG_SYS_MALLOC_LEN=0x0200000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DM_GPIO=y diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig index f486e375f1c..1270a3db471 100644 --- a/configs/axs103_defconfig +++ b/configs/axs103_defconfig @@ -1,6 +1,6 @@ CONFIG_ARC=y CONFIG_ISA_ARCV2=y -CONFIG_SYS_TEXT_BASE=0x81000000 +CONFIG_TEXT_BASE=0x81000000 CONFIG_SYS_MALLOC_LEN=0x0200000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DM_GPIO=y diff --git a/configs/bananapi-m5_defconfig b/configs/bananapi-m5_defconfig index cd85e32f022..0eb4fa7ceea 100644 --- a/configs/bananapi-m5_defconfig +++ b/configs/bananapi-m5_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index d1a467dfe79..5f43f4c0ee9 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFF00000 +CONFIG_TEXT_BASE=0xFFF00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x6FF000 diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig index e8ae5efdc42..920e8828460 100644 --- a/configs/bcm7260_defconfig +++ b/configs/bcm7260_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_BCMSTB=y -CONFIG_SYS_TEXT_BASE=0x10100000 +CONFIG_TEXT_BASE=0x10100000 CONFIG_SYS_MALLOC_LEN=0x2800000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TARGET_BCM7260=y diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig index 525e0d1c3f4..b44eabaa425 100644 --- a/configs/bcm7445_defconfig +++ b/configs/bcm7445_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_BCMSTB=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TARGET_BCM7445=y diff --git a/configs/bcm947622_defconfig b/configs/bcm947622_defconfig index c61fbe1848e..c9811467b52 100644 --- a/configs/bcm947622_defconfig +++ b/configs/bcm947622_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM47622=y diff --git a/configs/bcm94908_defconfig b/configs/bcm94908_defconfig index 6dfb8825ca3..e823b346c15 100644 --- a/configs/bcm94908_defconfig +++ b/configs/bcm94908_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=50000000 CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM4908=y diff --git a/configs/bcm94912_defconfig b/configs/bcm94912_defconfig index 355f10a3aab..2eea3a408e2 100644 --- a/configs/bcm94912_defconfig +++ b/configs/bcm94912_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=50000000 CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM4912=y diff --git a/configs/bcm963138_defconfig b/configs/bcm963138_defconfig index 5aec7b89627..abd9d1a4bf4 100644 --- a/configs/bcm963138_defconfig +++ b/configs/bcm963138_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM63138=y diff --git a/configs/bcm963146_defconfig b/configs/bcm963146_defconfig index 4dcc0fd7b1e..395a854d302 100644 --- a/configs/bcm963146_defconfig +++ b/configs/bcm963146_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=50000000 CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM63146=y diff --git a/configs/bcm963148_defconfig b/configs/bcm963148_defconfig index 6ddb45c27b0..b7811593eb8 100644 --- a/configs/bcm963148_defconfig +++ b/configs/bcm963148_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=50000000 CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM63148=y diff --git a/configs/bcm963158_defconfig b/configs/bcm963158_defconfig index b585adbd9b3..c0295d6ed2d 100644 --- a/configs/bcm963158_defconfig +++ b/configs/bcm963158_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=50000000 CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM63158=y diff --git a/configs/bcm963178_defconfig b/configs/bcm963178_defconfig index d9e62cf34cd..2f189c45c52 100644 --- a/configs/bcm963178_defconfig +++ b/configs/bcm963178_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=50000000 CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM63178=y diff --git a/configs/bcm96756_defconfig b/configs/bcm96756_defconfig index 8152673b20d..8d584e5ecad 100644 --- a/configs/bcm96756_defconfig +++ b/configs/bcm96756_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=50000000 CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM6756=y diff --git a/configs/bcm96813_defconfig b/configs/bcm96813_defconfig index 5d03624a29a..96d9affaf75 100644 --- a/configs/bcm96813_defconfig +++ b/configs/bcm96813_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=50000000 CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM6813=y diff --git a/configs/bcm968380gerg_ram_defconfig b/configs/bcm968380gerg_ram_defconfig index 284fa2fdef9..6ddec1b063e 100644 --- a/configs/bcm968380gerg_ram_defconfig +++ b/configs/bcm968380gerg_ram_defconfig @@ -1,6 +1,6 @@ CONFIG_MIPS=y CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_TEXT_BASE=0x80010000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/bcm96846_defconfig b/configs/bcm96846_defconfig index 27cfb457f00..a2368fb4960 100644 --- a/configs/bcm96846_defconfig +++ b/configs/bcm96846_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=50000000 CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM6846=y diff --git a/configs/bcm96855_defconfig b/configs/bcm96855_defconfig index 223c0a139b7..3df6545013d 100644 --- a/configs/bcm96855_defconfig +++ b/configs/bcm96855_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=50000000 CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM6855=y diff --git a/configs/bcm96856_defconfig b/configs/bcm96856_defconfig index 7e1c09769f7..0a79f042ed0 100644 --- a/configs/bcm96856_defconfig +++ b/configs/bcm96856_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=50000000 CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM6856=y diff --git a/configs/bcm96858_defconfig b/configs/bcm96858_defconfig index 5f7be1107e8..8e28f8cd7e4 100644 --- a/configs/bcm96858_defconfig +++ b/configs/bcm96858_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=50000000 CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM6858=y diff --git a/configs/bcm96878_defconfig b/configs/bcm96878_defconfig index 847646239ee..6bd2ed531bb 100644 --- a/configs/bcm96878_defconfig +++ b/configs/bcm96878_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=50000000 CONFIG_ARCH_BCMBCA=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_BCM6878=y diff --git a/configs/bcm_ns3_defconfig b/configs/bcm_ns3_defconfig index 89f7f2c522e..4928a203d0d 100644 --- a/configs/bcm_ns3_defconfig +++ b/configs/bcm_ns3_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_BCMNS3=y -CONFIG_SYS_TEXT_BASE=0xFF000000 +CONFIG_TEXT_BASE=0xFF000000 CONFIG_SYS_MALLOC_LEN=0xc00000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 088ce8eee02..24f619ca768 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_TEXT_BASE=0x80110000 CONFIG_SYS_MALLOC_LEN=0x2500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/beelink-gsking-x_defconfig b/configs/beelink-gsking-x_defconfig index 8b760fcee47..ae018bb91ed 100644 --- a/configs/beelink-gsking-x_defconfig +++ b/configs/beelink-gsking-x_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="beelink-s922x" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/beelink-gtking_defconfig b/configs/beelink-gtking_defconfig index 5f3cbe92c67..d5b071d0cc6 100644 --- a/configs/beelink-gtking_defconfig +++ b/configs/beelink-gtking_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="beelink-s922x" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/beelink-gtkingpro_defconfig b/configs/beelink-gtkingpro_defconfig index 59245391661..b179f7b3b30 100644 --- a/configs/beelink-gtkingpro_defconfig +++ b/configs/beelink-gtkingpro_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="beelink-s922x" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/bitmain_antminer_s9_defconfig b/configs/bitmain_antminer_s9_defconfig index 30f3f8e3a16..cbcbc9b18db 100644 --- a/configs/bitmain_antminer_s9_defconfig +++ b/configs/bitmain_antminer_s9_defconfig @@ -5,7 +5,7 @@ CONFIG_SYS_CONFIG_NAME="bitmain_antminer_s9" CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_ZYNQ=y -CONFIG_SYS_TEXT_BASE=0x4000000 +CONFIG_TEXT_BASE=0x4000000 CONFIG_ENV_OFFSET=0x300000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="bitmain-antminer-s9" diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig index 40990a91f07..66adeac725c 100644 --- a/configs/bk4r1_defconfig +++ b/configs/bk4r1_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_VF610=y -CONFIG_SYS_TEXT_BASE=0x3f401000 +CONFIG_TEXT_BASE=0x3f401000 CONFIG_SYS_MALLOC_LEN=0x402000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index 3cbec64a8f2..f82b23387cf 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/boston32r2_defconfig b/configs/boston32r2_defconfig index bb1d525429d..c680995805b 100644 --- a/configs/boston32r2_defconfig +++ b/configs/boston32r2_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0x9FC00000 +CONFIG_TEXT_BASE=0x9FC00000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/boston32r2el_defconfig b/configs/boston32r2el_defconfig index 82a61e3731a..831ee94b0c7 100644 --- a/configs/boston32r2el_defconfig +++ b/configs/boston32r2el_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0x9FC00000 +CONFIG_TEXT_BASE=0x9FC00000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/boston32r6_defconfig b/configs/boston32r6_defconfig index f2c6cfd64bd..312616a4c20 100644 --- a/configs/boston32r6_defconfig +++ b/configs/boston32r6_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0x9FC00000 +CONFIG_TEXT_BASE=0x9FC00000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/boston32r6el_defconfig b/configs/boston32r6el_defconfig index 60e1180f093..50032dd3dba 100644 --- a/configs/boston32r6el_defconfig +++ b/configs/boston32r6el_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0x9FC00000 +CONFIG_TEXT_BASE=0x9FC00000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/boston64r2_defconfig b/configs/boston64r2_defconfig index 7459ee432b8..9bfe4a72f88 100644 --- a/configs/boston64r2_defconfig +++ b/configs/boston64r2_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0xFFFFFFFF9FC00000 +CONFIG_TEXT_BASE=0xFFFFFFFF9FC00000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/boston64r2el_defconfig b/configs/boston64r2el_defconfig index d9296a9be7f..9d28e07df66 100644 --- a/configs/boston64r2el_defconfig +++ b/configs/boston64r2el_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0xFFFFFFFF9FC00000 +CONFIG_TEXT_BASE=0xFFFFFFFF9FC00000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/boston64r6_defconfig b/configs/boston64r6_defconfig index fa9ef1521d5..7f6c158a4c3 100644 --- a/configs/boston64r6_defconfig +++ b/configs/boston64r6_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0xFFFFFFFF9FC00000 +CONFIG_TEXT_BASE=0xFFFFFFFF9FC00000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/boston64r6el_defconfig b/configs/boston64r6el_defconfig index 31c353457ab..e203d2085f5 100644 --- a/configs/boston64r6el_defconfig +++ b/configs/boston64r6el_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0xFFFFFFFF9FC00000 +CONFIG_TEXT_BASE=0xFFFFFFFF9FC00000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/brppt2_defconfig b/configs/brppt2_defconfig index e2c36e13add..00ef3d9908e 100644 --- a/configs/brppt2_defconfig +++ b/configs/brppt2_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y # CONFIG_SPL_SYS_THUMB_BUILD is not set CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_SPL_GPIO=y diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index c2960eb6d0d..87aa9304cde 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_TEXT_BASE=0x80110000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig index 424657d7101..f716f6272f5 100644 --- a/configs/cei-tk1-som_defconfig +++ b/configs/cei-tk1-som_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_TEXT_BASE=0x80110000 CONFIG_SYS_MALLOC_LEN=0x2500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/cgtqmx8_defconfig b/configs/cgtqmx8_defconfig index ddc65a06b9d..ba2b09fb441 100644 --- a/configs/cgtqmx8_defconfig +++ b/configs/cgtqmx8_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y -CONFIG_SYS_TEXT_BASE=0x80020000 +CONFIG_TEXT_BASE=0x80020000 CONFIG_SYS_MALLOC_LEN=0x2400000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/cherryhill_defconfig b/configs/cherryhill_defconfig index 9c3d26a36e1..becb0a73c83 100644 --- a/configs/cherryhill_defconfig +++ b/configs/cherryhill_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFE00000 +CONFIG_TEXT_BASE=0xFFE00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x5F0000 diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig index df94cacaec8..932351d0828 100644 --- a/configs/chromebit_mickey_defconfig +++ b/configs/chromebit_mickey_defconfig @@ -3,7 +3,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_ARCH_TIMER=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00100000 +CONFIG_TEXT_BASE=0x00100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-mickey" CONFIG_SPL_TEXT_BASE=0xff704000 diff --git a/configs/chromebook_bob_defconfig b/configs/chromebook_bob_defconfig index 6ebd53eb59d..9d5bfef42c5 100644 --- a/configs/chromebook_bob_defconfig +++ b/configs/chromebook_bob_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/chromebook_coral_defconfig b/configs/chromebook_coral_defconfig index 60c50e75be6..45905c6792b 100644 --- a/configs/chromebook_coral_defconfig +++ b/configs/chromebook_coral_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0x1110000 +CONFIG_TEXT_BASE=0x1110000 CONFIG_SYS_MALLOC_F_LEN=0x3d00 CONFIG_NR_DRAM_BANKS=8 CONFIG_MAX_CPUS=8 diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index 27f0ee711d0..e7640f528c7 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -3,7 +3,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_ARCH_TIMER=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00100000 +CONFIG_TEXT_BASE=0x00100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-jerry" CONFIG_SPL_TEXT_BASE=0xff704000 diff --git a/configs/chromebook_kevin_defconfig b/configs/chromebook_kevin_defconfig index 7de787ed4d3..6c0cc703091 100644 --- a/configs/chromebook_kevin_defconfig +++ b/configs/chromebook_kevin_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index fa3641e42f5..541b7fadead 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFEF0000 +CONFIG_TEXT_BASE=0xFFEF0000 CONFIG_SYS_MALLOC_F_LEN=0x2400 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig index 928b2c3c6de..eaa3fafd8a4 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_defconfig @@ -3,7 +3,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_ARCH_TIMER=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00100000 +CONFIG_TEXT_BASE=0x00100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-minnie" CONFIG_SPL_TEXT_BASE=0xff704000 diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig index 56a0d6c8a8e..27bf046f991 100644 --- a/configs/chromebook_samus_defconfig +++ b/configs/chromebook_samus_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFE00000 +CONFIG_TEXT_BASE=0xFFE00000 CONFIG_SYS_MALLOC_F_LEN=0x1d00 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/chromebook_samus_tpl_defconfig b/configs/chromebook_samus_tpl_defconfig index 1e1091fa7ee..e9222648758 100644 --- a/configs/chromebook_samus_tpl_defconfig +++ b/configs/chromebook_samus_tpl_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xffed0000 +CONFIG_TEXT_BASE=0xffed0000 CONFIG_SYS_MALLOC_F_LEN=0x1a00 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/chromebook_speedy_defconfig b/configs/chromebook_speedy_defconfig index 28b8c091cb7..a4724708490 100644 --- a/configs/chromebook_speedy_defconfig +++ b/configs/chromebook_speedy_defconfig @@ -3,7 +3,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_ARCH_TIMER=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00100000 +CONFIG_TEXT_BASE=0x00100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-speedy" CONFIG_SPL_TEXT_BASE=0xff704000 diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig index 870843ada58..b78e98c2045 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFF00000 +CONFIG_TEXT_BASE=0xFFF00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/ci20_mmc_defconfig b/configs/ci20_mmc_defconfig index 07848a5933e..8b75883c031 100644 --- a/configs/ci20_mmc_defconfig +++ b/configs/ci20_mmc_defconfig @@ -1,6 +1,6 @@ CONFIG_MIPS=y CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_TEXT_BASE=0x80010000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index 3bbd1d6d8ef..f91942865a3 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/clearfog_gt_8k_defconfig b/configs/clearfog_gt_8k_defconfig index baafe3c58c6..58f3ec08b37 100644 --- a/configs/clearfog_gt_8k_defconfig +++ b/configs/clearfog_gt_8k_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_MVEBU_ARMADA_8K=y CONFIG_ENV_SIZE=0x10000 diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index ed267dd2e3f..b787b1aab37 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig index e8c91b8beff..4eaedf6464d 100644 --- a/configs/cobra5272_defconfig +++ b/configs/cobra5272_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0xFFE00000 +CONFIG_TEXT_BASE=0xFFE00000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 diff --git a/configs/colibri-imx6ull-emmc_defconfig b/configs/colibri-imx6ull-emmc_defconfig index 02b6be0a2b4..c0248dca953 100644 --- a/configs/colibri-imx6ull-emmc_defconfig +++ b/configs/colibri-imx6ull-emmc_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFDE00 diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index cc0a3473941..d16b66df7c8 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 1a207f99d00..fb9171a7037 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y -CONFIG_SYS_TEXT_BASE=0x80020000 +CONFIG_TEXT_BASE=0x80020000 CONFIG_SYS_MALLOC_LEN=0x2800000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 135095b275d..78a170d9966 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index 02e4a7c0b47..224de949c26 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x00110000 +CONFIG_TEXT_BASE=0x00110000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x10000 diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index 86e421c1d4f..a616eae1a6c 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_TEXT_BASE=0x80110000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index d5764343400..3352b8e9235 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_VF610=y -CONFIG_SYS_TEXT_BASE=0x3f401000 +CONFIG_TEXT_BASE=0x3f401000 CONFIG_SYS_MALLOC_LEN=0x0220000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/comtrend_ar5315u_ram_defconfig b/configs/comtrend_ar5315u_ram_defconfig index 013ce0a1374..b7b5865c02c 100644 --- a/configs/comtrend_ar5315u_ram_defconfig +++ b/configs/comtrend_ar5315u_ram_defconfig @@ -1,6 +1,6 @@ CONFIG_MIPS=y CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_TEXT_BASE=0x80010000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/comtrend_ar5387un_ram_defconfig b/configs/comtrend_ar5387un_ram_defconfig index 052e0ac541e..f1647a0c8f6 100644 --- a/configs/comtrend_ar5387un_ram_defconfig +++ b/configs/comtrend_ar5387un_ram_defconfig @@ -1,6 +1,6 @@ CONFIG_MIPS=y CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_TEXT_BASE=0x80010000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/comtrend_ct5361_ram_defconfig b/configs/comtrend_ct5361_ram_defconfig index 608a888015b..e2f44d552e9 100644 --- a/configs/comtrend_ct5361_ram_defconfig +++ b/configs/comtrend_ct5361_ram_defconfig @@ -1,6 +1,6 @@ CONFIG_MIPS=y CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_TEXT_BASE=0x80010000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/comtrend_vr3032u_ram_defconfig b/configs/comtrend_vr3032u_ram_defconfig index 7f6573b73f8..c92059d3457 100644 --- a/configs/comtrend_vr3032u_ram_defconfig +++ b/configs/comtrend_vr3032u_ram_defconfig @@ -1,6 +1,6 @@ CONFIG_MIPS=y CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_TEXT_BASE=0x80010000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/comtrend_wap5813n_ram_defconfig b/configs/comtrend_wap5813n_ram_defconfig index 09f62cb7d25..0663418fb7b 100644 --- a/configs/comtrend_wap5813n_ram_defconfig +++ b/configs/comtrend_wap5813n_ram_defconfig @@ -1,6 +1,6 @@ CONFIG_MIPS=y CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_TEXT_BASE=0x80010000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 8b6957da162..0d904675f73 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFF00000 +CONFIG_TEXT_BASE=0xFFF00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x6EF000 diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 286abe2f829..6fed3f2ecda 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFF00000 +CONFIG_TEXT_BASE=0xFFF00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x6EF000 diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index 5efb5933938..e8fb032bbae 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/coreboot64_defconfig b/configs/coreboot64_defconfig index a42fc3974aa..20c0c181696 100644 --- a/configs/coreboot64_defconfig +++ b/configs/coreboot64_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0x1120000 +CONFIG_TEXT_BASE=0x1120000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="coreboot" diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig index fcd48148f12..d8c5be66ad7 100644 --- a/configs/coreboot_defconfig +++ b/configs/coreboot_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0x1110000 +CONFIG_TEXT_BASE=0x1110000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="coreboot" diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig index ed2e0fe70a7..dddfa275076 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_TARGET_CORSTONE1000=y -CONFIG_SYS_TEXT_BASE=0x80000000 +CONFIG_TEXT_BASE=0x80000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="corstone1000-mps3" diff --git a/configs/cortina_presidio-asic-base_defconfig b/configs/cortina_presidio-asic-base_defconfig index b3f91c011e8..1a0e63a43e8 100644 --- a/configs/cortina_presidio-asic-base_defconfig +++ b/configs/cortina_presidio-asic-base_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 # CONFIG_SYS_ARCH_TIMER is not set CONFIG_TARGET_PRESIDIO_ASIC=y -CONFIG_SYS_TEXT_BASE=0x04000000 +CONFIG_TEXT_BASE=0x04000000 CONFIG_SYS_MALLOC_LEN=0x820000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/cortina_presidio-asic-emmc_defconfig b/configs/cortina_presidio-asic-emmc_defconfig index d35093ab6ad..53cb6f716d9 100644 --- a/configs/cortina_presidio-asic-emmc_defconfig +++ b/configs/cortina_presidio-asic-emmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 # CONFIG_SYS_ARCH_TIMER is not set CONFIG_TARGET_PRESIDIO_ASIC=y -CONFIG_SYS_TEXT_BASE=0x04000000 +CONFIG_TEXT_BASE=0x04000000 CONFIG_SYS_MALLOC_LEN=0x820000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/cortina_presidio-asic-pnand_defconfig b/configs/cortina_presidio-asic-pnand_defconfig index f30f38d7d2d..bd52d71d0eb 100644 --- a/configs/cortina_presidio-asic-pnand_defconfig +++ b/configs/cortina_presidio-asic-pnand_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 # CONFIG_SYS_ARCH_TIMER is not set CONFIG_TARGET_PRESIDIO_ASIC=y -CONFIG_SYS_TEXT_BASE=0x04000000 +CONFIG_TEXT_BASE=0x04000000 CONFIG_SYS_MALLOC_LEN=0x820000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 971372c695e..c8b4eb4d287 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -5,7 +5,7 @@ CONFIG_SYS_THUMB_BUILD=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x72000000 +CONFIG_TEXT_BASE=0x72000000 CONFIG_SYS_MALLOC_LEN=0x460000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_TARGET_CORVUS=y diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig index 7ee0cb746e4..c9afb9dc96c 100644 --- a/configs/cougarcanyon2_defconfig +++ b/configs/cougarcanyon2_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFE00000 +CONFIG_TEXT_BASE=0xFFE00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x5FF000 diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index fdd0d2badb0..4521172f42b 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFF00000 +CONFIG_TEXT_BASE=0xFFF00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x0 diff --git a/configs/crs305-1g-4s-bit_defconfig b/configs/crs305-1g-4s-bit_defconfig index 463f474a8fb..6ff40e6d63c 100644 --- a/configs/crs305-1g-4s-bit_defconfig +++ b/configs/crs305-1g-4s-bit_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y CONFIG_SYS_KWD_CONFIG="board/mikrotik/crs3xx-98dx3236/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_TARGET_CRS3XX_98DX3236=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x1F0000 diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig index 84d23a24cc8..f190f2d801b 100644 --- a/configs/crs305-1g-4s_defconfig +++ b/configs/crs305-1g-4s_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y CONFIG_SYS_KWD_CONFIG="board/mikrotik/crs3xx-98dx3236/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_TARGET_CRS3XX_98DX3236=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x1F0000 diff --git a/configs/crs326-24g-2s-bit_defconfig b/configs/crs326-24g-2s-bit_defconfig index 1eb70e5a321..cf0b00dd7b7 100644 --- a/configs/crs326-24g-2s-bit_defconfig +++ b/configs/crs326-24g-2s-bit_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y CONFIG_SYS_KWD_CONFIG="board/mikrotik/crs3xx-98dx3236/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_TARGET_CRS3XX_98DX3236=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x1F0000 diff --git a/configs/crs326-24g-2s_defconfig b/configs/crs326-24g-2s_defconfig index 44cb0b0663b..96ec5b80131 100644 --- a/configs/crs326-24g-2s_defconfig +++ b/configs/crs326-24g-2s_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y CONFIG_SYS_KWD_CONFIG="board/mikrotik/crs3xx-98dx3236/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_TARGET_CRS3XX_98DX3236=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x1F0000 diff --git a/configs/crs328-4c-20s-4s-bit_defconfig b/configs/crs328-4c-20s-4s-bit_defconfig index 95008cf1cb1..6f91a9947ff 100644 --- a/configs/crs328-4c-20s-4s-bit_defconfig +++ b/configs/crs328-4c-20s-4s-bit_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y CONFIG_SYS_KWD_CONFIG="board/mikrotik/crs3xx-98dx3236/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_TARGET_CRS3XX_98DX3236=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x1F0000 diff --git a/configs/crs328-4c-20s-4s_defconfig b/configs/crs328-4c-20s-4s_defconfig index 2f6cade9bdd..a51da7a134a 100644 --- a/configs/crs328-4c-20s-4s_defconfig +++ b/configs/crs328-4c-20s-4s_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y CONFIG_SYS_KWD_CONFIG="board/mikrotik/crs3xx-98dx3236/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_TARGET_CRS3XX_98DX3236=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x1F0000 diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig index 71bf2451b59..5eea1ec9a72 100644 --- a/configs/d2net_v2_defconfig +++ b/configs/d2net_v2_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/LaCie/net2big_v2/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NET2BIG_V2=y CONFIG_ENV_SIZE=0x1000 diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index d39801068d7..56b827be2d7 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_DAVINCI=y -CONFIG_SYS_TEXT_BASE=0xc1080000 +CONFIG_TEXT_BASE=0xc1080000 CONFIG_SYS_MALLOC_LEN=0x110000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_TARGET_DA850EVM=y diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index a9996d78502..f7521acd8dd 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_DAVINCI=y -CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_TEXT_BASE=0x60000000 CONFIG_SYS_MALLOC_LEN=0x110000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_TARGET_DA850EVM=y diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig index f3ae5a77ccc..158631842fc 100644 --- a/configs/da850evm_nand_defconfig +++ b/configs/da850evm_nand_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_DAVINCI=y -CONFIG_SYS_TEXT_BASE=0xc1080000 +CONFIG_TEXT_BASE=0xc1080000 CONFIG_SYS_MALLOC_LEN=0x110000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_TARGET_DA850EVM=y diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index 2fef3a4daa2..cc46f4eda41 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_TEXT_BASE=0x80110000 CONFIG_SYS_MALLOC_LEN=0x2500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig index c08203e030a..bb3e524b90a 100644 --- a/configs/db-88f6720_defconfig +++ b/configs/db-88f6720_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig index 07e0b1b6f4a..b33bb66b595 100644 --- a/configs/db-88f6820-amc_defconfig +++ b/configs/db-88f6820-amc_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig index 390f229e58a..cf42e3b6014 100644 --- a/configs/db-88f6820-gp_defconfig +++ b/configs/db-88f6820-gp_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig index 55efa373285..ace34007405 100644 --- a/configs/db-mv784mp-gp_defconfig +++ b/configs/db-mv784mp-gp_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/db-xc3-24g4xg_defconfig b/configs/db-xc3-24g4xg_defconfig index 995835a96b3..0555448e6bb 100644 --- a/configs/db-xc3-24g4xg_defconfig +++ b/configs/db-xc3-24g4xg_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y CONFIG_SYS_KWD_CONFIG="board/Marvell/db-xc3-24g4xg/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_TARGET_DB_XC3_24G4XG=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/deneb_defconfig b/configs/deneb_defconfig index 2497b5d9222..cb4dd332024 100644 --- a/configs/deneb_defconfig +++ b/configs/deneb_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y -CONFIG_SYS_TEXT_BASE=0x80020000 +CONFIG_TEXT_BASE=0x80020000 CONFIG_SYS_MALLOC_LEN=0x2800000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig index 744ffbd9433..1232ca576bb 100644 --- a/configs/devkit3250_defconfig +++ b/configs/devkit3250_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_LPC32XX=y -CONFIG_SYS_TEXT_BASE=0x83F00000 +CONFIG_TEXT_BASE=0x83F00000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 9244787fb7d..2c3dc314c3e 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index 35e2c1a326f..f9b1bae4130 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFF00000 +CONFIG_TEXT_BASE=0xFFF00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x6EF000 diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 463c6d4477d..007438ba83d 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SPL_SYS_L2_PL310=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/display5_defconfig b/configs/display5_defconfig index 29397cb3fbd..fbd1e4f7182 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_SPL_GPIO=y diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index 7ae636738de..c02dfbd9e79 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_SPL_GPIO=y diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig index 39f9dd19665..16a866f6b47 100644 --- a/configs/dns325_defconfig +++ b/configs/dns325_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/d-link/dns325/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=1 CONFIG_TARGET_DNS325=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig index 5f98c610011..6c805f41568 100644 --- a/configs/dockstar_defconfig +++ b/configs/dockstar_defconfig @@ -8,7 +8,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/Seagate/dockstar/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_DOCKSTAR=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/draco_defconfig b/configs/draco_defconfig index 148ec5aa02e..cc1fb489eb1 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index e5e70a2adab..929889a8a7b 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=19000000 CONFIG_ARCH_SNAPDRAGON=y -CONFIG_SYS_TEXT_BASE=0x8f600000 +CONFIG_TEXT_BASE=0x8f600000 CONFIG_SYS_MALLOC_LEN=0x802000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/dragonboard820c_defconfig b/configs/dragonboard820c_defconfig index e2e2e627aec..b9ddf2174e0 100644 --- a/configs/dragonboard820c_defconfig +++ b/configs/dragonboard820c_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=19000000 CONFIG_ARCH_SNAPDRAGON=y -CONFIG_SYS_TEXT_BASE=0x80080000 +CONFIG_TEXT_BASE=0x80080000 CONFIG_SYS_MALLOC_LEN=0x804000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x4000 diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index caa6ebc6e0c..86fe0692a0a 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -7,7 +7,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/Marvell/dreamplug/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_DREAMPLUG=y CONFIG_ENV_SIZE=0x1000 diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig index 6b0cbb373b0..93aef472b54 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -7,7 +7,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/Synology/ds109/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_DS109=y CONFIG_ENV_SIZE=0x10000 diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index 0577ac22bce..1b7e36be964 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -4,7 +4,7 @@ CONFIG_ARCH_MVEBU=y CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/durian_defconfig b/configs/durian_defconfig index d7e8824e436..68a3deb3757 100644 --- a/configs/durian_defconfig +++ b/configs/durian_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARM_SMCCC=y CONFIG_TARGET_DURIAN=y -CONFIG_SYS_TEXT_BASE=0x500000 +CONFIG_TEXT_BASE=0x500000 CONFIG_SYS_MALLOC_LEN=0x101000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/eDPU_defconfig b/configs/eDPU_defconfig index 9706b648e58..8cf16f47389 100644 --- a/configs/eDPU_defconfig +++ b/configs/eDPU_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_TARGET_MVEBU_ARMADA_37XX=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x180000 diff --git a/configs/ea-lpc3250devkitv2_defconfig b/configs/ea-lpc3250devkitv2_defconfig index 729bd398d70..d24fa85fa9b 100644 --- a/configs/ea-lpc3250devkitv2_defconfig +++ b/configs/ea-lpc3250devkitv2_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_LPC32XX=y -CONFIG_SYS_TEXT_BASE=0x83000000 +CONFIG_TEXT_BASE=0x83000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 CONFIG_TARGET_EA_LPC3250DEVKITV2=y diff --git a/configs/eaidk-610-rk3399_defconfig b/configs/eaidk-610-rk3399_defconfig index b41a66fe534..5abdadf2d56 100644 --- a/configs/eaidk-610-rk3399_defconfig +++ b/configs/eaidk-610-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-eaidk-610" diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig index f74139de332..4719c09994a 100644 --- a/configs/eb_cpu5282_defconfig +++ b/configs/eb_cpu5282_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0xFF000000 +CONFIG_TEXT_BASE=0xFF000000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="eb_cpu5282" diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig index 6cae31cfa95..25be16041c3 100644 --- a/configs/eb_cpu5282_internal_defconfig +++ b/configs/eb_cpu5282_internal_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0xF0000000 +CONFIG_TEXT_BASE=0xF0000000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="eb_cpu5282_internal" diff --git a/configs/edison_defconfig b/configs/edison_defconfig index dbca94525ed..8238a1b78f9 100644 --- a/configs/edison_defconfig +++ b/configs/edison_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0x1101000 +CONFIG_TEXT_BASE=0x1101000 CONFIG_SYS_MALLOC_LEN=0x8000000 CONFIG_NR_DRAM_BANKS=3 CONFIG_ENV_SIZE=0x10000 diff --git a/configs/elgin-rv1108_defconfig b/configs/elgin-rv1108_defconfig index adfc56c6410..a3a96f9526c 100644 --- a/configs/elgin-rv1108_defconfig +++ b/configs/elgin-rv1108_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_TEXT_BASE=0x60000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rv1108-elgin-r1" diff --git a/configs/emsdp_defconfig b/configs/emsdp_defconfig index 0578d6d8f22..8c364566d55 100644 --- a/configs/emsdp_defconfig +++ b/configs/emsdp_defconfig @@ -2,7 +2,7 @@ CONFIG_ARC=y CONFIG_ISA_ARCV2=y CONFIG_CPU_ARCEM6=y CONFIG_TARGET_EMSDP=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_SYS_MALLOC_LEN=0x10000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/espresso7420_defconfig b/configs/espresso7420_defconfig index f8841028c50..a003f854af2 100644 --- a/configs/espresso7420_defconfig +++ b/configs/espresso7420_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x43E00000 +CONFIG_TEXT_BASE=0x43E00000 CONFIG_SYS_MALLOC_LEN=0x5004000 CONFIG_ARCH_EXYNOS7=y CONFIG_NR_DRAM_BANKS=8 diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index af59b27445b..7bc3ac2a659 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index b8542ecbf7d..5cacfd4c79c 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x27000000 +CONFIG_TEXT_BASE=0x27000000 CONFIG_SYS_MALLOC_LEN=0x121000 CONFIG_TARGET_ETHERNUT5=y CONFIG_AT91_EFLASH=y diff --git a/configs/ev-imx280-nano-x-mb_defconfig b/configs/ev-imx280-nano-x-mb_defconfig index 8b69b613355..0686916011e 100644 --- a/configs/ev-imx280-nano-x-mb_defconfig +++ b/configs/ev-imx280-nano-x-mb_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_MX6ULL=y CONFIG_TARGET_O4_IMX6ULL_NANO=y diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig index 500c85b8d50..065092dcf5a 100644 --- a/configs/evb-ast2500_defconfig +++ b/configs/evb-ast2500_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_ASPEED=y -CONFIG_SYS_TEXT_BASE=0x0 +CONFIG_TEXT_BASE=0x0 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_TARGET_EVB_AST2500=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/evb-ast2600_defconfig b/configs/evb-ast2600_defconfig index a80513f81b6..2fac79bbd72 100644 --- a/configs/evb-ast2600_defconfig +++ b/configs/evb-ast2600_defconfig @@ -3,7 +3,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_POSITION_INDEPENDENT=y CONFIG_SPL_SYS_THUMB_BUILD=y CONFIG_ARCH_ASPEED=y -CONFIG_SYS_TEXT_BASE=0x80000000 +CONFIG_TEXT_BASE=0x80000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_ASPEED_AST2600=y diff --git a/configs/evb-px30_defconfig b/configs/evb-px30_defconfig index 5c621636616..6bc777c51c1 100644 --- a/configs/evb-px30_defconfig +++ b/configs/evb-px30_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/evb-px5_defconfig b/configs/evb-px5_defconfig index 40df2892e5e..f41c7580b4c 100644 --- a/configs/evb-px5_defconfig +++ b/configs/evb-px5_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3368-px5-evb" diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig index 7bc535e68cf..8ef40d847c7 100644 --- a/configs/evb-rk3036_defconfig +++ b/configs/evb-rk3036_defconfig @@ -5,7 +5,7 @@ CONFIG_SYS_ARCH_TIMER=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_TEXT_BASE=0x60000000 CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="rk3036-sdk" diff --git a/configs/evb-rk3128_defconfig b/configs/evb-rk3128_defconfig index 6526933274a..b3fe35382f8 100644 --- a/configs/evb-rk3128_defconfig +++ b/configs/evb-rk3128_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_ARCH_TIMER=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_TEXT_BASE=0x60000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_OFFSET=0x0 CONFIG_DEFAULT_DEVICE_TREE="rk3128-evb" diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig index 442f504826b..f8ca1f6597b 100644 --- a/configs/evb-rk3229_defconfig +++ b/configs/evb-rk3229_defconfig @@ -4,7 +4,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_TPL_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_ARCH_TIMER=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x61000000 +CONFIG_TEXT_BASE=0x61000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3229-evb" diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig index 18384474534..1a05311ab03 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -3,7 +3,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_TPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SYS_ARCH_TIMER=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-evb" diff --git a/configs/evb-rk3308_defconfig b/configs/evb-rk3308_defconfig index e6a31d3a23a..8502fcc51e6 100644 --- a/configs/evb-rk3308_defconfig +++ b/configs/evb-rk3308_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00600000 +CONFIG_TEXT_BASE=0x00600000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig index 2782a3901df..8a9338e6c6e 100644 --- a/configs/evb-rk3328_defconfig +++ b/configs/evb-rk3328_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3328-evb" diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 504ba2c0d3c..e7da9c4e5ff 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" diff --git a/configs/evb-rk3568_defconfig b/configs/evb-rk3568_defconfig index f24f7bbcc1f..db3acf5be53 100644 --- a/configs/evb-rk3568_defconfig +++ b/configs/evb-rk3568_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00a00000 +CONFIG_TEXT_BASE=0x00a00000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/evb-rv1108_defconfig b/configs/evb-rv1108_defconfig index fc0f052416d..ede8e1f04bc 100644 --- a/configs/evb-rv1108_defconfig +++ b/configs/evb-rv1108_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_TEXT_BASE=0x60000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="rv1108-evb" CONFIG_ROCKCHIP_RV1108=y diff --git a/configs/ficus-rk3399_defconfig b/configs/ficus-rk3399_defconfig index 10a60f655bb..d48dcc1a0ec 100644 --- a/configs/ficus-rk3399_defconfig +++ b/configs/ficus-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-ficus" CONFIG_SPL_TEXT_BASE=0xff8c2000 diff --git a/configs/firefly-px30_defconfig b/configs/firefly-px30_defconfig index bf6c1c6d7e6..1f91118426e 100644 --- a/configs/firefly-px30_defconfig +++ b/configs/firefly-px30_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 4312e4f8206..12e80cadb1b 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -3,7 +3,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_TPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SYS_ARCH_TIMER=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-firefly" diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig index 1d7885abd22..a37870628c6 100644 --- a/configs/firefly-rk3399_defconfig +++ b/configs/firefly-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-firefly" diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 5ae13d5a1e2..141467bbe35 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFF10000 +CONFIG_TEXT_BASE=0xFFF10000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x0 diff --git a/configs/gardena-smart-gateway-at91sam_defconfig b/configs/gardena-smart-gateway-at91sam_defconfig index e889befcca6..5238425423b 100644 --- a/configs/gardena-smart-gateway-at91sam_defconfig +++ b/configs/gardena-smart-gateway-at91sam_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x22900000 +CONFIG_TEXT_BASE=0x22900000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_TARGET_GARDENA_SMART_GATEWAY_AT91SAM=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/gazerbeam_defconfig b/configs/gazerbeam_defconfig index b6698a5bde8..4c565a77b03 100644 --- a/configs/gazerbeam_defconfig +++ b/configs/gazerbeam_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xFE000000 +CONFIG_TEXT_BASE=0xFE000000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x600 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ge_b1x5v2_defconfig b/configs/ge_b1x5v2_defconfig index 3e51a8fdee3..180a6a8568e 100644 --- a/configs/ge_b1x5v2_defconfig +++ b/configs/ge_b1x5v2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig index 52d9569d873..d9fbdbd6401 100644 --- a/configs/ge_bx50v3_defconfig +++ b/configs/ge_bx50v3_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/geekbox_defconfig b/configs/geekbox_defconfig index 2ef8b41c779..1d7832b9591 100644 --- a/configs/geekbox_defconfig +++ b/configs/geekbox_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="rk3368-geekbox" diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig index ab7fa511729..e20830df4a2 100644 --- a/configs/giedi_defconfig +++ b/configs/giedi_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y -CONFIG_SYS_TEXT_BASE=0x80020000 +CONFIG_TEXT_BASE=0x80020000 CONFIG_SYS_MALLOC_LEN=0x2800000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index ef0193e786e..6fdb3ea6800 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -8,7 +8,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/Seagate/goflexhome/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_GOFLEXHOME=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 930755c668f..8e0b2189dfe 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -4,7 +4,7 @@ CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/grpeach_defconfig b/configs/grpeach_defconfig index 946d81cc04c..c468446560c 100644 --- a/configs/grpeach_defconfig +++ b/configs/grpeach_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x18000000 +CONFIG_TEXT_BASE=0x18000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig index aaeaaec506e..60bd11aab80 100644 --- a/configs/gurnard_defconfig +++ b/configs/gurnard_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x73f00000 +CONFIG_TEXT_BASE=0x73f00000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TARGET_GURNARD=y diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 5f3424e6a8d..794cf4b23d7 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/Marvell/guruplug/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_GURUPLUG=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index a4486a7ba6b..ad45084969e 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 237eaf54c10..95eabfd2330 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index 14541508e20..be9d4fa8c19 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig index cf1db81e6c1..353d1a33fab 100644 --- a/configs/harmony_defconfig +++ b/configs/harmony_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x00110000 +CONFIG_TEXT_BASE=0x00110000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x1FFE0000 diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig index 2bc0b028409..d5d68f98f97 100644 --- a/configs/helios4_defconfig +++ b/configs/helios4_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig index 4fc73560102..943df631204 100644 --- a/configs/highbank_defconfig +++ b/configs/highbank_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_HIGHBANK=y -CONFIG_SYS_TEXT_BASE=0x00008000 +CONFIG_TEXT_BASE=0x00008000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/hihope_rzg2_defconfig b/configs/hihope_rzg2_defconfig index f9a2e73b11e..086715fbad3 100644 --- a/configs/hihope_rzg2_defconfig +++ b/configs/hihope_rzg2_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=16666666 CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xFFFE0000 diff --git a/configs/hikey960_defconfig b/configs/hikey960_defconfig index f212f3b9164..1fd6d6daf15 100644 --- a/configs/hikey960_defconfig +++ b/configs/hikey960_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=19000000 CONFIG_TARGET_HIKEY960=y -CONFIG_SYS_TEXT_BASE=0x1ac98000 +CONFIG_TEXT_BASE=0x1ac98000 CONFIG_SYS_MALLOC_LEN=0x801000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig index 59d61faeaf1..9eec9281849 100644 --- a/configs/hikey_defconfig +++ b/configs/hikey_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=19000000 -CONFIG_SYS_TEXT_BASE=0x35000000 +CONFIG_TEXT_BASE=0x35000000 CONFIG_SYS_MALLOC_LEN=0x801000 CONFIG_NR_DRAM_BANKS=6 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/hsdk_4xd_defconfig b/configs/hsdk_4xd_defconfig index bcdae7d2e8e..49489e433c4 100644 --- a/configs/hsdk_4xd_defconfig +++ b/configs/hsdk_4xd_defconfig @@ -2,7 +2,7 @@ CONFIG_ARC=y CONFIG_ISA_ARCV2=y CONFIG_TARGET_HSDK=y CONFIG_BOARD_HSDK_4XD=y -CONFIG_SYS_TEXT_BASE=0x81000000 +CONFIG_TEXT_BASE=0x81000000 CONFIG_SYS_MALLOC_LEN=0x0200000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DM_GPIO=y diff --git a/configs/hsdk_defconfig b/configs/hsdk_defconfig index 943cd696885..705ba6d9667 100644 --- a/configs/hsdk_defconfig +++ b/configs/hsdk_defconfig @@ -1,7 +1,7 @@ CONFIG_ARC=y CONFIG_ISA_ARCV2=y CONFIG_TARGET_HSDK=y -CONFIG_SYS_TEXT_BASE=0x81000000 +CONFIG_TEXT_BASE=0x81000000 CONFIG_SYS_MALLOC_LEN=0x0200000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DM_GPIO=y diff --git a/configs/huawei_hg556a_ram_defconfig b/configs/huawei_hg556a_ram_defconfig index 0788cf5c157..aafec58c819 100644 --- a/configs/huawei_hg556a_ram_defconfig +++ b/configs/huawei_hg556a_ram_defconfig @@ -1,6 +1,6 @@ CONFIG_MIPS=y CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_TEXT_BASE=0x80010000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig index 69fad829435..9290cb7af68 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/raidsonic/ib62x0/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_IB62X0=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig index cb4d91df8cd..ce5a089d327 100644 --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig @@ -8,7 +8,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/iomega/iconnect/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_ICONNECT=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/imx28_xea_defconfig b/configs/imx28_xea_defconfig index dcb2f4eba06..48be3c5f4a6 100644 --- a/configs/imx28_xea_defconfig +++ b/configs/imx28_xea_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SPL_SYS_THUMB_BUILD=y CONFIG_ARCH_MX28=y -CONFIG_SYS_TEXT_BASE=0x40002000 +CONFIG_TEXT_BASE=0x40002000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx28_xea_sb_defconfig b/configs/imx28_xea_sb_defconfig index 3ffa4e0f93a..26227341d9f 100644 --- a/configs/imx28_xea_sb_defconfig +++ b/configs/imx28_xea_sb_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SPL_SYS_THUMB_BUILD=y CONFIG_ARCH_MX28=y -CONFIG_SYS_TEXT_BASE=0x40002000 +CONFIG_TEXT_BASE=0x40002000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig index 48e8ddb7afd..fe4866e2f51 100644 --- a/configs/imx6dl_icore_nand_defconfig +++ b/configs/imx6dl_icore_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig index 067498d80e3..1f10375ef48 100644 --- a/configs/imx6dl_mamoj_defconfig +++ b/configs/imx6dl_mamoj_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x2300000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/imx6q_bosch_acc_defconfig b/configs/imx6q_bosch_acc_defconfig index 7ed31d6b882..23bd92bcb55 100644 --- a/configs/imx6q_bosch_acc_defconfig +++ b/configs/imx6q_bosch_acc_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17780000 +CONFIG_TEXT_BASE=0x17780000 CONFIG_SYS_MALLOC_LEN=0x01000000 CONFIG_SYS_MALLOC_F_LEN=0x9000 CONFIG_SPL_GPIO=y diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig index 251985228e7..2cb995e7ae1 100644 --- a/configs/imx6q_icore_nand_defconfig +++ b/configs/imx6q_icore_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig index 98c54c7b347..e5228baaec5 100644 --- a/configs/imx6q_logic_defconfig +++ b/configs/imx6q_logic_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx6qdl_icore_mipi_defconfig b/configs/imx6qdl_icore_mipi_defconfig index e4b1866a0d0..d90e42c723b 100644 --- a/configs/imx6qdl_icore_mipi_defconfig +++ b/configs/imx6qdl_icore_mipi_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 0ed45160fd8..e8cbf67b68b 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig index 251985228e7..2cb995e7ae1 100644 --- a/configs/imx6qdl_icore_nand_defconfig +++ b/configs/imx6qdl_icore_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig index d3592a0744c..e497d28ff28 100644 --- a/configs/imx6qdl_icore_rqs_defconfig +++ b/configs/imx6qdl_icore_rqs_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig index e5dd7c0f394..0880cc77bf4 100644 --- a/configs/imx6ul_geam_mmc_defconfig +++ b/configs/imx6ul_geam_mmc_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig index f60e4113f24..0b989e64847 100644 --- a/configs/imx6ul_geam_nand_defconfig +++ b/configs/imx6ul_geam_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx6ul_isiot_emmc_defconfig b/configs/imx6ul_isiot_emmc_defconfig index 3bca92c5b9e..eeb0ef77667 100644 --- a/configs/imx6ul_isiot_emmc_defconfig +++ b/configs/imx6ul_isiot_emmc_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx6ul_isiot_nand_defconfig b/configs/imx6ul_isiot_nand_defconfig index 70b53fca752..8318197fdef 100644 --- a/configs/imx6ul_isiot_nand_defconfig +++ b/configs/imx6ul_isiot_nand_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx6ulz_smm_m2_defconfig b/configs/imx6ulz_smm_m2_defconfig index 6b4a0cc372c..bd19a9c7ef9 100644 --- a/configs/imx6ulz_smm_m2_defconfig +++ b/configs/imx6ulz_smm_m2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SYS_MALLOC_F_LEN=0x18000 CONFIG_SPL_GPIO=y diff --git a/configs/imx8mm-cl-iot-gate-optee_defconfig b/configs/imx8mm-cl-iot-gate-optee_defconfig index 9ab217354b6..bb105811c47 100644 --- a/configs/imx8mm-cl-iot-gate-optee_defconfig +++ b/configs/imx8mm-cl-iot-gate-optee_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/imx8mm-cl-iot-gate_defconfig b/configs/imx8mm-cl-iot-gate_defconfig index 73d938834a1..548fb7bf7a2 100644 --- a/configs/imx8mm-cl-iot-gate_defconfig +++ b/configs/imx8mm-cl-iot-gate_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig index d3e0b054181..18d605e0446 100644 --- a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig +++ b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig index 29addb5356a..9fe30e2030b 100644 --- a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig +++ b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mm-mx8menlo_defconfig b/configs/imx8mm-mx8menlo_defconfig index ad6885942d3..991bd1a43c9 100644 --- a/configs/imx8mm-mx8menlo_defconfig +++ b/configs/imx8mm-mx8menlo_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mm_beacon_defconfig b/configs/imx8mm_beacon_defconfig index e37ce01c192..b66f8bfea06 100644 --- a/configs/imx8mm_beacon_defconfig +++ b/configs/imx8mm_beacon_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mm_data_modul_edm_sbc_defconfig b/configs/imx8mm_data_modul_edm_sbc_defconfig index b246fbdc9e8..a18c2ca3ff3 100644 --- a/configs/imx8mm_data_modul_edm_sbc_defconfig +++ b/configs/imx8mm_data_modul_edm_sbc_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig index 0797739bb3a..0b3c1544ca1 100644 --- a/configs/imx8mm_evk_defconfig +++ b/configs/imx8mm_evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mm_evk_fspi_defconfig b/configs/imx8mm_evk_fspi_defconfig index 73c96f634ce..8f668e49836 100644 --- a/configs/imx8mm_evk_fspi_defconfig +++ b/configs/imx8mm_evk_fspi_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mm_venice_defconfig b/configs/imx8mm_venice_defconfig index cf880929182..5652e1bb66f 100644 --- a/configs/imx8mm_venice_defconfig +++ b/configs/imx8mm_venice_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mn_beacon_2g_defconfig b/configs/imx8mn_beacon_2g_defconfig index 613945a9ec6..3f6a42b5bd0 100644 --- a/configs/imx8mn_beacon_2g_defconfig +++ b/configs/imx8mn_beacon_2g_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mn_beacon_defconfig b/configs/imx8mn_beacon_defconfig index cc1583524ba..0d8601ad395 100644 --- a/configs/imx8mn_beacon_defconfig +++ b/configs/imx8mn_beacon_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig index 588597f92b9..b695a69ecaa 100644 --- a/configs/imx8mn_bsh_smm_s2_defconfig +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mn_bsh_smm_s2pro_defconfig b/configs/imx8mn_bsh_smm_s2pro_defconfig index 5763948feea..34893fc6b8d 100644 --- a/configs/imx8mn_bsh_smm_s2pro_defconfig +++ b/configs/imx8mn_bsh_smm_s2pro_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig index d8a9a8065a4..b28835b6745 100644 --- a/configs/imx8mn_ddr4_evk_defconfig +++ b/configs/imx8mn_ddr4_evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mn_evk_defconfig b/configs/imx8mn_evk_defconfig index 4bf40eb97d7..b40ffea9789 100644 --- a/configs/imx8mn_evk_defconfig +++ b/configs/imx8mn_evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mn_var_som_defconfig b/configs/imx8mn_var_som_defconfig index 8e4f6a419c9..1ff1909e906 100644 --- a/configs/imx8mn_var_som_defconfig +++ b/configs/imx8mn_var_som_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mn_venice_defconfig b/configs/imx8mn_venice_defconfig index b40d93c6bb3..e7b2b5ce9f5 100644 --- a/configs/imx8mn_venice_defconfig +++ b/configs/imx8mn_venice_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mp-icore-mx8mp-edimm2.2_defconfig b/configs/imx8mp-icore-mx8mp-edimm2.2_defconfig index dc2a3c23d56..362033ddce5 100644 --- a/configs/imx8mp-icore-mx8mp-edimm2.2_defconfig +++ b/configs/imx8mp-icore-mx8mp-edimm2.2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mp_dhcom_pdk2_defconfig b/configs/imx8mp_dhcom_pdk2_defconfig index 68e4653d8e7..2e78fa79eca 100644 --- a/configs/imx8mp_dhcom_pdk2_defconfig +++ b/configs/imx8mp_dhcom_pdk2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SYS_MALLOC_F_LEN=0x18000 CONFIG_SPL_GPIO=y diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index 406e89e428b..ce7db9bc876 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mp_rsb3720a1_4G_defconfig b/configs/imx8mp_rsb3720a1_4G_defconfig index 6f58be8bbcd..3e1c195b8e9 100644 --- a/configs/imx8mp_rsb3720a1_4G_defconfig +++ b/configs/imx8mp_rsb3720a1_4G_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mp_rsb3720a1_6G_defconfig b/configs/imx8mp_rsb3720a1_6G_defconfig index 591fcf27146..20f4a8c2b1b 100644 --- a/configs/imx8mp_rsb3720a1_6G_defconfig +++ b/configs/imx8mp_rsb3720a1_6G_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mp_venice_defconfig b/configs/imx8mp_venice_defconfig index 84e708a704c..5c0ea11efc4 100644 --- a/configs/imx8mp_venice_defconfig +++ b/configs/imx8mp_venice_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mq_cm_defconfig b/configs/imx8mq_cm_defconfig index 74123b257ad..7a92fccd5d7 100644 --- a/configs/imx8mq_cm_defconfig +++ b/configs/imx8mq_cm_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x600000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index cf207295e54..252565da11e 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x600000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig index 372cd03ed0d..16cd4cc70c0 100644 --- a/configs/imx8mq_phanbell_defconfig +++ b/configs/imx8mq_phanbell_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x600000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index b973b809bef..da27383e687 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y -CONFIG_SYS_TEXT_BASE=0x80020000 +CONFIG_TEXT_BASE=0x80020000 CONFIG_SYS_MALLOC_LEN=0x2400000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_GPIO=y diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index 8e1c0712f14..c3c93bfdf8a 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y -CONFIG_SYS_TEXT_BASE=0x80020000 +CONFIG_TEXT_BASE=0x80020000 CONFIG_SYS_MALLOC_LEN=0x2800000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index 73600c5a8c2..3865eb393f5 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y -CONFIG_SYS_TEXT_BASE=0x80020000 +CONFIG_TEXT_BASE=0x80020000 CONFIG_SYS_MALLOC_LEN=0x2400000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y diff --git a/configs/imx8ulp_evk_defconfig b/configs/imx8ulp_evk_defconfig index f9198cf7247..962c46965c8 100644 --- a/configs/imx8ulp_evk_defconfig +++ b/configs/imx8ulp_evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8ULP=y -CONFIG_SYS_TEXT_BASE=0x80200000 +CONFIG_TEXT_BASE=0x80200000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/imx93_11x11_evk_defconfig b/configs/imx93_11x11_evk_defconfig index 72ec466b7f2..10e315c77f7 100644 --- a/configs/imx93_11x11_evk_defconfig +++ b/configs/imx93_11x11_evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX9=y -CONFIG_SYS_TEXT_BASE=0x80200000 +CONFIG_TEXT_BASE=0x80200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x18000 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/imxrt1020-evk_defconfig b/configs/imxrt1020-evk_defconfig index 4101fd872f6..2ae9067f722 100644 --- a/configs/imxrt1020-evk_defconfig +++ b/configs/imxrt1020-evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMXRT=y -CONFIG_SYS_TEXT_BASE=0x80002000 +CONFIG_TEXT_BASE=0x80002000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_GPIO=y diff --git a/configs/imxrt1050-evk_defconfig b/configs/imxrt1050-evk_defconfig index c12e04db3dc..4e5aa222015 100644 --- a/configs/imxrt1050-evk_defconfig +++ b/configs/imxrt1050-evk_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_DCACHE_OFF=y # CONFIG_SPL_SYS_DCACHE_OFF is not set CONFIG_ARCH_IMXRT=y -CONFIG_SYS_TEXT_BASE=0x80002000 +CONFIG_TEXT_BASE=0x80002000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_GPIO=y diff --git a/configs/imxrt1170-evk_defconfig b/configs/imxrt1170-evk_defconfig index 4edda391fdf..98d6559a460 100644 --- a/configs/imxrt1170-evk_defconfig +++ b/configs/imxrt1170-evk_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_DCACHE_OFF=y # CONFIG_SPL_SYS_DCACHE_OFF is not set CONFIG_ARCH_IMXRT=y -CONFIG_SYS_TEXT_BASE=0x20240000 +CONFIG_TEXT_BASE=0x20240000 CONFIG_SYS_MALLOC_LEN=0x8000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_GPIO=y diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig index 5b383c3f4c8..42f812c31f0 100644 --- a/configs/inetspace_v2_defconfig +++ b/configs/inetspace_v2_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/LaCie/netspace_v2/kwbimage-is2.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NETSPACE_V2=y CONFIG_ENV_SIZE=0x1000 diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig index b697e2ac777..e2709ec5218 100644 --- a/configs/integratorap_cm720t_defconfig +++ b/configs/integratorap_cm720t_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x28000 CONFIG_ARCH_INTEGRATOR_AP=y CONFIG_CM720T=y diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig index 1b5301e6ae4..e8baca158b8 100644 --- a/configs/integratorap_cm920t_defconfig +++ b/configs/integratorap_cm920t_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x28000 CONFIG_ARCH_INTEGRATOR_AP=y CONFIG_CM920T=y diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig index 7147827005a..04032c8b946 100644 --- a/configs/integratorap_cm926ejs_defconfig +++ b/configs/integratorap_cm926ejs_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x28000 CONFIG_ARCH_INTEGRATOR_AP=y CONFIG_CM926EJ_S=y diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig index ddadd128113..3d910d3d48d 100644 --- a/configs/integratorap_cm946es_defconfig +++ b/configs/integratorap_cm946es_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x28000 CONFIG_ARCH_INTEGRATOR_AP=y CONFIG_CM946ES=y diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig index c9623cc6a18..71f399b58c3 100644 --- a/configs/integratorcp_cm1136_defconfig +++ b/configs/integratorcp_cm1136_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x22000 CONFIG_ARCH_INTEGRATOR_CP=y CONFIG_CM1136=y diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig index 64a4b81496c..7585d6d154c 100644 --- a/configs/integratorcp_cm920t_defconfig +++ b/configs/integratorcp_cm920t_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x22000 CONFIG_ARCH_INTEGRATOR_CP=y CONFIG_CM920T=y diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig index 4a72befd5ae..6f8c1965766 100644 --- a/configs/integratorcp_cm926ejs_defconfig +++ b/configs/integratorcp_cm926ejs_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x22000 CONFIG_ARCH_INTEGRATOR_CP=y CONFIG_CM926EJ_S=y diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig index 9b3fda0b249..6efa39f34d9 100644 --- a/configs/integratorcp_cm946es_defconfig +++ b/configs/integratorcp_cm946es_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x22000 CONFIG_ARCH_INTEGRATOR_CP=y CONFIG_CM946ES=y diff --git a/configs/iot_devkit_defconfig b/configs/iot_devkit_defconfig index 34eede7cb6d..ddc3a2b651b 100644 --- a/configs/iot_devkit_defconfig +++ b/configs/iot_devkit_defconfig @@ -4,7 +4,7 @@ CONFIG_CPU_ARCEM6=y CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y CONFIG_TARGET_IOT_DEVKIT=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_SYS_MALLOC_LEN=0x10000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/jethub_j100_defconfig b/configs/jethub_j100_defconfig index 87a44d43356..c2651580f87 100644 --- a/configs/jethub_j100_defconfig +++ b/configs/jethub_j100_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="jethub-j100" CONFIG_SYS_CONFIG_NAME="jethub" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/jethub_j80_defconfig b/configs/jethub_j80_defconfig index 7ca2e18da33..f3c47a001a6 100644 --- a/configs/jethub_j80_defconfig +++ b/configs/jethub_j80_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="jethub-j80" CONFIG_SYS_CONFIG_NAME="jethub" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index f4f0063abcf..11879740999 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_TEXT_BASE=0x80110000 CONFIG_SYS_MALLOC_LEN=0x2500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index ed2affd8f7f..977348e73fc 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -4,7 +4,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KEYSTONE=y -CONFIG_SYS_TEXT_BASE=0xC000000 +CONFIG_TEXT_BASE=0xC000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TI_COMMON_CMD_OPTIONS=y diff --git a/configs/k2e_hs_evm_defconfig b/configs/k2e_hs_evm_defconfig index c19c69903b1..afba285ffb2 100644 --- a/configs/k2e_hs_evm_defconfig +++ b/configs/k2e_hs_evm_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KEYSTONE=y CONFIG_TI_SECURE_DEVICE=y -CONFIG_SYS_TEXT_BASE=0xC000060 +CONFIG_TEXT_BASE=0xC000060 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TI_COMMON_CMD_OPTIONS=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index c7786216df5..6182101f119 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -4,7 +4,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KEYSTONE=y -CONFIG_SYS_TEXT_BASE=0xC000000 +CONFIG_TEXT_BASE=0xC000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TI_COMMON_CMD_OPTIONS=y diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig index 5b487972818..fd169c3e957 100644 --- a/configs/k2g_hs_evm_defconfig +++ b/configs/k2g_hs_evm_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KEYSTONE=y CONFIG_TI_SECURE_DEVICE=y -CONFIG_SYS_TEXT_BASE=0xC000060 +CONFIG_TEXT_BASE=0xC000060 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TI_COMMON_CMD_OPTIONS=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index 973d812385b..6c4563912b5 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -4,7 +4,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KEYSTONE=y -CONFIG_SYS_TEXT_BASE=0xC000000 +CONFIG_TEXT_BASE=0xC000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TI_COMMON_CMD_OPTIONS=y diff --git a/configs/k2hk_hs_evm_defconfig b/configs/k2hk_hs_evm_defconfig index fe25c090bbf..33624badae0 100644 --- a/configs/k2hk_hs_evm_defconfig +++ b/configs/k2hk_hs_evm_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KEYSTONE=y CONFIG_TI_SECURE_DEVICE=y -CONFIG_SYS_TEXT_BASE=0xC000060 +CONFIG_TEXT_BASE=0xC000060 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TI_COMMON_CMD_OPTIONS=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 437cf4b06d9..e28054bcc72 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -4,7 +4,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KEYSTONE=y -CONFIG_SYS_TEXT_BASE=0xC000000 +CONFIG_TEXT_BASE=0xC000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TI_COMMON_CMD_OPTIONS=y diff --git a/configs/k2l_hs_evm_defconfig b/configs/k2l_hs_evm_defconfig index 9b98bc9f2ab..8f8bb549130 100644 --- a/configs/k2l_hs_evm_defconfig +++ b/configs/k2l_hs_evm_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KEYSTONE=y CONFIG_TI_SECURE_DEVICE=y -CONFIG_SYS_TEXT_BASE=0xC000060 +CONFIG_TEXT_BASE=0xC000060 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TI_COMMON_CMD_OPTIONS=y diff --git a/configs/khadas-edge-captain-rk3399_defconfig b/configs/khadas-edge-captain-rk3399_defconfig index b0dabfaf431..43aa3d9a4a6 100644 --- a/configs/khadas-edge-captain-rk3399_defconfig +++ b/configs/khadas-edge-captain-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-khadas-edge-captain" diff --git a/configs/khadas-edge-rk3399_defconfig b/configs/khadas-edge-rk3399_defconfig index 93a9f0009da..467e478ea4d 100644 --- a/configs/khadas-edge-rk3399_defconfig +++ b/configs/khadas-edge-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-khadas-edge" diff --git a/configs/khadas-edge-v-rk3399_defconfig b/configs/khadas-edge-v-rk3399_defconfig index bc540f4c780..a9d218a2ca6 100644 --- a/configs/khadas-edge-v-rk3399_defconfig +++ b/configs/khadas-edge-v-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-khadas-edge-v" diff --git a/configs/khadas-vim2_defconfig b/configs/khadas-vim2_defconfig index 5b3aa635aaf..a8d11a83c98 100644 --- a/configs/khadas-vim2_defconfig +++ b/configs/khadas-vim2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/khadas-vim3_android_ab_defconfig b/configs/khadas-vim3_android_ab_defconfig index d3a4ab748c4..01a91573e31 100644 --- a/configs/khadas-vim3_android_ab_defconfig +++ b/configs/khadas-vim3_android_ab_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="vim3" CONFIG_SYS_CONFIG_NAME="khadas-vim3_android" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x10000 CONFIG_DM_GPIO=y diff --git a/configs/khadas-vim3_android_defconfig b/configs/khadas-vim3_android_defconfig index 827e994f1fd..7a2815d29f6 100644 --- a/configs/khadas-vim3_android_defconfig +++ b/configs/khadas-vim3_android_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="vim3" CONFIG_SYS_CONFIG_NAME="khadas-vim3_android" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x10000 CONFIG_DM_GPIO=y diff --git a/configs/khadas-vim3_defconfig b/configs/khadas-vim3_defconfig index 701e70eeb93..792ee71f58a 100644 --- a/configs/khadas-vim3_defconfig +++ b/configs/khadas-vim3_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="vim3" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/khadas-vim3l_android_ab_defconfig b/configs/khadas-vim3l_android_ab_defconfig index 44ab1ed1b80..e182a3ea268 100644 --- a/configs/khadas-vim3l_android_ab_defconfig +++ b/configs/khadas-vim3l_android_ab_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="vim3" CONFIG_SYS_CONFIG_NAME="khadas-vim3l_android" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x10000 CONFIG_DM_GPIO=y diff --git a/configs/khadas-vim3l_android_defconfig b/configs/khadas-vim3l_android_defconfig index 30c5dc26040..bf3e2df83e2 100644 --- a/configs/khadas-vim3l_android_defconfig +++ b/configs/khadas-vim3l_android_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="vim3" CONFIG_SYS_CONFIG_NAME="khadas-vim3l_android" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x10000 CONFIG_DM_GPIO=y diff --git a/configs/khadas-vim3l_defconfig b/configs/khadas-vim3l_defconfig index c78dfce5d5a..a99d4cacc5c 100644 --- a/configs/khadas-vim3l_defconfig +++ b/configs/khadas-vim3l_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="vim3" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/khadas-vim_defconfig b/configs/khadas-vim_defconfig index bdabd5dff19..d1ed45ff88e 100644 --- a/configs/khadas-vim_defconfig +++ b/configs/khadas-vim_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/kmcent2_defconfig b/configs/kmcent2_defconfig index a13d799f367..86c7aa5eb09 100644 --- a/configs/kmcent2_defconfig +++ b/configs/kmcent2_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xebf40000 +CONFIG_TEXT_BASE=0xebf40000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index 34ab31565ca..9b3fee71240 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xF0000000 +CONFIG_TEXT_BASE=0xF0000000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="kmcoge5ne" diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index 98f23dbbf17..0aba19bf4f7 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xF0000000 +CONFIG_TEXT_BASE=0xF0000000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SECT_SIZE=0x20000 diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index 6a6f20890a7..b3f993d5fd0 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xF0000000 +CONFIG_TEXT_BASE=0xF0000000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="kmopti2" diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index d251eba0d04..d3e85c049f9 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xF0000000 +CONFIG_TEXT_BASE=0xF0000000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="kmsupm5" diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index 5bb3d9c1160..cf2f59b39b5 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xF0000000 +CONFIG_TEXT_BASE=0xF0000000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="kmtepr2" diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index ee4bb102a79..92523756642 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -4,7 +4,7 @@ CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/kontron-sl-mx6ul_defconfig b/configs/kontron-sl-mx6ul_defconfig index aa789fc6e5e..7391e597642 100644 --- a/configs/kontron-sl-mx6ul_defconfig +++ b/configs/kontron-sl-mx6ul_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig index 061391784f0..2268c79e873 100644 --- a/configs/kontron-sl-mx8mm_defconfig +++ b/configs/kontron-sl-mx8mm_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 284aa6d6b8b..05c09ae3c5b 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x600000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/kp_imx53_defconfig b/configs/kp_imx53_defconfig index 6f60aa96f12..14cb69d9f19 100644 --- a/configs/kp_imx53_defconfig +++ b/configs/kp_imx53_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX5=y -CONFIG_SYS_TEXT_BASE=0x77800000 +CONFIG_TEXT_BASE=0x77800000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig index 8c5010d6052..b2972017d6a 100644 --- a/configs/kp_imx6q_tpc_defconfig +++ b/configs/kp_imx6q_tpc_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_F_LEN=0x2200 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig index 4f17de826c8..1ad635daa98 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -5,7 +5,7 @@ CONFIG_SYS_ARCH_TIMER=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_TEXT_BASE=0x60000000 CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/lager_defconfig b/configs/lager_defconfig index b8946437cf6..cc5f4c517b6 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -4,7 +4,7 @@ CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/leez-rk3399_defconfig b/configs/leez-rk3399_defconfig index 264230c014d..a8326f03a23 100644 --- a/configs/leez-rk3399_defconfig +++ b/configs/leez-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-leez-p710" diff --git a/configs/legoev3_defconfig b/configs/legoev3_defconfig index 245e7579aaf..98e37f18b4f 100644 --- a/configs/legoev3_defconfig +++ b/configs/legoev3_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_DAVINCI=y -CONFIG_SYS_TEXT_BASE=0xc1080000 +CONFIG_TEXT_BASE=0xc1080000 CONFIG_SYS_MALLOC_LEN=0x110000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TARGET_LEGOEV3=y diff --git a/configs/librem5_defconfig b/configs/librem5_defconfig index b022ae36378..d5304bc21ce 100644 --- a/configs/librem5_defconfig +++ b/configs/librem5_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/libretech-ac_defconfig b/configs/libretech-ac_defconfig index 3e30c252bd6..a3331066924 100644 --- a/configs/libretech-ac_defconfig +++ b/configs/libretech-ac_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="libretech-ac" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFF0000 diff --git a/configs/libretech-cc_defconfig b/configs/libretech-cc_defconfig index f5832cd728e..60b40e6270b 100644 --- a/configs/libretech-cc_defconfig +++ b/configs/libretech-cc_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/libretech-cc_v2_defconfig b/configs/libretech-cc_v2_defconfig index 42b76a2ac62..c88542d1511 100644 --- a/configs/libretech-cc_v2_defconfig +++ b/configs/libretech-cc_v2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFF0000 diff --git a/configs/libretech-s905d-pc_defconfig b/configs/libretech-s905d-pc_defconfig index 245194ee917..d3e600ec028 100644 --- a/configs/libretech-s905d-pc_defconfig +++ b/configs/libretech-s905d-pc_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="q200" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0xFFFF0000 diff --git a/configs/libretech-s912-pc_defconfig b/configs/libretech-s912-pc_defconfig index 63137eb5686..8b4f052d085 100644 --- a/configs/libretech-s912-pc_defconfig +++ b/configs/libretech-s912-pc_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0xFFFF0000 diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig index 33cd0c37c68..1ace7b795a0 100644 --- a/configs/lion-rk3368_defconfig +++ b/configs/lion-rk3368_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3368-lion-haikou" diff --git a/configs/liteboard_defconfig b/configs/liteboard_defconfig index c96ea617cf1..06f9fd7b847 100644 --- a/configs/liteboard_defconfig +++ b/configs/liteboard_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/ls1012a2g5rdb_qspi_defconfig b/configs/ls1012a2g5rdb_qspi_defconfig index 08b3ea6df4f..dbb0ce0221f 100644 --- a/configs/ls1012a2g5rdb_qspi_defconfig +++ b/configs/ls1012a2g5rdb_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012A2G5RDB=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012a2g5rdb_tfa_defconfig b/configs/ls1012a2g5rdb_tfa_defconfig index 0120aeb7caa..a8b4ce2bab9 100644 --- a/configs/ls1012a2g5rdb_tfa_defconfig +++ b/configs/ls1012a2g5rdb_tfa_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012A2G5RDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012afrdm_qspi_defconfig b/configs/ls1012afrdm_qspi_defconfig index c1b85292e78..1a4fc999db7 100644 --- a/configs/ls1012afrdm_qspi_defconfig +++ b/configs/ls1012afrdm_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012AFRDM=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012afrdm_tfa_defconfig b/configs/ls1012afrdm_tfa_defconfig index c8d0e68bd83..7e9076a1f99 100644 --- a/configs/ls1012afrdm_tfa_defconfig +++ b/configs/ls1012afrdm_tfa_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012AFRDM=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig index 949a401f101..7bfe1f7cae5 100644 --- a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012AFRWY=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012afrwy_qspi_defconfig b/configs/ls1012afrwy_qspi_defconfig index d1e2d6f0dbc..2327d892437 100644 --- a/configs/ls1012afrwy_qspi_defconfig +++ b/configs/ls1012afrwy_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012AFRWY=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig index 04b6ff30a0e..250440a70ac 100644 --- a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012AFRWY=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012afrwy_tfa_defconfig b/configs/ls1012afrwy_tfa_defconfig index f8ee74f8d6c..f1600c4005b 100644 --- a/configs/ls1012afrwy_tfa_defconfig +++ b/configs/ls1012afrwy_tfa_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012AFRWY=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig index 0b4f433f290..e4a26dc0ab2 100644 --- a/configs/ls1012aqds_qspi_defconfig +++ b/configs/ls1012aqds_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012AQDS=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig index 44b96fba67a..c9fa1099303 100644 --- a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012AQDS=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012aqds_tfa_defconfig b/configs/ls1012aqds_tfa_defconfig index e72ef059276..773a3e6b2b6 100644 --- a/configs/ls1012aqds_tfa_defconfig +++ b/configs/ls1012aqds_tfa_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012AQDS=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig index 13e1a863b9e..c9f0635de17 100644 --- a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012ARDB=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig index 1b0869b011c..c1c21cb187c 100644 --- a/configs/ls1012ardb_qspi_defconfig +++ b/configs/ls1012ardb_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012ARDB=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig index 10c81343628..503fe95c88d 100644 --- a/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1012ardb_tfa_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012ARDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1012ardb_tfa_defconfig b/configs/ls1012ardb_tfa_defconfig index 0a18e48a581..727d10ffaaa 100644 --- a/configs/ls1012ardb_tfa_defconfig +++ b/configs/ls1012ardb_tfa_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1012ARDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig index 722623694f2..72129a70a8c 100644 --- a/configs/ls1021aiot_qspi_defconfig +++ b/configs/ls1021aiot_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021AIOT=y -CONFIG_SYS_TEXT_BASE=0x40010000 +CONFIG_TEXT_BASE=0x40010000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig index 64ae1dfd189..450f254413e 100644 --- a/configs/ls1021aiot_sdcard_defconfig +++ b/configs/ls1021aiot_sdcard_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021AIOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig index 7f4a4fd0982..e694619efce 100644 --- a/configs/ls1021aqds_ddr4_nor_defconfig +++ b/configs/ls1021aqds_ddr4_nor_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021AQDS=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig index 78c69db78c3..e4e49baa32d 100644 --- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig +++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021AQDS=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig index 3b7ad02e8b0..c7667083f5a 100644 --- a/configs/ls1021aqds_nand_defconfig +++ b/configs/ls1021aqds_nand_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021AQDS=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig index 5992d1f4339..2f1b41f0686 100644 --- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig +++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021AQDS=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig index 80f79c438c2..47eb897b376 100644 --- a/configs/ls1021aqds_nor_defconfig +++ b/configs/ls1021aqds_nor_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021AQDS=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig index a3014316564..7dad3239ab4 100644 --- a/configs/ls1021aqds_nor_lpuart_defconfig +++ b/configs/ls1021aqds_nor_lpuart_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021AQDS=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig index 69494a09cfe..1c38d99dfca 100644 --- a/configs/ls1021aqds_qspi_defconfig +++ b/configs/ls1021aqds_qspi_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021AQDS=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1021aqds_sdcard_ifc_defconfig b/configs/ls1021aqds_sdcard_ifc_defconfig index 54e82250b59..9c3d2a8416c 100644 --- a/configs/ls1021aqds_sdcard_ifc_defconfig +++ b/configs/ls1021aqds_sdcard_ifc_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021AQDS=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1021aqds_sdcard_qspi_defconfig b/configs/ls1021aqds_sdcard_qspi_defconfig index b528671b63f..eb5e3322ec5 100644 --- a/configs/ls1021aqds_sdcard_qspi_defconfig +++ b/configs/ls1021aqds_sdcard_qspi_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021AQDS=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1021atsn_qspi_defconfig b/configs/ls1021atsn_qspi_defconfig index 74fb48c5450..877a771b51c 100644 --- a/configs/ls1021atsn_qspi_defconfig +++ b/configs/ls1021atsn_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021ATSN=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1021atsn_sdcard_defconfig b/configs/ls1021atsn_sdcard_defconfig index 63631f69434..60f079519ba 100644 --- a/configs/ls1021atsn_sdcard_defconfig +++ b/configs/ls1021atsn_sdcard_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021ATSN=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x1020000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig index a57d4da9ba8..290d53f852c 100644 --- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021ATWR=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x1020000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig index a634b9e6fcb..922cc216969 100644 --- a/configs/ls1021atwr_nor_defconfig +++ b/configs/ls1021atwr_nor_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021ATWR=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x1020000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig index 7447b36a139..8156b6aeefd 100644 --- a/configs/ls1021atwr_nor_lpuart_defconfig +++ b/configs/ls1021atwr_nor_lpuart_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021ATWR=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x1020000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig index f290cd3a105..b3a93179c22 100644 --- a/configs/ls1021atwr_qspi_defconfig +++ b/configs/ls1021atwr_qspi_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021ATWR=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x1002000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig index 24d48b9ab6a..0c42bcfa143 100644 --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021ATWR=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x1020000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1021atwr_sdcard_ifc_defconfig b/configs/ls1021atwr_sdcard_ifc_defconfig index ffe377cda1e..eee355ca299 100644 --- a/configs/ls1021atwr_sdcard_ifc_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021ATWR=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x1020000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig index fb81e471df4..9e936dab85c 100644 --- a/configs/ls1021atwr_sdcard_qspi_defconfig +++ b/configs/ls1021atwr_sdcard_qspi_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=12500000 CONFIG_TARGET_LS1021ATWR=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x1020000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1043aqds_defconfig b/configs/ls1043aqds_defconfig index fa2dd86466f..9b3c77fe56b 100644 --- a/configs/ls1043aqds_defconfig +++ b/configs/ls1043aqds_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043AQDS=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x120000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/ls1043aqds_lpuart_defconfig b/configs/ls1043aqds_lpuart_defconfig index e0ddbe0a25e..7334d31e834 100644 --- a/configs/ls1043aqds_lpuart_defconfig +++ b/configs/ls1043aqds_lpuart_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043AQDS=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x120000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/ls1043aqds_nand_defconfig b/configs/ls1043aqds_nand_defconfig index d3808979019..2d2f6d26cb9 100644 --- a/configs/ls1043aqds_nand_defconfig +++ b/configs/ls1043aqds_nand_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043AQDS=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1043aqds_nor_ddr3_defconfig b/configs/ls1043aqds_nor_ddr3_defconfig index 541a2f89859..21bb036ee8c 100644 --- a/configs/ls1043aqds_nor_ddr3_defconfig +++ b/configs/ls1043aqds_nor_ddr3_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043AQDS=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x120000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/ls1043aqds_qspi_defconfig b/configs/ls1043aqds_qspi_defconfig index 660f4c850f2..fd7f3bb69b3 100644 --- a/configs/ls1043aqds_qspi_defconfig +++ b/configs/ls1043aqds_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043AQDS=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1043aqds_sdcard_ifc_defconfig b/configs/ls1043aqds_sdcard_ifc_defconfig index 565970dbb84..fc0e7fa97e6 100644 --- a/configs/ls1043aqds_sdcard_ifc_defconfig +++ b/configs/ls1043aqds_sdcard_ifc_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043AQDS=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1043aqds_sdcard_qspi_defconfig b/configs/ls1043aqds_sdcard_qspi_defconfig index ba1b7fe624d..8a617a0af7a 100644 --- a/configs/ls1043aqds_sdcard_qspi_defconfig +++ b/configs/ls1043aqds_sdcard_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043AQDS=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig index 2e581e4eddb..b75c75230fc 100644 --- a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043AQDS=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1043aqds_tfa_defconfig b/configs/ls1043aqds_tfa_defconfig index 48c33a2993c..21199b9d068 100644 --- a/configs/ls1043aqds_tfa_defconfig +++ b/configs/ls1043aqds_tfa_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043AQDS=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1043ardb_SECURE_BOOT_defconfig b/configs/ls1043ardb_SECURE_BOOT_defconfig index ab171bc748f..df227d80371 100644 --- a/configs/ls1043ardb_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_SECURE_BOOT_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043ARDB=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x120000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/ls1043ardb_defconfig b/configs/ls1043ardb_defconfig index a434aad061e..0e2fa0284dc 100644 --- a/configs/ls1043ardb_defconfig +++ b/configs/ls1043ardb_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043ARDB=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x120000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig index 3a5b61b133a..372e1d1955d 100644 --- a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043ARDB=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1043ardb_nand_defconfig b/configs/ls1043ardb_nand_defconfig index 6100ba2c8b8..d66ca184836 100644 --- a/configs/ls1043ardb_nand_defconfig +++ b/configs/ls1043ardb_nand_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043ARDB=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig index 33678c122eb..aec4df903e6 100644 --- a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043ARDB=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1043ardb_sdcard_defconfig b/configs/ls1043ardb_sdcard_defconfig index ad221a33294..69a69aa763d 100644 --- a/configs/ls1043ardb_sdcard_defconfig +++ b/configs/ls1043ardb_sdcard_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043ARDB=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig index 49929728f75..7ca5457c2d2 100644 --- a/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043ARDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1043ardb_tfa_defconfig b/configs/ls1043ardb_tfa_defconfig index 9128959bd3d..5fe6bae3a1b 100644 --- a/configs/ls1043ardb_tfa_defconfig +++ b/configs/ls1043ardb_tfa_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1043ARDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig b/configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig index d2ad85efe2f..7d9f5330016 100644 --- a/configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046AFRWY=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1046afrwy_tfa_defconfig b/configs/ls1046afrwy_tfa_defconfig index 5f972482266..03e944fa7a1 100644 --- a/configs/ls1046afrwy_tfa_defconfig +++ b/configs/ls1046afrwy_tfa_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046AFRWY=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1046aqds_SECURE_BOOT_defconfig b/configs/ls1046aqds_SECURE_BOOT_defconfig index 58130015a63..e9cf20d5f74 100644 --- a/configs/ls1046aqds_SECURE_BOOT_defconfig +++ b/configs/ls1046aqds_SECURE_BOOT_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046AQDS=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x120000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/ls1046aqds_defconfig b/configs/ls1046aqds_defconfig index 3d5be39e6dd..0e2f4094f79 100644 --- a/configs/ls1046aqds_defconfig +++ b/configs/ls1046aqds_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046AQDS=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x120000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/ls1046aqds_lpuart_defconfig b/configs/ls1046aqds_lpuart_defconfig index dfdc9a3af93..defcac0a9be 100644 --- a/configs/ls1046aqds_lpuart_defconfig +++ b/configs/ls1046aqds_lpuart_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046AQDS=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x120000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/ls1046aqds_nand_defconfig b/configs/ls1046aqds_nand_defconfig index 753e7b54524..b17742b5157 100644 --- a/configs/ls1046aqds_nand_defconfig +++ b/configs/ls1046aqds_nand_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046AQDS=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1046aqds_qspi_defconfig b/configs/ls1046aqds_qspi_defconfig index 8a08f9a9901..552bb43f7a1 100644 --- a/configs/ls1046aqds_qspi_defconfig +++ b/configs/ls1046aqds_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046AQDS=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1046aqds_sdcard_ifc_defconfig b/configs/ls1046aqds_sdcard_ifc_defconfig index 7e12a9006a7..316e4cd0018 100644 --- a/configs/ls1046aqds_sdcard_ifc_defconfig +++ b/configs/ls1046aqds_sdcard_ifc_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046AQDS=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1046aqds_sdcard_qspi_defconfig b/configs/ls1046aqds_sdcard_qspi_defconfig index 47c0ae80631..e206f9ed1eb 100644 --- a/configs/ls1046aqds_sdcard_qspi_defconfig +++ b/configs/ls1046aqds_sdcard_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046AQDS=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig index e47b495aa25..0a363533ff2 100644 --- a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046AQDS=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig index 9bcb70a82a7..26fc4592a96 100644 --- a/configs/ls1046aqds_tfa_defconfig +++ b/configs/ls1046aqds_tfa_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046AQDS=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1046ardb_emmc_defconfig b/configs/ls1046ardb_emmc_defconfig index 54c48f2ea64..7f8cb696018 100644 --- a/configs/ls1046ardb_emmc_defconfig +++ b/configs/ls1046ardb_emmc_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046ARDB=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig index 46a9b7c531f..61b7244ff22 100644 --- a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046ARDB=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig index eb6f5c83424..05115ea71e4 100644 --- a/configs/ls1046ardb_qspi_defconfig +++ b/configs/ls1046ardb_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046ARDB=y -CONFIG_SYS_TEXT_BASE=0x40100000 +CONFIG_TEXT_BASE=0x40100000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1046ardb_qspi_spl_defconfig b/configs/ls1046ardb_qspi_spl_defconfig index ae110b6ac8e..c43f46231cc 100644 --- a/configs/ls1046ardb_qspi_spl_defconfig +++ b/configs/ls1046ardb_qspi_spl_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046ARDB=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig index a4efdd5ce4f..4da4f648f0f 100644 --- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046ARDB=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1046ardb_sdcard_defconfig b/configs/ls1046ardb_sdcard_defconfig index dc388051c72..1026ca1832b 100644 --- a/configs/ls1046ardb_sdcard_defconfig +++ b/configs/ls1046ardb_sdcard_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046ARDB=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig index 2efb0467991..2432154f77b 100644 --- a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046ARDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1046ardb_tfa_defconfig b/configs/ls1046ardb_tfa_defconfig index 00265b16126..0aa2792c3c4 100644 --- a/configs/ls1046ardb_tfa_defconfig +++ b/configs/ls1046ardb_tfa_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_TARGET_LS1046ARDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x102000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1088aqds_defconfig b/configs/ls1088aqds_defconfig index 5c06d8c2623..1e865909aa1 100644 --- a/configs/ls1088aqds_defconfig +++ b/configs/ls1088aqds_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088AQDS=y -CONFIG_SYS_TEXT_BASE=0x30100000 +CONFIG_TEXT_BASE=0x30100000 CONFIG_SYS_MALLOC_LEN=0x0220000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig index 14533c8ee23..cfe15406e8d 100644 --- a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088AQDS=y -CONFIG_SYS_TEXT_BASE=0x20100000 +CONFIG_TEXT_BASE=0x20100000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1088aqds_qspi_defconfig b/configs/ls1088aqds_qspi_defconfig index 1964c62f13f..4e0e7c302a3 100644 --- a/configs/ls1088aqds_qspi_defconfig +++ b/configs/ls1088aqds_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088AQDS=y -CONFIG_SYS_TEXT_BASE=0x20100000 +CONFIG_TEXT_BASE=0x20100000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1088aqds_sdcard_ifc_defconfig b/configs/ls1088aqds_sdcard_ifc_defconfig index 6a1ceb3b73c..a2bc106bd0c 100644 --- a/configs/ls1088aqds_sdcard_ifc_defconfig +++ b/configs/ls1088aqds_sdcard_ifc_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088AQDS=y -CONFIG_SYS_TEXT_BASE=0x80400000 +CONFIG_TEXT_BASE=0x80400000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1088aqds_sdcard_qspi_defconfig b/configs/ls1088aqds_sdcard_qspi_defconfig index b6cc4fd8992..81d9192b326 100644 --- a/configs/ls1088aqds_sdcard_qspi_defconfig +++ b/configs/ls1088aqds_sdcard_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088AQDS=y -CONFIG_SYS_TEXT_BASE=0x80400000 +CONFIG_TEXT_BASE=0x80400000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1088aqds_tfa_defconfig b/configs/ls1088aqds_tfa_defconfig index 4a49c094b30..cce2d9ab195 100644 --- a/configs/ls1088aqds_tfa_defconfig +++ b/configs/ls1088aqds_tfa_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088AQDS=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x0220000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig index 1ca86397139..4c46384a6f8 100644 --- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088ARDB=y -CONFIG_SYS_TEXT_BASE=0x20100000 +CONFIG_TEXT_BASE=0x20100000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig index 008c4b56e0a..796264502da 100644 --- a/configs/ls1088ardb_qspi_defconfig +++ b/configs/ls1088ardb_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088ARDB=y -CONFIG_SYS_TEXT_BASE=0x20100000 +CONFIG_TEXT_BASE=0x20100000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig index e62892c4d5e..2bb9fdf75ce 100644 --- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088ARDB=y -CONFIG_SYS_TEXT_BASE=0x80400000 +CONFIG_TEXT_BASE=0x80400000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1088ardb_sdcard_qspi_defconfig b/configs/ls1088ardb_sdcard_qspi_defconfig index b978b660519..b897988e846 100644 --- a/configs/ls1088ardb_sdcard_qspi_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088ARDB=y -CONFIG_SYS_TEXT_BASE=0x80400000 +CONFIG_TEXT_BASE=0x80400000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig index 3119175e0e3..7ba59404810 100644 --- a/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_tfa_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088ARDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/ls1088ardb_tfa_defconfig b/configs/ls1088ardb_tfa_defconfig index 88e670c5e4a..ff5784bf6c5 100644 --- a/configs/ls1088ardb_tfa_defconfig +++ b/configs/ls1088ardb_tfa_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS1088ARDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/ls2080aqds_SECURE_BOOT_defconfig b/configs/ls2080aqds_SECURE_BOOT_defconfig index 6dcec8e8bf9..e13c28cd904 100644 --- a/configs/ls2080aqds_SECURE_BOOT_defconfig +++ b/configs/ls2080aqds_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2080AQDS=y -CONFIG_SYS_TEXT_BASE=0x30100000 +CONFIG_TEXT_BASE=0x30100000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_NR_DRAM_BANKS=3 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls2080aqds_defconfig b/configs/ls2080aqds_defconfig index 2aff7982682..d8d034cba45 100644 --- a/configs/ls2080aqds_defconfig +++ b/configs/ls2080aqds_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2080AQDS=y -CONFIG_SYS_TEXT_BASE=0x30100000 +CONFIG_TEXT_BASE=0x30100000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_NR_DRAM_BANKS=3 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig index 6efe9426b35..2584d1a8ca8 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2080AQDS=y -CONFIG_SYS_TEXT_BASE=0x80400000 +CONFIG_TEXT_BASE=0x80400000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/ls2080aqds_qspi_defconfig b/configs/ls2080aqds_qspi_defconfig index 3667c213e96..78daa29e2fd 100644 --- a/configs/ls2080aqds_qspi_defconfig +++ b/configs/ls2080aqds_qspi_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2080AQDS=y -CONFIG_SYS_TEXT_BASE=0x20100000 +CONFIG_TEXT_BASE=0x20100000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/ls2080aqds_sdcard_defconfig b/configs/ls2080aqds_sdcard_defconfig index 360d13bc826..133230dba13 100644 --- a/configs/ls2080aqds_sdcard_defconfig +++ b/configs/ls2080aqds_sdcard_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2080AQDS=y -CONFIG_SYS_TEXT_BASE=0x80400000 +CONFIG_TEXT_BASE=0x80400000 CONFIG_SYS_MALLOC_LEN=0x0220000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/ls2080ardb_SECURE_BOOT_defconfig b/configs/ls2080ardb_SECURE_BOOT_defconfig index e279a387ce1..b6eb0a713d1 100644 --- a/configs/ls2080ardb_SECURE_BOOT_defconfig +++ b/configs/ls2080ardb_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2080ARDB=y -CONFIG_SYS_TEXT_BASE=0x30100000 +CONFIG_TEXT_BASE=0x30100000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_NR_DRAM_BANKS=3 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls2080ardb_defconfig b/configs/ls2080ardb_defconfig index e9818d62de3..36cc4fb82cd 100644 --- a/configs/ls2080ardb_defconfig +++ b/configs/ls2080ardb_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2080ARDB=y -CONFIG_SYS_TEXT_BASE=0x30100000 +CONFIG_TEXT_BASE=0x30100000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_NR_DRAM_BANKS=3 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index b6ae3c8df31..034b57a132c 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2080ARDB=y -CONFIG_SYS_TEXT_BASE=0x80400000 +CONFIG_TEXT_BASE=0x80400000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/ls2081ardb_defconfig b/configs/ls2081ardb_defconfig index a3d29e86551..a6aaaf25167 100644 --- a/configs/ls2081ardb_defconfig +++ b/configs/ls2081ardb_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2081ARDB=y -CONFIG_SYS_TEXT_BASE=0x20100000 +CONFIG_TEXT_BASE=0x20100000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_NR_DRAM_BANKS=3 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls2088aqds_tfa_defconfig b/configs/ls2088aqds_tfa_defconfig index 639a16b5bba..144974f12fb 100644 --- a/configs/ls2088aqds_tfa_defconfig +++ b/configs/ls2088aqds_tfa_defconfig @@ -3,7 +3,7 @@ CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2080AQDS=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x0220000 CONFIG_NR_DRAM_BANKS=3 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig index d621eb6c9ee..eba1d02e8b3 100644 --- a/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2080ARDB=y -CONFIG_SYS_TEXT_BASE=0x20100000 +CONFIG_TEXT_BASE=0x20100000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_NR_DRAM_BANKS=3 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls2088ardb_qspi_defconfig b/configs/ls2088ardb_qspi_defconfig index 6d737812721..c02edadd63b 100644 --- a/configs/ls2088ardb_qspi_defconfig +++ b/configs/ls2088ardb_qspi_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2080ARDB=y -CONFIG_SYS_TEXT_BASE=0x20100000 +CONFIG_TEXT_BASE=0x20100000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_NR_DRAM_BANKS=3 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig b/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig index bedf588e1f3..cd213d6a6a2 100644 --- a/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig @@ -3,7 +3,7 @@ CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2080ARDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/ls2088ardb_tfa_defconfig b/configs/ls2088ardb_tfa_defconfig index c0567964fb6..a8af8ed75b7 100644 --- a/configs/ls2088ardb_tfa_defconfig +++ b/configs/ls2088ardb_tfa_defconfig @@ -3,7 +3,7 @@ CONFIG_COUNTER_FREQUENCY=25000000 CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LS2080ARDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig index 74a458de477..07385208086 100644 --- a/configs/lschlv2_defconfig +++ b/configs/lschlv2_defconfig @@ -7,7 +7,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/buffalo/lsxl/kwbimage-lschl.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_LSXL=y CONFIG_ENV_SIZE=0x10000 diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig index 474e1c64fc7..01397bcac3d 100644 --- a/configs/lsxhl_defconfig +++ b/configs/lsxhl_defconfig @@ -7,7 +7,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/buffalo/lsxl/kwbimage-lsxhl.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_LSXL=y CONFIG_LSXHL=y diff --git a/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig b/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig index 99c861ea8bd..9ad8fc33264 100644 --- a/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LX2160AQDS=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/lx2160aqds_tfa_defconfig b/configs/lx2160aqds_tfa_defconfig index 3610d259dbf..9bbeb3aaadc 100644 --- a/configs/lx2160aqds_tfa_defconfig +++ b/configs/lx2160aqds_tfa_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LX2160AQDS=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig index 13e46adecd0..c33b342170a 100644 --- a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LX2160ARDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/lx2160ardb_tfa_defconfig b/configs/lx2160ardb_tfa_defconfig index 03c3a57bee9..3e610a5faab 100644 --- a/configs/lx2160ardb_tfa_defconfig +++ b/configs/lx2160ardb_tfa_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LX2160ARDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/lx2160ardb_tfa_stmm_defconfig b/configs/lx2160ardb_tfa_stmm_defconfig index 79b0e477a9e..d10431e61c5 100644 --- a/configs/lx2160ardb_tfa_stmm_defconfig +++ b/configs/lx2160ardb_tfa_stmm_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LX2160ARDB=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig b/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig index 4509d448039..aaf890d3c66 100644 --- a/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LX2162AQDS=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/lx2162aqds_tfa_defconfig b/configs/lx2162aqds_tfa_defconfig index 81511d31db6..c3ca105e158 100644 --- a/configs/lx2162aqds_tfa_defconfig +++ b/configs/lx2162aqds_tfa_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LX2162AQDS=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/lx2162aqds_tfa_verified_boot_defconfig b/configs/lx2162aqds_tfa_verified_boot_defconfig index 72611eb8eee..f64a55e6513 100644 --- a/configs/lx2162aqds_tfa_verified_boot_defconfig +++ b/configs/lx2162aqds_tfa_verified_boot_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_GIC_V3_ITS=y CONFIG_TARGET_LX2162AQDS=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index 4bc70e465d6..b4ada56a36b 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MX5=y -CONFIG_SYS_TEXT_BASE=0x71000000 +CONFIG_TEXT_BASE=0x71000000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_GPIO=y diff --git a/configs/malta64_defconfig b/configs/malta64_defconfig index ab8750de504..f6bb2d01cfa 100644 --- a/configs/malta64_defconfig +++ b/configs/malta64_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0xFFFFFFFFBE000000 +CONFIG_TEXT_BASE=0xFFFFFFFFBE000000 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/malta64el_defconfig b/configs/malta64el_defconfig index 58368e24d1b..7d119668787 100644 --- a/configs/malta64el_defconfig +++ b/configs/malta64el_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0xFFFFFFFFBE000000 +CONFIG_TEXT_BASE=0xFFFFFFFFBE000000 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/malta_defconfig b/configs/malta_defconfig index 9911c710175..f0b46bf6689 100644 --- a/configs/malta_defconfig +++ b/configs/malta_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0xBE000000 +CONFIG_TEXT_BASE=0xBE000000 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig index 8bebdfab8c1..c1829acb289 100644 --- a/configs/maltael_defconfig +++ b/configs/maltael_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0xBE000000 +CONFIG_TEXT_BASE=0xBE000000 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig index f0c93d3404e..d3c2f54bcc1 100644 --- a/configs/marsboard_defconfig +++ b/configs/marsboard_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig index 35005fcc354..5afacfd4ede 100644 --- a/configs/maxbcm_defconfig +++ b/configs/maxbcm_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig index 1fae517ea04..2566bdef168 100644 --- a/configs/mccmon6_nor_defconfig +++ b/configs/mccmon6_nor_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig index 111c0f07c7c..93e40b6b6b8 100644 --- a/configs/mccmon6_sd_defconfig +++ b/configs/mccmon6_sd_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig index 292ab8db354..76e4eb3078c 100644 --- a/configs/medcom-wide_defconfig +++ b/configs/medcom-wide_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x00110000 +CONFIG_TEXT_BASE=0x00110000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x1FFE0000 diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig index da9a6db3095..3ddb49e28b4 100644 --- a/configs/meesc_dataflash_defconfig +++ b/configs/meesc_dataflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21F00000 +CONFIG_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_TARGET_MEESC=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig index 2babff3e213..9908a139b7e 100644 --- a/configs/meesc_defconfig +++ b/configs/meesc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21F00000 +CONFIG_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_TARGET_MEESC=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 01c93d5c4ee..1a23dc51d6e 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -1,5 +1,5 @@ CONFIG_MICROBLAZE=y -CONFIG_SYS_TEXT_BASE=0x29000000 +CONFIG_TEXT_BASE=0x29000000 CONFIG_SYS_MALLOC_LEN=0xc0000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 2e9edc6c4ee..66f3036313c 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFF00000 +CONFIG_TEXT_BASE=0xFFF00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x6EF000 diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig index 9c6de2b81de..ba5bd8a12b6 100644 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SYS_ARCH_TIMER=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-miqi" diff --git a/configs/mk808_defconfig b/configs/mk808_defconfig index 80ecc881247..99d4893a109 100644 --- a/configs/mk808_defconfig +++ b/configs/mk808_defconfig @@ -7,7 +7,7 @@ CONFIG_TPL_SKIP_LOWLEVEL_INIT_ONLY=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x60408000 +CONFIG_TEXT_BASE=0x60408000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x8000 diff --git a/configs/mscc_jr2_defconfig b/configs/mscc_jr2_defconfig index c7b40a81162..1b0d32e396c 100644 --- a/configs/mscc_jr2_defconfig +++ b/configs/mscc_jr2_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0x40000000 +CONFIG_TEXT_BASE=0x40000000 CONFIG_SYS_MALLOC_LEN=0x1f0000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/mscc_luton_defconfig b/configs/mscc_luton_defconfig index 15339d4543a..30f7802482d 100644 --- a/configs/mscc_luton_defconfig +++ b/configs/mscc_luton_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0x40000000 +CONFIG_TEXT_BASE=0x40000000 CONFIG_SYS_MALLOC_LEN=0x1f0000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/mscc_ocelot_defconfig b/configs/mscc_ocelot_defconfig index d82140549b5..cd1d92316d4 100644 --- a/configs/mscc_ocelot_defconfig +++ b/configs/mscc_ocelot_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0x40000000 +CONFIG_TEXT_BASE=0x40000000 CONFIG_SYS_MALLOC_LEN=0x1f0000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/mscc_serval_defconfig b/configs/mscc_serval_defconfig index 9c30b6a9739..b5d019009d5 100644 --- a/configs/mscc_serval_defconfig +++ b/configs/mscc_serval_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0x40000000 +CONFIG_TEXT_BASE=0x40000000 CONFIG_SYS_MALLOC_LEN=0x1f0000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/mscc_servalt_defconfig b/configs/mscc_servalt_defconfig index 1c6edeb94f0..d471654f8e1 100644 --- a/configs/mscc_servalt_defconfig +++ b/configs/mscc_servalt_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0x40000000 +CONFIG_TEXT_BASE=0x40000000 CONFIG_SYS_MALLOC_LEN=0x1f0000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x100000 diff --git a/configs/mt7622_rfb_defconfig b/configs/mt7622_rfb_defconfig index 82660d83410..a0d33c0ffd6 100644 --- a/configs/mt7622_rfb_defconfig +++ b/configs/mt7622_rfb_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x41e00000 +CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="mt7622-rfb" diff --git a/configs/mt7623a_unielec_u7623_02_defconfig b/configs/mt7623a_unielec_u7623_02_defconfig index f052d5e9a1c..82397b2e32f 100644 --- a/configs/mt7623a_unielec_u7623_02_defconfig +++ b/configs/mt7623a_unielec_u7623_02_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x81e00000 +CONFIG_TEXT_BASE=0x81e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig index 8e101a5258e..34960c09641 100644 --- a/configs/mt7623n_bpir2_defconfig +++ b/configs/mt7623n_bpir2_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x81e00000 +CONFIG_TEXT_BASE=0x81e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/mt7629_rfb_defconfig b/configs/mt7629_rfb_defconfig index 314a07d554a..b5dbbea4f39 100644 --- a/configs/mt7629_rfb_defconfig +++ b/configs/mt7629_rfb_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_ARCH_TIMER=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x41e00000 +CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/mt7981_emmc_rfb_defconfig b/configs/mt7981_emmc_rfb_defconfig index e7809e691c6..557c8e77caa 100644 --- a/configs/mt7981_emmc_rfb_defconfig +++ b/configs/mt7981_emmc_rfb_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x41e00000 +CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x80000 diff --git a/configs/mt7981_rfb_defconfig b/configs/mt7981_rfb_defconfig index 4f429006d14..f9776ffcef2 100644 --- a/configs/mt7981_rfb_defconfig +++ b/configs/mt7981_rfb_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x41e00000 +CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="mt7981-rfb" diff --git a/configs/mt7981_sd_rfb_defconfig b/configs/mt7981_sd_rfb_defconfig index 2a66a280caf..5e0c8c83b6a 100644 --- a/configs/mt7981_sd_rfb_defconfig +++ b/configs/mt7981_sd_rfb_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x41e00000 +CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x80000 diff --git a/configs/mt7986_rfb_defconfig b/configs/mt7986_rfb_defconfig index 0c7411332ca..e3ded766e41 100644 --- a/configs/mt7986_rfb_defconfig +++ b/configs/mt7986_rfb_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x41e00000 +CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="mt7986a-rfb" diff --git a/configs/mt7986a_bpir3_emmc_defconfig b/configs/mt7986a_bpir3_emmc_defconfig index 11ab8d13fd6..6d29885b49b 100644 --- a/configs/mt7986a_bpir3_emmc_defconfig +++ b/configs/mt7986a_bpir3_emmc_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x41e00000 +CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x80000 diff --git a/configs/mt7986a_bpir3_sd_defconfig b/configs/mt7986a_bpir3_sd_defconfig index 9420a5ac666..222987a3a2e 100644 --- a/configs/mt7986a_bpir3_sd_defconfig +++ b/configs/mt7986a_bpir3_sd_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x41e00000 +CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x80000 diff --git a/configs/mt8183_pumpkin_defconfig b/configs/mt8183_pumpkin_defconfig index 3c96d4eacb1..88f7234957d 100644 --- a/configs/mt8183_pumpkin_defconfig +++ b/configs/mt8183_pumpkin_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=13000000 CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x4c000000 +CONFIG_TEXT_BASE=0x4c000000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/mt8512_bm1_emmc_defconfig b/configs/mt8512_bm1_emmc_defconfig index cea990860bd..772306c1525 100644 --- a/configs/mt8512_bm1_emmc_defconfig +++ b/configs/mt8512_bm1_emmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=13000000 CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x44e00000 +CONFIG_TEXT_BASE=0x44e00000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/mt8516_pumpkin_defconfig b/configs/mt8516_pumpkin_defconfig index 0425ffd0f97..0f31e0538aa 100644 --- a/configs/mt8516_pumpkin_defconfig +++ b/configs/mt8516_pumpkin_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=13000000 CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x4C000000 +CONFIG_TEXT_BASE=0x4C000000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/mt8518_ap1_emmc_defconfig b/configs/mt8518_ap1_emmc_defconfig index 2072eb6d73c..d75e299ce0d 100644 --- a/configs/mt8518_ap1_emmc_defconfig +++ b/configs/mt8518_ap1_emmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=13000000 CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_MEDIATEK=y -CONFIG_SYS_TEXT_BASE=0x40008000 +CONFIG_TEXT_BASE=0x40008000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/mvebu_crb_cn9130_defconfig b/configs/mvebu_crb_cn9130_defconfig index da45c42ddb5..1d5b1db9dda 100644 --- a/configs/mvebu_crb_cn9130_defconfig +++ b/configs/mvebu_crb_cn9130_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_OCTEONTX2_CN913x=y CONFIG_ENV_SIZE=0x10000 diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig index a2a1efb7f06..8b737840fa2 100644 --- a/configs/mvebu_db-88f3720_defconfig +++ b/configs/mvebu_db-88f3720_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_TARGET_MVEBU_ARMADA_37XX=y CONFIG_ENV_SIZE=0x10000 diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig index 2eee745ed67..44aec08c61d 100644 --- a/configs/mvebu_db_armada8k_defconfig +++ b/configs/mvebu_db_armada8k_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_MVEBU_ARMADA_8K=y CONFIG_ENV_SIZE=0x10000 diff --git a/configs/mvebu_db_cn9130_defconfig b/configs/mvebu_db_cn9130_defconfig index 59f17ff59d9..b2170347eb1 100644 --- a/configs/mvebu_db_cn9130_defconfig +++ b/configs/mvebu_db_cn9130_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_OCTEONTX2_CN913x=y CONFIG_ENV_SIZE=0x10000 diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig index c9ea42a4e72..1016b26b238 100644 --- a/configs/mvebu_espressobin-88f3720_defconfig +++ b/configs/mvebu_espressobin-88f3720_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_TARGET_MVEBU_ARMADA_37XX=y CONFIG_ENV_SIZE=0x10000 diff --git a/configs/mvebu_mcbin-88f8040_defconfig b/configs/mvebu_mcbin-88f8040_defconfig index 8164beb1413..d580bfc6eea 100644 --- a/configs/mvebu_mcbin-88f8040_defconfig +++ b/configs/mvebu_mcbin-88f8040_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_MVEBU_ARMADA_8K=y CONFIG_ENV_SIZE=0x10000 diff --git a/configs/mvebu_puzzle-m801-88f8040_defconfig b/configs/mvebu_puzzle-m801-88f8040_defconfig index 25ae690fe60..06112b373b2 100644 --- a/configs/mvebu_puzzle-m801-88f8040_defconfig +++ b/configs/mvebu_puzzle-m801-88f8040_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_MVEBU_ARMADA_8K=y CONFIG_ENV_SIZE=0x10000 diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig index 1cb13db7a39..89b69fb3236 100644 --- a/configs/mx23_olinuxino_defconfig +++ b/configs/mx23_olinuxino_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX23=y -CONFIG_SYS_TEXT_BASE=0x40002000 +CONFIG_TEXT_BASE=0x40002000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig index ef1b6d71dbe..3602ead8635 100644 --- a/configs/mx23evk_defconfig +++ b/configs/mx23evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX23=y -CONFIG_SYS_TEXT_BASE=0x40002000 +CONFIG_TEXT_BASE=0x40002000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index b1877192ee7..8b022f76a0a 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX28=y -CONFIG_SYS_TEXT_BASE=0x40002000 +CONFIG_TEXT_BASE=0x40002000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index 8ce4656e1ad..fbf26c70e31 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX5=y -CONFIG_SYS_TEXT_BASE=0x97800000 +CONFIG_TEXT_BASE=0x97800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mx53cx9020_defconfig b/configs/mx53cx9020_defconfig index 7bb38937281..b34f2e7e6b4 100644 --- a/configs/mx53cx9020_defconfig +++ b/configs/mx53cx9020_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX5=y -CONFIG_SYS_TEXT_BASE=0x77800000 +CONFIG_TEXT_BASE=0x77800000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index 945ccfde146..e299ddc9f3b 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX5=y -CONFIG_SYS_TEXT_BASE=0x77800000 +CONFIG_TEXT_BASE=0x77800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index b54c90e49a2..328f546c5b3 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX5=y -CONFIG_SYS_TEXT_BASE=0x77800000 +CONFIG_TEXT_BASE=0x77800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig index 8bb7a56759e..d86e53b1c38 100644 --- a/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index 17c15be9e3f..a488ce41fb8 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index e58f4b56714..becf36e01c6 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index cb6a17be511..bf6aff8e48e 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index f7ef8ed8cd8..26cee0eae60 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig index 7e71501d1a8..018df1bbfaf 100644 --- a/configs/mx6slevk_defconfig +++ b/configs/mx6slevk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x300000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig index 662d1bc1ef0..5351d03510d 100644 --- a/configs/mx6slevk_spinor_defconfig +++ b/configs/mx6slevk_spinor_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x300000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig index b6b15c064e1..85dc039347e 100644 --- a/configs/mx6slevk_spl_defconfig +++ b/configs/mx6slevk_spl_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x300000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/mx6sllevk_defconfig b/configs/mx6sllevk_defconfig index ec6843e5743..39a15ae830e 100644 --- a/configs/mx6sllevk_defconfig +++ b/configs/mx6sllevk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mx6sllevk_plugin_defconfig b/configs/mx6sllevk_plugin_defconfig index bd44298cb29..47d82540aca 100644 --- a/configs/mx6sllevk_plugin_defconfig +++ b/configs/mx6sllevk_plugin_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mx6sxsabreauto_defconfig b/configs/mx6sxsabreauto_defconfig index 13ba8b70501..78780a8c706 100644 --- a/configs/mx6sxsabreauto_defconfig +++ b/configs/mx6sxsabreauto_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x300000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig index 2c9a90566a7..a37df31381e 100644 --- a/configs/mx6sxsabresd_defconfig +++ b/configs/mx6sxsabresd_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x300000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig index 55ee1aa894c..1f1bff1e0c7 100644 --- a/configs/mx6ul_14x14_evk_defconfig +++ b/configs/mx6ul_14x14_evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/mx6ul_9x9_evk_defconfig b/configs/mx6ul_9x9_evk_defconfig index 3a90b09f9b5..0b9c1003cdc 100644 --- a/configs/mx6ul_9x9_evk_defconfig +++ b/configs/mx6ul_9x9_evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/mx6ull_14x14_evk_defconfig b/configs/mx6ull_14x14_evk_defconfig index aba288f289f..65db621f156 100644 --- a/configs/mx6ull_14x14_evk_defconfig +++ b/configs/mx6ull_14x14_evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mx6ull_14x14_evk_plugin_defconfig b/configs/mx6ull_14x14_evk_plugin_defconfig index dd5dc9eac98..55ddd7eabbd 100644 --- a/configs/mx6ull_14x14_evk_plugin_defconfig +++ b/configs/mx6ull_14x14_evk_plugin_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mx6ulz_14x14_evk_defconfig b/configs/mx6ulz_14x14_evk_defconfig index a3afd12d2cb..0c1b442b682 100644 --- a/configs/mx6ulz_14x14_evk_defconfig +++ b/configs/mx6ulz_14x14_evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mx7ulp_com_defconfig b/configs/mx7ulp_com_defconfig index 47b6e4975d4..2788db0bbe7 100644 --- a/configs/mx7ulp_com_defconfig +++ b/configs/mx7ulp_com_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX7ULP=y -CONFIG_SYS_TEXT_BASE=0x67800000 +CONFIG_TEXT_BASE=0x67800000 CONFIG_SYS_MALLOC_LEN=0x800000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig index 0df2ee38938..ecc42517b2e 100644 --- a/configs/mx7ulp_evk_defconfig +++ b/configs/mx7ulp_evk_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX7ULP=y -CONFIG_SYS_TEXT_BASE=0x67800000 +CONFIG_TEXT_BASE=0x67800000 CONFIG_SYS_MALLOC_LEN=0x800000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/mx7ulp_evk_plugin_defconfig b/configs/mx7ulp_evk_plugin_defconfig index 3afab2e8b0f..d31633ed8a5 100644 --- a/configs/mx7ulp_evk_plugin_defconfig +++ b/configs/mx7ulp_evk_plugin_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX7ULP=y -CONFIG_SYS_TEXT_BASE=0x67800000 +CONFIG_TEXT_BASE=0x67800000 CONFIG_SYS_MALLOC_LEN=0x800000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/myir_mys_6ulx_defconfig b/configs/myir_mys_6ulx_defconfig index f748b4dd66b..f25289386e2 100644 --- a/configs/myir_mys_6ulx_defconfig +++ b/configs/myir_mys_6ulx_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig index c125663ba37..03fa857996c 100644 --- a/configs/nanopc-t4-rk3399_defconfig +++ b/configs/nanopc-t4-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopc-t4" diff --git a/configs/nanopi-k2_defconfig b/configs/nanopi-k2_defconfig index 74f8f0c5ea0..2fc56fdbfa5 100644 --- a/configs/nanopi-k2_defconfig +++ b/configs/nanopi-k2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/nanopi-m4-2gb-rk3399_defconfig b/configs/nanopi-m4-2gb-rk3399_defconfig index aa7e379892b..67ca98563b5 100644 --- a/configs/nanopi-m4-2gb-rk3399_defconfig +++ b/configs/nanopi-m4-2gb-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-m4-2gb" diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig index 32f63902568..afa51bc8fa3 100644 --- a/configs/nanopi-m4-rk3399_defconfig +++ b/configs/nanopi-m4-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-m4" diff --git a/configs/nanopi-m4b-rk3399_defconfig b/configs/nanopi-m4b-rk3399_defconfig index 497385ff2af..d02eb1851a7 100644 --- a/configs/nanopi-m4b-rk3399_defconfig +++ b/configs/nanopi-m4b-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-m4b" diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig index f47928d6f3c..d2d9bf91c56 100644 --- a/configs/nanopi-neo4-rk3399_defconfig +++ b/configs/nanopi-neo4-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-neo4" diff --git a/configs/nanopi-r2s-rk3328_defconfig b/configs/nanopi-r2s-rk3328_defconfig index 86f5e111f81..c21bed0ce79 100644 --- a/configs/nanopi-r2s-rk3328_defconfig +++ b/configs/nanopi-r2s-rk3328_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig index 7cb1dc13d61..2185f87d7d0 100644 --- a/configs/nanopi-r4s-rk3399_defconfig +++ b/configs/nanopi-r4s-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-r4s" diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig index 0a5c79ab720..9cebc704ce9 100644 --- a/configs/nas220_defconfig +++ b/configs/nas220_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/Seagate/nas220/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NAS220=y CONFIG_ENV_SIZE=0x10000 diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig index 605527f2ff0..c10e1a50139 100644 --- a/configs/net2big_v2_defconfig +++ b/configs/net2big_v2_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/LaCie/net2big_v2/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NET2BIG_V2=y CONFIG_NET2BIG_V2=y diff --git a/configs/netgear_cg3100d_ram_defconfig b/configs/netgear_cg3100d_ram_defconfig index d997e6ae1a1..ef7c60adc23 100644 --- a/configs/netgear_cg3100d_ram_defconfig +++ b/configs/netgear_cg3100d_ram_defconfig @@ -1,6 +1,6 @@ CONFIG_MIPS=y CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_TEXT_BASE=0x80010000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/netgear_dgnd3700v2_ram_defconfig b/configs/netgear_dgnd3700v2_ram_defconfig index cbe1d212af6..8cf5f1bc54a 100644 --- a/configs/netgear_dgnd3700v2_ram_defconfig +++ b/configs/netgear_dgnd3700v2_ram_defconfig @@ -1,6 +1,6 @@ CONFIG_MIPS=y CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_TEXT_BASE=0x80010000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig index bc446bbcd8a..75907e05c57 100644 --- a/configs/netspace_lite_v2_defconfig +++ b/configs/netspace_lite_v2_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/LaCie/netspace_v2/kwbimage-ns2l.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NETSPACE_V2=y CONFIG_NETSPACE_LITE_V2=y diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig index 6e28e73804c..db08ca57633 100644 --- a/configs/netspace_max_v2_defconfig +++ b/configs/netspace_max_v2_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/LaCie/netspace_v2/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NETSPACE_V2=y CONFIG_NETSPACE_MAX_V2=y diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig index ce8049798e1..dda3b6b5f93 100644 --- a/configs/netspace_mini_v2_defconfig +++ b/configs/netspace_mini_v2_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/LaCie/netspace_v2/kwbimage-ns2l.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NETSPACE_V2=y CONFIG_NETSPACE_MINI_V2=y diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig index c26381a35fd..21534c59fde 100644 --- a/configs/netspace_v2_defconfig +++ b/configs/netspace_v2_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/LaCie/netspace_v2/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NETSPACE_V2=y CONFIG_NETSPACE_V2=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index d1f7ec39d4c..3ec4df14a86 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index ef1ffad2d27..6a6510e12e2 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 2c3df8b1b87..e2acce8757e 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index fa394cfa703..ceb843f15e0 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index cf48f310920..bb0d6f5439f 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 15e64ad0805..0232d0c9d76 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/novena_defconfig b/configs/novena_defconfig index 7e336147f8e..0f69a17bc98 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index 1c98b3dac96..afa0cad0418 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -8,7 +8,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/zyxel/nsa310s/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NSA310S=y diff --git a/configs/nsim_700_defconfig b/configs/nsim_700_defconfig index 5fec30c995b..970bdbddc8e 100644 --- a/configs/nsim_700_defconfig +++ b/configs/nsim_700_defconfig @@ -1,7 +1,7 @@ CONFIG_ARC=y CONFIG_TARGET_NSIM=y CONFIG_NSIM_BOARD_CPPFLAGS="-mcpu=arc700 -mlock -mswape" -CONFIG_SYS_TEXT_BASE=0x81000000 +CONFIG_TEXT_BASE=0x81000000 CONFIG_SYS_MALLOC_LEN=0x0200000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DEFAULT_DEVICE_TREE="nsim" diff --git a/configs/nsim_700be_defconfig b/configs/nsim_700be_defconfig index 32f43f42097..f5e88d8dda3 100644 --- a/configs/nsim_700be_defconfig +++ b/configs/nsim_700be_defconfig @@ -2,7 +2,7 @@ CONFIG_ARC=y CONFIG_CPU_BIG_ENDIAN=y CONFIG_TARGET_NSIM=y CONFIG_NSIM_BOARD_CPPFLAGS="-mcpu=arc700 -mlock -mswape" -CONFIG_SYS_TEXT_BASE=0x81000000 +CONFIG_TEXT_BASE=0x81000000 CONFIG_SYS_MALLOC_LEN=0x0200000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DEFAULT_DEVICE_TREE="nsim" diff --git a/configs/nsim_hs38_defconfig b/configs/nsim_hs38_defconfig index 9b85dc41410..1afabe67170 100644 --- a/configs/nsim_hs38_defconfig +++ b/configs/nsim_hs38_defconfig @@ -2,7 +2,7 @@ CONFIG_ARC=y CONFIG_ISA_ARCV2=y CONFIG_TARGET_NSIM=y CONFIG_NSIM_BOARD_CPPFLAGS="-mcpu=archs" -CONFIG_SYS_TEXT_BASE=0x81000000 +CONFIG_TEXT_BASE=0x81000000 CONFIG_SYS_MALLOC_LEN=0x0200000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DEFAULT_DEVICE_TREE="nsim" diff --git a/configs/nsim_hs38be_defconfig b/configs/nsim_hs38be_defconfig index e0589c41c65..3ef599f232b 100644 --- a/configs/nsim_hs38be_defconfig +++ b/configs/nsim_hs38be_defconfig @@ -3,7 +3,7 @@ CONFIG_ISA_ARCV2=y CONFIG_CPU_BIG_ENDIAN=y CONFIG_TARGET_NSIM=y CONFIG_NSIM_BOARD_CPPFLAGS="-mcpu=archs" -CONFIG_SYS_TEXT_BASE=0x81000000 +CONFIG_TEXT_BASE=0x81000000 CONFIG_SYS_MALLOC_LEN=0x0200000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DEFAULT_DEVICE_TREE="nsim" diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index e55da6ed215..e2e8bebf6d1 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x81000100 +CONFIG_TEXT_BASE=0x81000100 CONFIG_SYS_MALLOC_LEN=0x2500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/o4-imx6ull-nano_defconfig b/configs/o4-imx6ull-nano_defconfig index b2eacbded90..94cdf24a170 100644 --- a/configs/o4-imx6ull-nano_defconfig +++ b/configs/o4-imx6ull-nano_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_MX6ULL=y CONFIG_TARGET_O4_IMX6ULL_NANO=y diff --git a/configs/octeon_ebb7304_defconfig b/configs/octeon_ebb7304_defconfig index cf251abb958..b966b1d24f0 100644 --- a/configs/octeon_ebb7304_defconfig +++ b/configs/octeon_ebb7304_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0xffffffff80000000 +CONFIG_TEXT_BASE=0xffffffff80000000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/octeon_nic23_defconfig b/configs/octeon_nic23_defconfig index abc79144377..f6b86299a30 100644 --- a/configs/octeon_nic23_defconfig +++ b/configs/octeon_nic23_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0xffffffff80000000 +CONFIG_TEXT_BASE=0xffffffff80000000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/octeontx2_95xx_defconfig b/configs/octeontx2_95xx_defconfig index 700d49ebeda..f4ffe12854e 100644 --- a/configs/octeontx2_95xx_defconfig +++ b/configs/octeontx2_95xx_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y # CONFIG_ARM64_SUPPORT_AARCH32 is not set CONFIG_ARCH_OCTEONTX2=y -CONFIG_SYS_TEXT_BASE=0x04000000 +CONFIG_TEXT_BASE=0x04000000 CONFIG_SYS_MALLOC_LEN=0x4008000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/octeontx2_96xx_defconfig b/configs/octeontx2_96xx_defconfig index fe67c4860a1..7ff8d2bb8c0 100644 --- a/configs/octeontx2_96xx_defconfig +++ b/configs/octeontx2_96xx_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y # CONFIG_ARM64_SUPPORT_AARCH32 is not set CONFIG_ARCH_OCTEONTX2=y -CONFIG_SYS_TEXT_BASE=0x04000000 +CONFIG_TEXT_BASE=0x04000000 CONFIG_SYS_MALLOC_LEN=0x4008000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/octeontx_81xx_defconfig b/configs/octeontx_81xx_defconfig index c4a22cfd7f2..dbf561703d7 100644 --- a/configs/octeontx_81xx_defconfig +++ b/configs/octeontx_81xx_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y # CONFIG_ARM64_SUPPORT_AARCH32 is not set CONFIG_ARCH_OCTEONTX=y -CONFIG_SYS_TEXT_BASE=0x2800000 +CONFIG_TEXT_BASE=0x2800000 CONFIG_SYS_MALLOC_LEN=0x4008000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/octeontx_83xx_defconfig b/configs/octeontx_83xx_defconfig index 4bd662a3180..bfd23fc94a8 100644 --- a/configs/octeontx_83xx_defconfig +++ b/configs/octeontx_83xx_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y # CONFIG_ARM64_SUPPORT_AARCH32 is not set CONFIG_ARCH_OCTEONTX=y -CONFIG_SYS_TEXT_BASE=0x2800000 +CONFIG_TEXT_BASE=0x2800000 CONFIG_SYS_MALLOC_LEN=0x4008000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 335a4a3a15e..a4c4fc79062 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/odroid-c4_defconfig b/configs/odroid-c4_defconfig index 9389e34f407..af37b4dbc82 100644 --- a/configs/odroid-c4_defconfig +++ b/configs/odroid-c4_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="odroid-n2" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/odroid-go2_defconfig b/configs/odroid-go2_defconfig index f4aa53a210b..4705f61e424 100644 --- a/configs/odroid-go2_defconfig +++ b/configs/odroid-go2_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/odroid-hc4_defconfig b/configs/odroid-hc4_defconfig index b525358af37..1af9c113953 100644 --- a/configs/odroid-hc4_defconfig +++ b/configs/odroid-hc4_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="odroid-n2" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/odroid-n2_defconfig b/configs/odroid-n2_defconfig index fb91a5b76e8..fcd99623123 100644 --- a/configs/odroid-n2_defconfig +++ b/configs/odroid-n2_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="odroid-n2" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index b2f6741094c..47f7c5d9747 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x43E00000 +CONFIG_TEXT_BASE=0x43E00000 CONFIG_SYS_MALLOC_LEN=0x5004000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS5=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index bd487719815..f57eb1ec91e 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x43e00000 +CONFIG_TEXT_BASE=0x43e00000 CONFIG_SYS_MALLOC_LEN=0x5004000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS4=y diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig index 945d7b6e7d8..e350e220298 100644 --- a/configs/omap35_logic_defconfig +++ b/configs/omap35_logic_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_TI_COMMON_CMD_OPTIONS=y # CONFIG_SPL_GPIO is not set diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig index e7d1c4ee37f..adf98563237 100644 --- a/configs/omap35_logic_somlv_defconfig +++ b/configs/omap35_logic_somlv_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_TI_COMMON_CMD_OPTIONS=y # CONFIG_SPL_GPIO is not set diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index bca52bb27cb..e9419a4b91b 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_TI_COMMON_CMD_OPTIONS=y # CONFIG_SPL_GPIO is not set diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig index 6b5ddb9d6f0..d7574f04e45 100644 --- a/configs/omap3_logic_somlv_defconfig +++ b/configs/omap3_logic_somlv_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_TI_COMMON_CMD_OPTIONS=y # CONFIG_SPL_GPIO is not set diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index a7918aaa0b0..06cbe97b690 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_DAVINCI=y -CONFIG_SYS_TEXT_BASE=0xc1080000 +CONFIG_TEXT_BASE=0xc1080000 CONFIG_SYS_MALLOC_LEN=0x110000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_TARGET_OMAPL138_LCDK=y diff --git a/configs/openpiton_riscv64_defconfig b/configs/openpiton_riscv64_defconfig index 176b374cce4..04c37f48c17 100644 --- a/configs/openpiton_riscv64_defconfig +++ b/configs/openpiton_riscv64_defconfig @@ -1,5 +1,5 @@ CONFIG_RISCV=y -CONFIG_SYS_TEXT_BASE=0x80200000 +CONFIG_TEXT_BASE=0x80200000 CONFIG_SYS_MALLOC_LEN=0x10000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="openpiton-riscv64" diff --git a/configs/openpiton_riscv64_spl_defconfig b/configs/openpiton_riscv64_spl_defconfig index 6bb68b833e3..b7ccb683427 100644 --- a/configs/openpiton_riscv64_spl_defconfig +++ b/configs/openpiton_riscv64_spl_defconfig @@ -1,5 +1,5 @@ CONFIG_RISCV=y -CONFIG_SYS_TEXT_BASE=0x80000000 +CONFIG_TEXT_BASE=0x80000000 CONFIG_SYS_MALLOC_LEN=0x10000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="openpiton-riscv64" diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig index a67bf38acc1..c2e879c9bde 100644 --- a/configs/openrd_base_defconfig +++ b/configs/openrd_base_defconfig @@ -5,7 +5,7 @@ CONFIG_ARCH_CPU_INIT=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/Marvell/openrd/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_OPENRD=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig index 8f0d6bdb56d..01bfaed978b 100644 --- a/configs/openrd_client_defconfig +++ b/configs/openrd_client_defconfig @@ -5,7 +5,7 @@ CONFIG_ARCH_CPU_INIT=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/Marvell/openrd/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_OPENRD=y CONFIG_BOARD_IS_OPENRD_CLIENT=y diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig index a169b5f6592..7c641038178 100644 --- a/configs/openrd_ultimate_defconfig +++ b/configs/openrd_ultimate_defconfig @@ -5,7 +5,7 @@ CONFIG_ARCH_CPU_INIT=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/Marvell/openrd/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_OPENRD=y CONFIG_BOARD_IS_OPENRD_ULTIMATE=y diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig index 1c9579b0dd9..2d0a065f502 100644 --- a/configs/opos6uldev_defconfig +++ b/configs/opos6uldev_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/orangepi-rk3399_defconfig b/configs/orangepi-rk3399_defconfig index fa117ba8d15..39245e8784b 100644 --- a/configs/orangepi-rk3399_defconfig +++ b/configs/orangepi-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-orangepi" diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 79e3af950ec..aafefab1219 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -4,7 +4,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x43E00000 +CONFIG_TEXT_BASE=0x43E00000 CONFIG_SYS_MALLOC_LEN=0x5004000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS4=y diff --git a/configs/p200_defconfig b/configs/p200_defconfig index ad872f4a9f3..41f9079c217 100644 --- a/configs/p200_defconfig +++ b/configs/p200_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/p201_defconfig b/configs/p201_defconfig index b61d34f2251..32f47dbf864 100644 --- a/configs/p201_defconfig +++ b/configs/p201_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="p201" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/p212_defconfig b/configs/p212_defconfig index 55092f321b1..ffd003a158e 100644 --- a/configs/p212_defconfig +++ b/configs/p212_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig index a33a7fcccd8..e8074914c8a 100644 --- a/configs/p2371-0000_defconfig +++ b/configs/p2371-0000_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80080000 +CONFIG_TEXT_BASE=0x80080000 CONFIG_SYS_MALLOC_LEN=0x2500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig index b95a8f68528..ca630a4d9a8 100644 --- a/configs/p2371-2180_defconfig +++ b/configs/p2371-2180_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=19200000 CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80080000 +CONFIG_TEXT_BASE=0x80080000 CONFIG_SYS_MALLOC_LEN=0x2500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig index 0dfd36e553b..bc3fb3e5ae3 100644 --- a/configs/p2571_defconfig +++ b/configs/p2571_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80080000 +CONFIG_TEXT_BASE=0x80080000 CONFIG_SYS_MALLOC_LEN=0x2500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig index e291c378089..8b1d2b286b8 100644 --- a/configs/p2771-0000-000_defconfig +++ b/configs/p2771-0000-000_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=19200000 CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80080000 +CONFIG_TEXT_BASE=0x80080000 CONFIG_NR_DRAM_BANKS=1026 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig index 12282f37848..4a2f6222923 100644 --- a/configs/p2771-0000-500_defconfig +++ b/configs/p2771-0000-500_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=19200000 CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80080000 +CONFIG_TEXT_BASE=0x80080000 CONFIG_NR_DRAM_BANKS=1026 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 diff --git a/configs/p3450-0000_defconfig b/configs/p3450-0000_defconfig index b199fbeaf40..01605466e39 100644 --- a/configs/p3450-0000_defconfig +++ b/configs/p3450-0000_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=19200000 CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80080000 +CONFIG_TEXT_BASE=0x80080000 CONFIG_SYS_MALLOC_LEN=0x2500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig index 4cd53cd1532..558375da9f3 100644 --- a/configs/paz00_defconfig +++ b/configs/paz00_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x00110000 +CONFIG_TEXT_BASE=0x00110000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 diff --git a/configs/pcm052_defconfig b/configs/pcm052_defconfig index 17f06e56c0e..e0c7709c5a9 100644 --- a/configs/pcm052_defconfig +++ b/configs/pcm052_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_VF610=y -CONFIG_SYS_TEXT_BASE=0x3f401000 +CONFIG_TEXT_BASE=0x3f401000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig index 8d9ee88b477..459bfb04959 100644 --- a/configs/pcm058_defconfig +++ b/configs/pcm058_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x800000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index 512a5390b28..007f7bbeac7 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x23E00000 +CONFIG_TEXT_BASE=0x23E00000 CONFIG_SYS_MALLOC_LEN=0x5004000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS5=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index 8b40caf13e9..c0f5a013cf0 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x23E00000 +CONFIG_TEXT_BASE=0x23E00000 CONFIG_SYS_MALLOC_LEN=0x5004000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS5=y diff --git a/configs/pg_wcom_expu1_defconfig b/configs/pg_wcom_expu1_defconfig index 73ae5290edb..25f6cad18e3 100644 --- a/configs/pg_wcom_expu1_defconfig +++ b/configs/pg_wcom_expu1_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=8333333 CONFIG_TARGET_PG_WCOM_EXPU1=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x1004000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 diff --git a/configs/pg_wcom_expu1_update_defconfig b/configs/pg_wcom_expu1_update_defconfig index 3473457fd6c..6c51d3de3cb 100644 --- a/configs/pg_wcom_expu1_update_defconfig +++ b/configs/pg_wcom_expu1_update_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=8333333 CONFIG_TARGET_PG_WCOM_EXPU1=y -CONFIG_SYS_TEXT_BASE=0x60240000 +CONFIG_TEXT_BASE=0x60240000 CONFIG_SYS_MALLOC_LEN=0x1004000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 diff --git a/configs/pg_wcom_seli8_defconfig b/configs/pg_wcom_seli8_defconfig index f926cdcf039..72d87bfc39f 100644 --- a/configs/pg_wcom_seli8_defconfig +++ b/configs/pg_wcom_seli8_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=8333333 CONFIG_TARGET_PG_WCOM_SELI8=y -CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_TEXT_BASE=0x60100000 CONFIG_SYS_MALLOC_LEN=0x1004000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 diff --git a/configs/pg_wcom_seli8_update_defconfig b/configs/pg_wcom_seli8_update_defconfig index c7329f17a1b..d144b891142 100644 --- a/configs/pg_wcom_seli8_update_defconfig +++ b/configs/pg_wcom_seli8_update_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=8333333 CONFIG_TARGET_PG_WCOM_SELI8=y -CONFIG_SYS_TEXT_BASE=0x60240000 +CONFIG_TEXT_BASE=0x60240000 CONFIG_SYS_MALLOC_LEN=0x1004000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 diff --git a/configs/phycore-imx8mm_defconfig b/configs/phycore-imx8mm_defconfig index e8d7905bb4a..7dbaa8f07ac 100644 --- a/configs/phycore-imx8mm_defconfig +++ b/configs/phycore-imx8mm_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index ac8c4e6836e..0c1cad8086b 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig index cfe02dfe216..025eb325a8d 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-rk3288_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SYS_ARCH_TIMER=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-phycore-rdk" diff --git a/configs/phycore_pcl063_defconfig b/configs/phycore_pcl063_defconfig index b9d2a976636..b5eea3cf85b 100644 --- a/configs/phycore_pcl063_defconfig +++ b/configs/phycore_pcl063_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/phycore_pcl063_ull_defconfig b/configs/phycore_pcl063_ull_defconfig index f172b065bfc..5a734c0fc84 100644 --- a/configs/phycore_pcl063_ull_defconfig +++ b/configs/phycore_pcl063_ull_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/pic32mzdask_defconfig b/configs/pic32mzdask_defconfig index 19303f8c9d1..d4eb6f42088 100644 --- a/configs/pic32mzdask_defconfig +++ b/configs/pic32mzdask_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0x9D004000 +CONFIG_TEXT_BASE=0x9D004000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_SYS_MALLOC_F_LEN=0x600 CONFIG_ENV_SIZE=0x4000 diff --git a/configs/pico-dwarf-imx6ul_defconfig b/configs/pico-dwarf-imx6ul_defconfig index d6ca9e658ef..d7031bc9d58 100644 --- a/configs/pico-dwarf-imx6ul_defconfig +++ b/configs/pico-dwarf-imx6ul_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x2300000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/pico-hobbit-imx6ul_defconfig b/configs/pico-hobbit-imx6ul_defconfig index 6dc37540293..48ede496169 100644 --- a/configs/pico-hobbit-imx6ul_defconfig +++ b/configs/pico-hobbit-imx6ul_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x2300000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/pico-imx6_defconfig b/configs/pico-imx6_defconfig index 63fdca312c2..f278144f694 100644 --- a/configs/pico-imx6_defconfig +++ b/configs/pico-imx6_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x2300000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig index cd139595d4e..936f08322c6 100644 --- a/configs/pico-imx6ul_defconfig +++ b/configs/pico-imx6ul_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x2300000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig index 39136e1c8b9..8867317f375 100644 --- a/configs/pico-imx8mq_defconfig +++ b/configs/pico-imx8mq_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x600000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/pico-pi-imx6ul_defconfig b/configs/pico-pi-imx6ul_defconfig index faf3c842134..62381ef3049 100644 --- a/configs/pico-pi-imx6ul_defconfig +++ b/configs/pico-pi-imx6ul_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x2300000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig index 6971d6baccb..fd6b05ee6d3 100644 --- a/configs/pinebook-pro-rk3399_defconfig +++ b/configs/pinebook-pro-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x8000 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig index 958392fd6c3..170ac86468d 100644 --- a/configs/plutux_defconfig +++ b/configs/plutux_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x00110000 +CONFIG_TEXT_BASE=0x00110000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x1FFE0000 diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig index d82d92aee48..0245cc53ec7 100644 --- a/configs/pm9261_defconfig +++ b/configs/pm9261_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0 +CONFIG_TEXT_BASE=0 CONFIG_SYS_MALLOC_LEN=0x50000 CONFIG_TARGET_PM9261=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig index 637c2b65d49..2eef60517c0 100644 --- a/configs/pm9263_defconfig +++ b/configs/pm9263_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0 +CONFIG_TEXT_BASE=0 CONFIG_SYS_MALLOC_LEN=0x50000 CONFIG_TARGET_PM9263=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig index 436bfc6109f..c5a20977137 100644 --- a/configs/pm9g45_defconfig +++ b/configs/pm9g45_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x73f00000 +CONFIG_TEXT_BASE=0x73f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_TARGET_PM9G45=y CONFIG_ATMEL_LEGACY=y diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig index 3ca31546ad6..d0071f3af52 100644 --- a/configs/pogo_e02_defconfig +++ b/configs/pogo_e02_defconfig @@ -8,7 +8,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/cloudengines/pogo_e02/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_POGO_E02=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/pogo_v4_defconfig b/configs/pogo_v4_defconfig index 49b7353ab65..3b08cb7b1d1 100644 --- a/configs/pogo_v4_defconfig +++ b/configs/pogo_v4_defconfig @@ -8,7 +8,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/cloudengines/pogo_v4/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TARGET_POGO_V4=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/poleg_evb_defconfig b/configs/poleg_evb_defconfig index 597a72eed9d..914fc39a7e3 100644 --- a/configs/poleg_evb_defconfig +++ b/configs/poleg_evb_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_SYS_L2_PL310=y CONFIG_ARCH_NPCM=y -CONFIG_SYS_TEXT_BASE=0x8200 +CONFIG_TEXT_BASE=0x8200 CONFIG_SYS_MALLOC_LEN=0x240000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/pomelo_defconfig b/configs/pomelo_defconfig index ee5abb0e1e3..be6806f8b92 100644 --- a/configs/pomelo_defconfig +++ b/configs/pomelo_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_POMELO=y -CONFIG_SYS_TEXT_BASE=0x180000 +CONFIG_TEXT_BASE=0x180000 CONFIG_SYS_MALLOC_LEN=0x101000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/poplar_defconfig b/configs/poplar_defconfig index f32b80f48e1..70dde31c837 100644 --- a/configs/poplar_defconfig +++ b/configs/poplar_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_POPLAR=y -CONFIG_SYS_TEXT_BASE=0x37000000 +CONFIG_TEXT_BASE=0x37000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig index c010a8d7fa3..2d250e020dd 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SYS_ARCH_TIMER=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-popmetal" diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 302291285f9..aedaa9b1951 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -4,7 +4,7 @@ CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index c64c6b8ca3d..c2b0b39c7b2 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/px30-core-ctouch2-of10-px30_defconfig b/configs/px30-core-ctouch2-of10-px30_defconfig index 65efd03c678..9175c7c85ae 100644 --- a/configs/px30-core-ctouch2-of10-px30_defconfig +++ b/configs/px30-core-ctouch2-of10-px30_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/px30-core-ctouch2-px30_defconfig b/configs/px30-core-ctouch2-px30_defconfig index c7e66d36832..0aa7cca7b8b 100644 --- a/configs/px30-core-ctouch2-px30_defconfig +++ b/configs/px30-core-ctouch2-px30_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/px30-core-edimm2.2-px30_defconfig b/configs/px30-core-edimm2.2-px30_defconfig index 9ec4320e14f..d731b968788 100644 --- a/configs/px30-core-edimm2.2-px30_defconfig +++ b/configs/px30-core-edimm2.2-px30_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 8802bdeffb1..88197ea2e19 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig index 4e2e77a1b6c..351913f2832 100644 --- a/configs/qemu-ppce500_defconfig +++ b/configs/qemu-ppce500_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xf00000 +CONFIG_TEXT_BASE=0xf00000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="qemu-ppce500" CONFIG_SYS_CLK_FREQ=33000000 diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index b81e60658fd..8433b5734f6 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0x1110000 +CONFIG_TEXT_BASE=0x1110000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x40000 diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index c65b5868cd2..f82f628d5bb 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFF00000 +CONFIG_TEXT_BASE=0xFFF00000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x40000 diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig index a89a07db2a2..6045e062996 100644 --- a/configs/r2dplus_defconfig +++ b/configs/r2dplus_defconfig @@ -1,5 +1,5 @@ CONFIG_SH=y -CONFIG_SYS_TEXT_BASE=0x8FE00000 +CONFIG_TEXT_BASE=0x8FE00000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x40000 diff --git a/configs/r8a77970_eagle_defconfig b/configs/r8a77970_eagle_defconfig index 5f524ae4ad3..9716ebff926 100644 --- a/configs/r8a77970_eagle_defconfig +++ b/configs/r8a77970_eagle_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=16666666 CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x40000 diff --git a/configs/r8a77980_condor_defconfig b/configs/r8a77980_condor_defconfig index 9e1b17addad..a05b92d41b2 100644 --- a/configs/r8a77980_condor_defconfig +++ b/configs/r8a77980_condor_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=16666666 CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x40000 diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig index ff7a8fb99a4..1ee826b748c 100644 --- a/configs/r8a77990_ebisu_defconfig +++ b/configs/r8a77990_ebisu_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=16666666 CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig index 64f9583b9f5..12e8704bf42 100644 --- a/configs/r8a77995_draak_defconfig +++ b/configs/r8a77995_draak_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=16666666 CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/r8a779a0_falcon_defconfig b/configs/r8a779a0_falcon_defconfig index 7375973d0fa..7ccedf77240 100644 --- a/configs/r8a779a0_falcon_defconfig +++ b/configs/r8a779a0_falcon_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=16666666 CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC00000 diff --git a/configs/radxa-zero_defconfig b/configs/radxa-zero_defconfig index 1c84cfc5f70..19bd9f3e357 100644 --- a/configs/radxa-zero_defconfig +++ b/configs/radxa-zero_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 1a8c03c70ed..861f0f59bc8 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig index b00e9f4e2bf..f462bab5a8d 100644 --- a/configs/rcar3_ulcb_defconfig +++ b/configs/rcar3_ulcb_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=16666666 CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x20000 diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig index 8ed96c2aca1..3a87f5b630e 100644 --- a/configs/riotboard_defconfig +++ b/configs/riotboard_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/roc-cc-rk3308_defconfig b/configs/roc-cc-rk3308_defconfig index 8b0717511c4..670211e2e9d 100644 --- a/configs/roc-cc-rk3308_defconfig +++ b/configs/roc-cc-rk3308_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00600000 +CONFIG_TEXT_BASE=0x00600000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/roc-cc-rk3328_defconfig b/configs/roc-cc-rk3328_defconfig index 8ba50345da3..3e0323c53f4 100644 --- a/configs/roc-cc-rk3328_defconfig +++ b/configs/roc-cc-rk3328_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig index c8e57f60ddd..3cdcc729f85 100644 --- a/configs/roc-pc-mezzanine-rk3399_defconfig +++ b/configs/roc-pc-mezzanine-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x8000 diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig index ed37c687c44..e03442afa46 100644 --- a/configs/roc-pc-rk3399_defconfig +++ b/configs/roc-pc-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x8000 diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig index a6a5292ca83..83721cedf3d 100644 --- a/configs/rock-pi-4-rk3399_defconfig +++ b/configs/rock-pi-4-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4b" diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c-rk3399_defconfig index 411a5fd26e8..ac9a3f98306 100644 --- a/configs/rock-pi-4c-rk3399_defconfig +++ b/configs/rock-pi-4c-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4c" diff --git a/configs/rock-pi-e-rk3328_defconfig b/configs/rock-pi-e-rk3328_defconfig index fb5eac3c1f8..fa9a6bea5b0 100644 --- a/configs/rock-pi-e-rk3328_defconfig +++ b/configs/rock-pi-e-rk3328_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/rock-pi-n10-rk3399pro_defconfig b/configs/rock-pi-n10-rk3399pro_defconfig index 40b4d7d42a4..fcb3a681ca0 100644 --- a/configs/rock-pi-n10-rk3399pro_defconfig +++ b/configs/rock-pi-n10-rk3399pro_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/rock-pi-n8-rk3288_defconfig b/configs/rock-pi-n8-rk3288_defconfig index bd2fb5d83ab..ffcbd350b3b 100644 --- a/configs/rock-pi-n8-rk3288_defconfig +++ b/configs/rock-pi-n8-rk3288_defconfig @@ -5,7 +5,7 @@ CONFIG_SYS_ARCH_TIMER=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00100000 +CONFIG_TEXT_BASE=0x00100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-rock-pi-n8" diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index 3f06446c17f..1570a71a883 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SYS_ARCH_TIMER=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-rock2-square" diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig index b055dd09794..45c4ba4d287 100644 --- a/configs/rock64-rk3328_defconfig +++ b/configs/rock64-rk3328_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig index 9e7d8465719..28dec60606b 100644 --- a/configs/rock960-rk3399_defconfig +++ b/configs/rock960-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock960" CONFIG_SYS_PROMPT="rock960 => " diff --git a/configs/rock_defconfig b/configs/rock_defconfig index e99272ef226..bd6183ba5b8 100644 --- a/configs/rock_defconfig +++ b/configs/rock_defconfig @@ -4,7 +4,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_TEXT_BASE=0x60000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index 309efa770e3..09d4c9e72cf 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x8000 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig index 67664516f4f..baa8c37810c 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_BCM283X=y -CONFIG_SYS_TEXT_BASE=0x00008000 +CONFIG_TEXT_BASE=0x00008000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TARGET_RPI_0_W=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index 498acc323a8..baae6d48710 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_BCM283X=y -CONFIG_SYS_TEXT_BASE=0x00008000 +CONFIG_TEXT_BASE=0x00008000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TARGET_RPI_2=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index 0ffb466a69a..f51f3de5964 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_BCM283X=y -CONFIG_SYS_TEXT_BASE=0x00008000 +CONFIG_TEXT_BASE=0x00008000 CONFIG_TARGET_RPI_3_32B=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig index e112fca0f29..8fd74fc1f6c 100644 --- a/configs/rpi_3_b_plus_defconfig +++ b/configs/rpi_3_b_plus_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_BCM283X=y -CONFIG_SYS_TEXT_BASE=0x00080000 +CONFIG_TEXT_BASE=0x00080000 CONFIG_TARGET_RPI_3=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index 94f5d034b00..bc1a318db41 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_BCM283X=y -CONFIG_SYS_TEXT_BASE=0x00080000 +CONFIG_TEXT_BASE=0x00080000 CONFIG_TARGET_RPI_3=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig index 8c03252e596..5207e561ee7 100644 --- a/configs/rpi_4_32b_defconfig +++ b/configs/rpi_4_32b_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_BCM283X=y -CONFIG_SYS_TEXT_BASE=0x00008000 +CONFIG_TEXT_BASE=0x00008000 CONFIG_TARGET_RPI_4_32B=y CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b" diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig index 46104c9292e..a6fe2feab28 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_BCM283X=y -CONFIG_SYS_TEXT_BASE=0x00080000 +CONFIG_TEXT_BASE=0x00080000 CONFIG_TARGET_RPI_4=y CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b" diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig index 433ec8b23b2..031ed69ff00 100644 --- a/configs/rpi_arm64_defconfig +++ b/configs/rpi_arm64_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_BCM283X=y -CONFIG_SYS_TEXT_BASE=0x00080000 +CONFIG_TEXT_BASE=0x00080000 CONFIG_TARGET_RPI_ARM64=y CONFIG_ENV_SIZE=0x4000 CONFIG_DEFAULT_DEVICE_TREE="bcm2711-rpi-4-b" diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index 1e11f378881..1d356b4b2e0 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_BCM283X=y -CONFIG_SYS_TEXT_BASE=0x00008000 +CONFIG_TEXT_BASE=0x00008000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TARGET_RPI=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 4cfd5bf223b..92da62ef6c5 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/rzg2_beacon_defconfig b/configs/rzg2_beacon_defconfig index ffcaaccc337..d3e77c6e70f 100644 --- a/configs/rzg2_beacon_defconfig +++ b/configs/rzg2_beacon_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_OFFSET=0x0 diff --git a/configs/s400_defconfig b/configs/s400_defconfig index bcb83843d08..827bd548c7e 100644 --- a/configs/s400_defconfig +++ b/configs/s400_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/s5p4418_nanopi2_defconfig b/configs/s5p4418_nanopi2_defconfig index ce46f847e09..35e7c880598 100644 --- a/configs/s5p4418_nanopi2_defconfig +++ b/configs/s5p4418_nanopi2_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_NEXELL=y -CONFIG_SYS_TEXT_BASE=0x74C00000 +CONFIG_TEXT_BASE=0x74C00000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index d5a1219646f..4f29a2b5f5e 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_S5PC1XX=y -CONFIG_SYS_TEXT_BASE=0x34800000 +CONFIG_TEXT_BASE=0x34800000 CONFIG_SYS_MALLOC_LEN=0x5001000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index 9443be7dfa9..5eeea44c749 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x44800000 +CONFIG_TEXT_BASE=0x44800000 CONFIG_SYS_MALLOC_LEN=0x5001000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS4=y diff --git a/configs/sagem_f@st1704_ram_defconfig b/configs/sagem_f@st1704_ram_defconfig index 87199fde7bc..744e132ed6f 100644 --- a/configs/sagem_f@st1704_ram_defconfig +++ b/configs/sagem_f@st1704_ram_defconfig @@ -1,6 +1,6 @@ CONFIG_MIPS=y CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_TEXT_BASE=0x80010000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/sam9x60_curiosity_mmc_defconfig b/configs/sam9x60_curiosity_mmc_defconfig index f7ac3dfcc38..732b5adf262 100644 --- a/configs/sam9x60_curiosity_mmc_defconfig +++ b/configs/sam9x60_curiosity_mmc_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x23f00000 +CONFIG_TEXT_BASE=0x23f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_TARGET_SAM9X60_CURIOSITY=y diff --git a/configs/sam9x60ek_mmc_defconfig b/configs/sam9x60ek_mmc_defconfig index 20b27649bfb..f83cbf6f15b 100644 --- a/configs/sam9x60ek_mmc_defconfig +++ b/configs/sam9x60ek_mmc_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x23f00000 +CONFIG_TEXT_BASE=0x23f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_TARGET_SAM9X60EK=y diff --git a/configs/sam9x60ek_nandflash_defconfig b/configs/sam9x60ek_nandflash_defconfig index 8a7f2e06415..b04a153640d 100644 --- a/configs/sam9x60ek_nandflash_defconfig +++ b/configs/sam9x60ek_nandflash_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x23f00000 +CONFIG_TEXT_BASE=0x23f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_TARGET_SAM9X60EK=y diff --git a/configs/sam9x60ek_qspiflash_defconfig b/configs/sam9x60ek_qspiflash_defconfig index 51449f02333..fd95a6fbbba 100644 --- a/configs/sam9x60ek_qspiflash_defconfig +++ b/configs/sam9x60ek_qspiflash_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x23f00000 +CONFIG_TEXT_BASE=0x23f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_TARGET_SAM9X60EK=y diff --git a/configs/sama5d27_giantboard_defconfig b/configs/sama5d27_giantboard_defconfig index 71187df16e6..27497c53317 100644 --- a/configs/sama5d27_giantboard_defconfig +++ b/configs/sama5d27_giantboard_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x23f00000 +CONFIG_TEXT_BASE=0x23f00000 CONFIG_TARGET_SAMA5D27_SOM1_EK=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d27_som1_ek_mmc1_defconfig b/configs/sama5d27_som1_ek_mmc1_defconfig index c9b52239fc0..c1b4e00d73d 100644 --- a/configs/sama5d27_som1_ek_mmc1_defconfig +++ b/configs/sama5d27_som1_ek_mmc1_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x23f00000 +CONFIG_TEXT_BASE=0x23f00000 CONFIG_TARGET_SAMA5D27_SOM1_EK=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d27_som1_ek_mmc_defconfig b/configs/sama5d27_som1_ek_mmc_defconfig index 8e5907c4dbc..9eb65bbf499 100644 --- a/configs/sama5d27_som1_ek_mmc_defconfig +++ b/configs/sama5d27_som1_ek_mmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x23f00000 +CONFIG_TEXT_BASE=0x23f00000 CONFIG_TARGET_SAMA5D27_SOM1_EK=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d27_som1_ek_qspiflash_defconfig b/configs/sama5d27_som1_ek_qspiflash_defconfig index 8684f08d497..2339425a86a 100644 --- a/configs/sama5d27_som1_ek_qspiflash_defconfig +++ b/configs/sama5d27_som1_ek_qspiflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x23f00000 +CONFIG_TEXT_BASE=0x23f00000 CONFIG_TARGET_SAMA5D27_SOM1_EK=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d27_wlsom1_ek_mmc_defconfig b/configs/sama5d27_wlsom1_ek_mmc_defconfig index 47dc1d99bd0..801ce7944f0 100644 --- a/configs/sama5d27_wlsom1_ek_mmc_defconfig +++ b/configs/sama5d27_wlsom1_ek_mmc_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D27_WLSOM1_EK=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig index bc03fec3fe5..ede7081f50f 100644 --- a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig +++ b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D27_WLSOM1_EK=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d2_icp_mmc_defconfig b/configs/sama5d2_icp_mmc_defconfig index 77bdb6d67f2..8e2e160fc8a 100644 --- a/configs/sama5d2_icp_mmc_defconfig +++ b/configs/sama5d2_icp_mmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D2_ICP=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d2_icp_qspiflash_defconfig b/configs/sama5d2_icp_qspiflash_defconfig index a8884b0b5d9..2536d4021cc 100644 --- a/configs/sama5d2_icp_qspiflash_defconfig +++ b/configs/sama5d2_icp_qspiflash_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D2_ICP=y CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y diff --git a/configs/sama5d2_ptc_ek_mmc_defconfig b/configs/sama5d2_ptc_ek_mmc_defconfig index d611f840a1b..8ae20d5a76b 100644 --- a/configs/sama5d2_ptc_ek_mmc_defconfig +++ b/configs/sama5d2_ptc_ek_mmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D2_PTC_EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 diff --git a/configs/sama5d2_ptc_ek_nandflash_defconfig b/configs/sama5d2_ptc_ek_nandflash_defconfig index 85a8baafa42..f9872781019 100644 --- a/configs/sama5d2_ptc_ek_nandflash_defconfig +++ b/configs/sama5d2_ptc_ek_nandflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D2_PTC_EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y diff --git a/configs/sama5d2_xplained_emmc_defconfig b/configs/sama5d2_xplained_emmc_defconfig index 20b3124af54..ba66d9fc965 100644 --- a/configs/sama5d2_xplained_emmc_defconfig +++ b/configs/sama5d2_xplained_emmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D2_XPLAINED=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index f39c084ca22..a30b0cb0a1c 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D2_XPLAINED=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d2_xplained_qspiflash_defconfig b/configs/sama5d2_xplained_qspiflash_defconfig index 993470e60f1..6daedb837f7 100644 --- a/configs/sama5d2_xplained_qspiflash_defconfig +++ b/configs/sama5d2_xplained_qspiflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D2_XPLAINED=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig index 639cf0da7d4..9e0c07caee5 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D2_XPLAINED=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d36ek_cmp_mmc_defconfig b/configs/sama5d36ek_cmp_mmc_defconfig index 7b8efdcce8c..61a03203021 100644 --- a/configs/sama5d36ek_cmp_mmc_defconfig +++ b/configs/sama5d36ek_cmp_mmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D3XEK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 diff --git a/configs/sama5d36ek_cmp_nandflash_defconfig b/configs/sama5d36ek_cmp_nandflash_defconfig index 81acb4efa0b..8d8526b270d 100644 --- a/configs/sama5d36ek_cmp_nandflash_defconfig +++ b/configs/sama5d36ek_cmp_nandflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D3XEK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y diff --git a/configs/sama5d36ek_cmp_spiflash_defconfig b/configs/sama5d36ek_cmp_spiflash_defconfig index f328d596391..114175d89ad 100644 --- a/configs/sama5d36ek_cmp_spiflash_defconfig +++ b/configs/sama5d36ek_cmp_spiflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D3XEK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig index 834dcc1b824..78cbbf3d1d2 100644 --- a/configs/sama5d3_xplained_mmc_defconfig +++ b/configs/sama5d3_xplained_mmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D3_XPLAINED=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index 93497500bd2..d7d57fc9f0e 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D3_XPLAINED=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig index 74cacf51c66..9bab96d3b74 100644 --- a/configs/sama5d3xek_mmc_defconfig +++ b/configs/sama5d3xek_mmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D3XEK=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index 01b92cef724..3132671c93b 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D3XEK=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig index 28345c3ad6d..a60f9250937 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D3XEK=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig index 3e89b202b03..ace2dd3e1a2 100644 --- a/configs/sama5d4_xplained_mmc_defconfig +++ b/configs/sama5d4_xplained_mmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D4_XPLAINED=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index ee209a5d93c..cfc168c6c98 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D4_XPLAINED=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig index 6039b9eba36..419067c2a02 100644 --- a/configs/sama5d4_xplained_spiflash_defconfig +++ b/configs/sama5d4_xplained_spiflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D4_XPLAINED=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig index 3fb3afe6e13..623643029ca 100644 --- a/configs/sama5d4ek_mmc_defconfig +++ b/configs/sama5d4ek_mmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D4EK=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index 0410c12e725..ea82684f2f8 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D4EK=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig index 8ff511ebc24..108133eb62a 100644 --- a/configs/sama5d4ek_spiflash_defconfig +++ b/configs/sama5d4ek_spiflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x26f00000 +CONFIG_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D4EK=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sama7g5ek_mmc1_defconfig b/configs/sama7g5ek_mmc1_defconfig index 444fbadc3d5..f004e448039 100644 --- a/configs/sama7g5ek_mmc1_defconfig +++ b/configs/sama7g5ek_mmc1_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x66f00000 +CONFIG_TEXT_BASE=0x66f00000 CONFIG_SYS_MALLOC_F_LEN=0x11000 CONFIG_TARGET_SAMA7G5EK=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/sama7g5ek_mmc_defconfig b/configs/sama7g5ek_mmc_defconfig index 9aad9ce151e..5b42fc63f30 100644 --- a/configs/sama7g5ek_mmc_defconfig +++ b/configs/sama7g5ek_mmc_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x66f00000 +CONFIG_TEXT_BASE=0x66f00000 CONFIG_SYS_MALLOC_F_LEN=0x11000 CONFIG_TARGET_SAMA7G5EK=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index 1423a2bf576..af2ce34174e 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_TEXT_BASE=0 +CONFIG_TEXT_BASE=0 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="sandbox64" diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 42f6e274537..f12d0a4f516 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_TEXT_BASE=0 +CONFIG_TEXT_BASE=0 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="sandbox" diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index e18f9a04d2b..01234dc183b 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_TEXT_BASE=0 +CONFIG_TEXT_BASE=0 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="sandbox" diff --git a/configs/sandbox_noinst_defconfig b/configs/sandbox_noinst_defconfig index ef3e28989a4..7c66e541d92 100644 --- a/configs/sandbox_noinst_defconfig +++ b/configs/sandbox_noinst_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_TEXT_BASE=0x200000 +CONFIG_TEXT_BASE=0x200000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 3dc041e6616..c94c62e3f95 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_TEXT_BASE=0x200000 +CONFIG_TEXT_BASE=0x200000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/sandbox_vpl_defconfig b/configs/sandbox_vpl_defconfig index 8128f6eaaf6..557fdd141f2 100644 --- a/configs/sandbox_vpl_defconfig +++ b/configs/sandbox_vpl_defconfig @@ -1,10 +1,13 @@ -CONFIG_SYS_TEXT_BASE=0x200000 +CONFIG_TEXT_BASE=0x200000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="sandbox" +CONFIG_SPL_TEXT_BASE=0x100000 +CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y +CONFIG_TPL_TEXT_BASE=0x100000 CONFIG_TPL_LIBCOMMON_SUPPORT=y CONFIG_TPL_LIBGENERIC_SUPPORT=y CONFIG_TPL_SERIAL=y @@ -23,6 +26,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y +CONFIG_FIT_BEST_MATCH=y CONFIG_SPL_LOAD_FIT=y # CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_BOOTSTAGE=y @@ -47,6 +51,7 @@ CONFIG_TPL_I2C=y CONFIG_TPL_RTC=y CONFIG_VPL=y CONFIG_VPL_ENV_SUPPORT=y +CONFIG_VPL_TEXT_BASE=0x100000 CONFIG_CMD_CPU=y CONFIG_CMD_LICENSE=y CONFIG_CMD_BOOTZ=y @@ -98,7 +103,9 @@ CONFIG_CMD_CBFS=y CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y CONFIG_MAC_PARTITION=y -CONFIG_AMIGA_PARTITION=y +# CONFIG_SPL_MAC_PARTITION is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_TPL_OF_CONTROL=y @@ -113,6 +120,7 @@ CONFIG_NETCONSOLE=y CONFIG_IP_DEFRAG=y CONFIG_SPL_DM=y CONFIG_TPL_DM=y +CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DM_DMA=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y @@ -226,6 +234,8 @@ CONFIG_SPL_SYSRESET=y CONFIG_TPL_SYSRESET=y CONFIG_DM_THERMAL=y CONFIG_TIMER=y +CONFIG_SPL_TIMER=y +CONFIG_VPL_TIMER=y CONFIG_TIMER_EARLY=y CONFIG_SANDBOX_TIMER=y CONFIG_USB=y @@ -246,6 +256,7 @@ CONFIG_CMD_DHRYSTONE=y CONFIG_RSA_VERIFY_WITH_PKEY=y CONFIG_TPM=y CONFIG_LZ4=y +# CONFIG_VPL_LZMA is not set CONFIG_ERRNO_STR=y CONFIG_UNIT_TEST=y CONFIG_SPL_UNIT_TEST=y diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig index 2b96ec54be2..686a3c062b1 100644 --- a/configs/seaboard_defconfig +++ b/configs/seaboard_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x00110000 +CONFIG_TEXT_BASE=0x00110000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 diff --git a/configs/seeed_npi_imx6ull_defconfig b/configs/seeed_npi_imx6ull_defconfig index e12a7d85060..b239d22b693 100644 --- a/configs/seeed_npi_imx6ull_defconfig +++ b/configs/seeed_npi_imx6ull_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x0200000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/sei510_defconfig b/configs/sei510_defconfig index 59036ccc29b..30b49ccad4b 100644 --- a/configs/sei510_defconfig +++ b/configs/sei510_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="sei510" CONFIG_SYS_CONFIG_NAME="sei510" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x8000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x10000 diff --git a/configs/sei610_defconfig b/configs/sei610_defconfig index 09d3cfb4e82..a922765eded 100644 --- a/configs/sei610_defconfig +++ b/configs/sei610_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_BOARD="sei610" CONFIG_SYS_CONFIG_NAME="sei610" CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_LEN=0x8000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x10000 diff --git a/configs/sfr_nb4-ser_ram_defconfig b/configs/sfr_nb4-ser_ram_defconfig index f32e943705f..6260939553b 100644 --- a/configs/sfr_nb4-ser_ram_defconfig +++ b/configs/sfr_nb4-ser_ram_defconfig @@ -1,6 +1,6 @@ CONFIG_MIPS=y CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_TEXT_BASE=0x80010000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/sheep-rk3368_defconfig b/configs/sheep-rk3368_defconfig index 06dacef8a7d..01f104a97d0 100644 --- a/configs/sheep-rk3368_defconfig +++ b/configs/sheep-rk3368_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="rk3368-sheep" CONFIG_ROCKCHIP_RK3368=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 14070342977..52f5aba8cab 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -8,7 +8,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/Marvell/sheevaplug/kwbimage.cfg" -CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_SHEEVAPLUG=y CONFIG_ENV_SIZE=0x20000 diff --git a/configs/silinux_ek874_defconfig b/configs/silinux_ek874_defconfig index b29540a5778..2ef2f7c68ba 100644 --- a/configs/silinux_ek874_defconfig +++ b/configs/silinux_ek874_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=16666666 CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x10000 diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 84985008fe2..38a14767ade 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -4,7 +4,7 @@ CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/sipeed_maix_smode_defconfig b/configs/sipeed_maix_smode_defconfig index d1bfbdfbd06..738df1c27fd 100644 --- a/configs/sipeed_maix_smode_defconfig +++ b/configs/sipeed_maix_smode_defconfig @@ -1,5 +1,5 @@ CONFIG_RISCV=y -CONFIG_SYS_TEXT_BASE=0x80020000 +CONFIG_TEXT_BASE=0x80020000 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0xfff000 diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 7201a6d2089..36e77ef076f 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -7,7 +7,7 @@ CONFIG_SPL_SYS_THUMB_BUILD=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x23000000 +CONFIG_TEXT_BASE=0x23000000 CONFIG_SYS_MALLOC_LEN=0x460000 CONFIG_TARGET_SMARTWEB=y CONFIG_AT91_GPIO_PULLUP=y diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index fbc4a9244f6..a6e040c5ab1 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -5,7 +5,7 @@ CONFIG_ARCH_CPU_INIT=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x43E00000 +CONFIG_TEXT_BASE=0x43E00000 CONFIG_SYS_MALLOC_LEN=0x5004000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS5=y diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig index 23aa15236cb..06a9546ce02 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x23E00000 +CONFIG_TEXT_BASE=0x23E00000 CONFIG_SYS_MALLOC_LEN=0x5004000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS5=y diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig index b0048545b55..1476935a178 100644 --- a/configs/smdkc100_defconfig +++ b/configs/smdkc100_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_S5PC1XX=y -CONFIG_SYS_TEXT_BASE=0x34800000 +CONFIG_TEXT_BASE=0x34800000 CONFIG_SYS_MALLOC_LEN=0x120000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig index 92d315ccc06..cdfc8b758a2 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SPL_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x43E00000 +CONFIG_TEXT_BASE=0x43E00000 CONFIG_SYS_MALLOC_LEN=0x5004000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS4=y diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index cfa43ad4490..bae9b0e2546 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_LEN=0x120000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/snow_defconfig b/configs/snow_defconfig index 9c2292a6947..6921c5667da 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -5,7 +5,7 @@ CONFIG_ARCH_CPU_INIT=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x43E00000 +CONFIG_TEXT_BASE=0x43E00000 CONFIG_SYS_MALLOC_LEN=0x5004000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS5=y diff --git a/configs/socfpga_agilex_atf_defconfig b/configs/socfpga_agilex_atf_defconfig index 4356171c143..167e05b0aa5 100644 --- a/configs/socfpga_agilex_atf_defconfig +++ b/configs/socfpga_agilex_atf_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=400000000 CONFIG_ARCH_SOCFPGA=y -CONFIG_SYS_TEXT_BASE=0x200000 +CONFIG_TEXT_BASE=0x200000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds" diff --git a/configs/socfpga_agilex_defconfig b/configs/socfpga_agilex_defconfig index 0603dd15ecb..e5864ebda21 100644 --- a/configs/socfpga_agilex_defconfig +++ b/configs/socfpga_agilex_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=400000000 CONFIG_ARCH_SOCFPGA=y -CONFIG_SYS_TEXT_BASE=0x1000 +CONFIG_TEXT_BASE=0x1000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/socfpga_agilex_vab_defconfig b/configs/socfpga_agilex_vab_defconfig index f568f5525ea..bcdeb6d17cf 100644 --- a/configs/socfpga_agilex_vab_defconfig +++ b/configs/socfpga_agilex_vab_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=400000000 CONFIG_ARCH_SOCFPGA=y -CONFIG_SYS_TEXT_BASE=0x200000 +CONFIG_TEXT_BASE=0x200000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds" diff --git a/configs/socfpga_n5x_atf_defconfig b/configs/socfpga_n5x_atf_defconfig index 775e1111a26..453fd87bd22 100644 --- a/configs/socfpga_n5x_atf_defconfig +++ b/configs/socfpga_n5x_atf_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=400000000 CONFIG_ARCH_SOCFPGA=y -CONFIG_SYS_TEXT_BASE=0x200000 +CONFIG_TEXT_BASE=0x200000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds" diff --git a/configs/socfpga_n5x_defconfig b/configs/socfpga_n5x_defconfig index 59f46a1f086..ae717919972 100644 --- a/configs/socfpga_n5x_defconfig +++ b/configs/socfpga_n5x_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=400000000 CONFIG_ARCH_SOCFPGA=y -CONFIG_SYS_TEXT_BASE=0x1000 +CONFIG_TEXT_BASE=0x1000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/socfpga_n5x_vab_defconfig b/configs/socfpga_n5x_vab_defconfig index 073c1fbaebd..259b8ddf85e 100644 --- a/configs/socfpga_n5x_vab_defconfig +++ b/configs/socfpga_n5x_vab_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=400000000 CONFIG_ARCH_SOCFPGA=y -CONFIG_SYS_TEXT_BASE=0x200000 +CONFIG_TEXT_BASE=0x200000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds" diff --git a/configs/socfpga_stratix10_atf_defconfig b/configs/socfpga_stratix10_atf_defconfig index 9ffbd83031a..acb1ce9e0c9 100644 --- a/configs/socfpga_stratix10_atf_defconfig +++ b/configs/socfpga_stratix10_atf_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=400000000 CONFIG_ARCH_SOCFPGA=y -CONFIG_SYS_TEXT_BASE=0x200000 +CONFIG_TEXT_BASE=0x200000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds" diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index 4915d534d3b..90a44f29815 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=400000000 CONFIG_ARCH_SOCFPGA=y -CONFIG_SYS_TEXT_BASE=0x1000 +CONFIG_TEXT_BASE=0x1000 CONFIG_SYS_MALLOC_LEN=0x500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x1000 diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig index bb73f28b36b..1f57e659bca 100644 --- a/configs/socrates_defconfig +++ b/configs/socrates_defconfig @@ -1,6 +1,6 @@ CONFIG_PPC=y CONFIG_SYS_IMMR=0xE0000000 -CONFIG_SYS_TEXT_BASE=0xfff80000 +CONFIG_TEXT_BASE=0xfff80000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="socrates" diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig index d912ac70bc1..5d401e6c2d7 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFF00000 +CONFIG_TEXT_BASE=0xFFF00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x6EF000 diff --git a/configs/somlabs_visionsom_6ull_defconfig b/configs/somlabs_visionsom_6ull_defconfig index b99266fec74..0968e6dd86d 100644 --- a/configs/somlabs_visionsom_6ull_defconfig +++ b/configs/somlabs_visionsom_6ull_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/spring_defconfig b/configs/spring_defconfig index 0cc0556e6ed..825a8dbf1ad 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -5,7 +5,7 @@ CONFIG_ARCH_CPU_INIT=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x43E00000 +CONFIG_TEXT_BASE=0x43E00000 CONFIG_SYS_MALLOC_LEN=0x5004000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS5=y diff --git a/configs/stemmy_defconfig b/configs/stemmy_defconfig index 90f2970def8..ff9667ae92a 100644 --- a/configs/stemmy_defconfig +++ b/configs/stemmy_defconfig @@ -5,7 +5,7 @@ CONFIG_ARCH_U8500=y CONFIG_SUPPORT_PASSING_ATAGS=y # CONFIG_SETUP_MEMORY_TAGS is not set CONFIG_INITRD_TAG=y -CONFIG_SYS_TEXT_BASE=0x100000 +CONFIG_TEXT_BASE=0x100000 CONFIG_SYS_MALLOC_LEN=0x0200000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/stih410-b2260_defconfig b/configs/stih410-b2260_defconfig index ce3a0384f00..b49c476047d 100644 --- a/configs/stih410-b2260_defconfig +++ b/configs/stih410-b2260_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_STI=y -CONFIG_SYS_TEXT_BASE=0x7D600000 +CONFIG_TEXT_BASE=0x7D600000 CONFIG_SYS_MALLOC_LEN=0x1800000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/stm32746g-eval_defconfig b/configs/stm32746g-eval_defconfig index 50d721fb5c3..f5ed3b10b5b 100644 --- a/configs/stm32746g-eval_defconfig +++ b/configs/stm32746g-eval_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_STM32=y -CONFIG_SYS_TEXT_BASE=0x08000000 +CONFIG_TEXT_BASE=0x08000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/stm32746g-eval_spl_defconfig b/configs/stm32746g-eval_spl_defconfig index 498b478addf..9e3908842a8 100644 --- a/configs/stm32746g-eval_spl_defconfig +++ b/configs/stm32746g-eval_spl_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_STM32=y -CONFIG_SYS_TEXT_BASE=0x08009000 +CONFIG_TEXT_BASE=0x08009000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig index 914ac14641c..af9901ffc6f 100644 --- a/configs/stm32f429-discovery_defconfig +++ b/configs/stm32f429-discovery_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_STM32=y -CONFIG_SYS_TEXT_BASE=0x08000000 +CONFIG_TEXT_BASE=0x08000000 CONFIG_SYS_MALLOC_LEN=0x0200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/stm32f429-evaluation_defconfig b/configs/stm32f429-evaluation_defconfig index af7a8bf0769..183849353c0 100644 --- a/configs/stm32f429-evaluation_defconfig +++ b/configs/stm32f429-evaluation_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_STM32=y -CONFIG_SYS_TEXT_BASE=0x08000000 +CONFIG_TEXT_BASE=0x08000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/stm32f469-discovery_defconfig b/configs/stm32f469-discovery_defconfig index 90680fdb052..3f2add30620 100644 --- a/configs/stm32f469-discovery_defconfig +++ b/configs/stm32f469-discovery_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_STM32=y -CONFIG_SYS_TEXT_BASE=0x08000000 +CONFIG_TEXT_BASE=0x08000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig index dfbc766807f..764ccf52d27 100644 --- a/configs/stm32f746-disco_defconfig +++ b/configs/stm32f746-disco_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_STM32=y -CONFIG_SYS_TEXT_BASE=0x08000000 +CONFIG_TEXT_BASE=0x08000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/stm32f746-disco_spl_defconfig b/configs/stm32f746-disco_spl_defconfig index e9b0f82b1a8..2c58aef465d 100644 --- a/configs/stm32f746-disco_spl_defconfig +++ b/configs/stm32f746-disco_spl_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_STM32=y -CONFIG_SYS_TEXT_BASE=0x08009000 +CONFIG_TEXT_BASE=0x08009000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/stm32f769-disco_defconfig b/configs/stm32f769-disco_defconfig index 122f2ad1355..b55569ab5f4 100644 --- a/configs/stm32f769-disco_defconfig +++ b/configs/stm32f769-disco_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_STM32=y -CONFIG_SYS_TEXT_BASE=0x08000000 +CONFIG_TEXT_BASE=0x08000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/stm32f769-disco_spl_defconfig b/configs/stm32f769-disco_spl_defconfig index ccec43daeae..6e37f6a860c 100644 --- a/configs/stm32f769-disco_spl_defconfig +++ b/configs/stm32f769-disco_spl_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_STM32=y -CONFIG_SYS_TEXT_BASE=0x08009000 +CONFIG_TEXT_BASE=0x08009000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/stm32h743-disco_defconfig b/configs/stm32h743-disco_defconfig index 8c62c70a57c..f664fa15982 100644 --- a/configs/stm32h743-disco_defconfig +++ b/configs/stm32h743-disco_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_STM32=y -CONFIG_SYS_TEXT_BASE=0x08000000 +CONFIG_TEXT_BASE=0x08000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/stm32h743-eval_defconfig b/configs/stm32h743-eval_defconfig index 1ff6b508197..966b54db35d 100644 --- a/configs/stm32h743-eval_defconfig +++ b/configs/stm32h743-eval_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_STM32=y -CONFIG_SYS_TEXT_BASE=0x08000000 +CONFIG_TEXT_BASE=0x08000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/stm32h750-art-pi_defconfig b/configs/stm32h750-art-pi_defconfig index a5fce5e866c..a9a97a34434 100644 --- a/configs/stm32h750-art-pi_defconfig +++ b/configs/stm32h750-art-pi_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_STM32=y -CONFIG_SYS_TEXT_BASE=0x90000000 +CONFIG_TEXT_BASE=0x90000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig index 03fa066d549..99074c97e9f 100644 --- a/configs/stmark2_defconfig +++ b/configs/stmark2_defconfig @@ -1,5 +1,5 @@ CONFIG_M68K=y -CONFIG_SYS_TEXT_BASE=0x47E00000 +CONFIG_TEXT_BASE=0x47E00000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x40000 diff --git a/configs/stout_defconfig b/configs/stout_defconfig index b0df55558c7..8028c2d7ae1 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -4,7 +4,7 @@ CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_RMOBILE=y -CONFIG_SYS_TEXT_BASE=0x50000000 +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig index f2e8677e095..750437b73bb 100644 --- a/configs/stv0991_defconfig +++ b/configs/stv0991_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_DCACHE_OFF=y CONFIG_TARGET_STV0991=y -CONFIG_SYS_TEXT_BASE=0x00010000 +CONFIG_TEXT_BASE=0x00010000 CONFIG_SYS_MALLOC_LEN=0x14000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x10000 diff --git a/configs/synquacer_developerbox_defconfig b/configs/synquacer_developerbox_defconfig index c0b784b0722..f69b873a36a 100644 --- a/configs/synquacer_developerbox_defconfig +++ b/configs/synquacer_developerbox_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_SYNQUACER=y -CONFIG_SYS_TEXT_BASE=0x08200000 +CONFIG_TEXT_BASE=0x08200000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x30000 diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig index 51f629488b9..acce95ec026 100644 --- a/configs/syzygy_hub_defconfig +++ b/configs/syzygy_hub_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_CONFIG_NAME="syzygy_hub" CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_ZYNQ=y -CONFIG_SYS_TEXT_BASE=0x4000000 +CONFIG_TEXT_BASE=0x4000000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="zynq-syzygy-hub" CONFIG_SPL_STACK_R_ADDR=0x200000 diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index e95ee1b5c47..6fc7199fea4 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -8,7 +8,7 @@ CONFIG_SYS_THUMB_BUILD=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x21000000 +CONFIG_TEXT_BASE=0x21000000 CONFIG_SYS_MALLOC_LEN=0x460000 CONFIG_TARGET_TAURUS=y CONFIG_AT91_GPIO_PULLUP=y diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig index 42f7b3c718e..361853a891b 100644 --- a/configs/tb100_defconfig +++ b/configs/tb100_defconfig @@ -1,6 +1,6 @@ CONFIG_ARC=y CONFIG_TARGET_TB100=y -CONFIG_SYS_TEXT_BASE=0x84000000 +CONFIG_TEXT_BASE=0x84000000 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ENV_SIZE=0x800 diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 8c4cfe5fad1..93539f009f9 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x8000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig index 8745eed2aa3..02d6b496f96 100644 --- a/configs/tec-ng_defconfig +++ b/configs/tec-ng_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_TEXT_BASE=0x80110000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 diff --git a/configs/tec_defconfig b/configs/tec_defconfig index 13bc7a9e784..967d3050eff 100644 --- a/configs/tec_defconfig +++ b/configs/tec_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x00110000 +CONFIG_TEXT_BASE=0x00110000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x1FFE0000 diff --git a/configs/ten64_tfa_defconfig b/configs/ten64_tfa_defconfig index c90a560e326..48b2ffc7521 100644 --- a/configs/ten64_tfa_defconfig +++ b/configs/ten64_tfa_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_TEN64=y CONFIG_TFABOOT=y -CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TEXT_BASE=0x82000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x80000 CONFIG_ENV_OFFSET=0x500000 diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig index afb1957ddd2..22544c0913a 100644 --- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFF00000 +CONFIG_TEXT_BASE=0xFFF00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x6EC000 diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig index 113c0dae2e6..8741ecbb2d7 100644 --- a/configs/theadorable-x86-conga-qa3-e3845_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFF00000 +CONFIG_TEXT_BASE=0xFFF00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x6EC000 diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index 95ff9d763ff..4755b4754f2 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0xFFF00000 +CONFIG_TEXT_BASE=0xFFF00000 CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x6EC000 diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig index d5f4f77fff9..3654c472dc9 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index 3bf21baf5de..aef524052bc 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/thunderx_88xx_defconfig b/configs/thunderx_88xx_defconfig index 49cdc9827f7..417c9120cac 100644 --- a/configs/thunderx_88xx_defconfig +++ b/configs/thunderx_88xx_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_COUNTER_FREQUENCY=25165824 CONFIG_TARGET_THUNDERX_88XX=y -CONFIG_SYS_TEXT_BASE=0x00500000 +CONFIG_TEXT_BASE=0x00500000 CONFIG_SYS_MALLOC_LEN=0x101000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig index ccd97386aa6..998b2ab71cd 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -3,7 +3,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_TPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SYS_ARCH_TIMER=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig index 4ea36be6430..39b6914b366 100644 --- a/configs/tinker-s-rk3288_defconfig +++ b/configs/tinker-s-rk3288_defconfig @@ -3,7 +3,7 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_TPL_SKIP_LOWLEVEL_INIT_ONLY=y CONFIG_SYS_ARCH_TIMER=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig index 2c418f5dbb2..88a1271f7e3 100644 --- a/configs/tools-only_defconfig +++ b/configs/tools-only_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_TEXT_BASE=0 +CONFIG_TEXT_BASE=0 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="sandbox" diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index b8ec7310754..e3ed0b27327 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_CONFIG_NAME="topic_miami" CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_ZYNQ=y -CONFIG_SYS_TEXT_BASE=0x4000000 +CONFIG_TEXT_BASE=0x4000000 CONFIG_ENV_SIZE=0x8000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miami" diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig index d4e04de4c82..cb156562ba4 100644 --- a/configs/topic_miamilite_defconfig +++ b/configs/topic_miamilite_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_CONFIG_NAME="topic_miami" CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_ZYNQ=y -CONFIG_SYS_TEXT_BASE=0x4000000 +CONFIG_TEXT_BASE=0x4000000 CONFIG_ENV_SIZE=0x8000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miamilite" diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig index add5b62ffe2..03d1887cdac 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_CONFIG_NAME="topic_miami" CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_ZYNQ=y -CONFIG_SYS_TEXT_BASE=0x4000000 +CONFIG_TEXT_BASE=0x4000000 CONFIG_ENV_SIZE=0x8000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miamiplus" diff --git a/configs/total_compute_defconfig b/configs/total_compute_defconfig index fd16e6ebe5a..f9901a4f677 100644 --- a/configs/total_compute_defconfig +++ b/configs/total_compute_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_TOTAL_COMPUTE=y -CONFIG_SYS_TEXT_BASE=0xe0000000 +CONFIG_TEXT_BASE=0xe0000000 CONFIG_SYS_MALLOC_LEN=0x3200000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2a00000 diff --git a/configs/tplink_wdr4300_defconfig b/configs/tplink_wdr4300_defconfig index a7faca25428..b60f63497ac 100644 --- a/configs/tplink_wdr4300_defconfig +++ b/configs/tplink_wdr4300_defconfig @@ -1,5 +1,5 @@ CONFIG_MIPS=y -CONFIG_SYS_TEXT_BASE=0xA1000000 +CONFIG_TEXT_BASE=0xA1000000 CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_ENV_SIZE=0x10000 CONFIG_DEFAULT_DEVICE_TREE="tplink_wdr4300" diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index a4417560b1c..208b05a618a 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x43e00000 +CONFIG_TEXT_BASE=0x43e00000 CONFIG_SYS_MALLOC_LEN=0x5001000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS4=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 76e2c2644e2..c88bf2eb70e 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_EXYNOS=y -CONFIG_SYS_TEXT_BASE=0x63300000 +CONFIG_TEXT_BASE=0x63300000 CONFIG_SYS_MALLOC_LEN=0x5001000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_ARCH_EXYNOS4=y diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index 8d94eedbe80..a9f774c6f5b 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x00110000 +CONFIG_TEXT_BASE=0x00110000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFE000 diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index 0d1c99c62c5..3577745d0b2 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xF0000000 +CONFIG_TEXT_BASE=0xF0000000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="kmtuge1" diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig index 21bd1bc4b3a..54fda4bc5e8 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_TURRIS_MOX=y CONFIG_ENV_SIZE=0x10000 diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig index 639c68cdb74..3fbc7117174 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_SPL_SYS_THUMB_BUILD=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index 3fe731fd188..3711d2259a4 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -1,5 +1,5 @@ CONFIG_PPC=y -CONFIG_SYS_TEXT_BASE=0xF0000000 +CONFIG_TEXT_BASE=0xF0000000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="kmtuxa1" diff --git a/configs/u200_defconfig b/configs/u200_defconfig index b4f2f21d7ed..f346b381e2f 100644 --- a/configs/u200_defconfig +++ b/configs/u200_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/uDPU_defconfig b/configs/uDPU_defconfig index 3b0c5273ea3..cfbbf32db0f 100644 --- a/configs/uDPU_defconfig +++ b/configs/uDPU_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_TARGET_MVEBU_ARMADA_37XX=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x180000 diff --git a/configs/udoo_defconfig b/configs/udoo_defconfig index eadc9b600a0..57f2ba43da2 100644 --- a/configs/udoo_defconfig +++ b/configs/udoo_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0x0200000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig index 4ff449ceece..8ae9fa57f03 100644 --- a/configs/udoo_neo_defconfig +++ b/configs/udoo_neo_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x300000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index 5de9a688343..405026674b6 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y -CONFIG_SYS_TEXT_BASE=0x84000000 +CONFIG_TEXT_BASE=0x84000000 CONFIG_NR_DRAM_BANKS=3 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld4-ref" diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig index b6b5ca58c27..513fbd18588 100644 --- a/configs/uniphier_v7_defconfig +++ b/configs/uniphier_v7_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y -CONFIG_SYS_TEXT_BASE=0x84000000 +CONFIG_TEXT_BASE=0x84000000 CONFIG_NR_DRAM_BANKS=3 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-pxs2-vodka" diff --git a/configs/uniphier_v8_defconfig b/configs/uniphier_v8_defconfig index eccfb0dbb16..d2025082c66 100644 --- a/configs/uniphier_v8_defconfig +++ b/configs/uniphier_v8_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_ARM_SMCCC=y CONFIG_ARCH_UNIPHIER=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TEXT_BASE=0x00000000 CONFIG_NR_DRAM_BANKS=3 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld20-ref" diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig index 874c873358e..775a4c77cb5 100644 --- a/configs/usb_a9263_dataflash_defconfig +++ b/configs/usb_a9263_dataflash_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x23f00000 +CONFIG_TEXT_BASE=0x23f00000 CONFIG_SYS_MALLOC_LEN=0x26000 CONFIG_TARGET_USB_A9263=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig index 75d487f773b..510e215bff3 100644 --- a/configs/usbarmory_defconfig +++ b/configs/usbarmory_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX5=y -CONFIG_SYS_TEXT_BASE=0x77800000 +CONFIG_TEXT_BASE=0x77800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/variscite_dart6ul_defconfig b/configs/variscite_dart6ul_defconfig index 0f9cc8d82d3..b0f5f8fe2b9 100644 --- a/configs/variscite_dart6ul_defconfig +++ b/configs/variscite_dart6ul_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x86000000 +CONFIG_TEXT_BASE=0x86000000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index 0ac9c4710aa..a754c200469 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x80110000 +CONFIG_TEXT_BASE=0x80110000 CONFIG_SYS_MALLOC_LEN=0x2500000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig index 123002097c5..3c924ec9eae 100644 --- a/configs/ventana_defconfig +++ b/configs/ventana_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_TEGRA=y -CONFIG_SYS_TEXT_BASE=0x00110000 +CONFIG_TEXT_BASE=0x00110000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFFE000 diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig index 168b7a5a4b2..7bb4b88b449 100644 --- a/configs/verdin-imx8mm_defconfig +++ b/configs/verdin-imx8mm_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/verdin-imx8mp_defconfig b/configs/verdin-imx8mp_defconfig index 932baa579ab..01797920c03 100644 --- a/configs/verdin-imx8mp_defconfig +++ b/configs/verdin-imx8mp_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y -CONFIG_SYS_TEXT_BASE=0x40200000 +CONFIG_TEXT_BASE=0x40200000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig index 72090deac87..25e5d39e895 100644 --- a/configs/vexpress_ca9x4_defconfig +++ b/configs/vexpress_ca9x4_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_TARGET_VEXPRESS_CA9X4=y -CONFIG_SYS_TEXT_BASE=0x60800000 +CONFIG_TEXT_BASE=0x60800000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x40000 diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig index 072b7213256..75cc68ed9e1 100644 --- a/configs/vf610twr_defconfig +++ b/configs/vf610twr_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_VF610=y -CONFIG_SYS_TEXT_BASE=0x3f401000 +CONFIG_TEXT_BASE=0x3f401000 CONFIG_SYS_MALLOC_LEN=0x202000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig index af54c4b4e3c..b3ccf494b2e 100644 --- a/configs/vf610twr_nand_defconfig +++ b/configs/vf610twr_nand_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_VF610=y -CONFIG_SYS_TEXT_BASE=0x3f401000 +CONFIG_TEXT_BASE=0x3f401000 CONFIG_SYS_MALLOC_LEN=0x0220000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig index 152b13d429d..22883ea6eb4 100644 --- a/configs/vinco_defconfig +++ b/configs/vinco_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y -CONFIG_SYS_TEXT_BASE=0x20f00000 +CONFIG_TEXT_BASE=0x20f00000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TARGET_VINCO=y CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig index 8445d9439f7..6efd1ab5e97 100644 --- a/configs/vining_2000_defconfig +++ b/configs/vining_2000_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TEXT_BASE=0x87800000 CONFIG_SYS_MALLOC_LEN=0x300000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig index 8c9d68bc675..bd7af0a6e75 100644 --- a/configs/vyasa-rk3288_defconfig +++ b/configs/vyasa-rk3288_defconfig @@ -5,7 +5,7 @@ CONFIG_SYS_ARCH_TIMER=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00100000 +CONFIG_TEXT_BASE=0x00100000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-vyasa" diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index cbf5a5d81c7..70b4cf9ffaa 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y -CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_LEN=0xa00000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/wetek-core2_defconfig b/configs/wetek-core2_defconfig index 8d273f91986..13940dd56f9 100644 --- a/configs/wetek-core2_defconfig +++ b/configs/wetek-core2_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y -CONFIG_SYS_TEXT_BASE=0x01000000 +CONFIG_TEXT_BASE=0x01000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig index 7eb23907ebc..d30ebf162a4 100644 --- a/configs/work_92105_defconfig +++ b/configs/work_92105_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_LPC32XX=y -CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TEXT_BASE=0x80100000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL_LIBCOMMON_SUPPORT=y diff --git a/configs/x530_defconfig b/configs/x530_defconfig index fa4b20345e3..2f8be2fcd77 100644 --- a/configs/x530_defconfig +++ b/configs/x530_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y -CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 diff --git a/configs/xenguest_arm64_defconfig b/configs/xenguest_arm64_defconfig index 40bb5b00293..1632ca36b66 100644 --- a/configs/xenguest_arm64_defconfig +++ b/configs/xenguest_arm64_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_TARGET_XENGUEST_ARM64=y -CONFIG_SYS_TEXT_BASE=0x40080000 +CONFIG_TEXT_BASE=0x40080000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/xilinx_versal_mini_defconfig b/configs/xilinx_versal_mini_defconfig index 7a0557a22e2..3c5ab01aa9e 100644 --- a/configs/xilinx_versal_mini_defconfig +++ b/configs/xilinx_versal_mini_defconfig @@ -3,7 +3,7 @@ CONFIG_SYS_CONFIG_NAME="xilinx_versal_mini_qspi" CONFIG_SYS_ICACHE_OFF=y CONFIG_COUNTER_FREQUENCY=100000000 CONFIG_ARCH_VERSAL=y -CONFIG_SYS_TEXT_BASE=0xFFFC0000 +CONFIG_TEXT_BASE=0xFFFC0000 CONFIG_SYS_MALLOC_LEN=0x2000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/xilinx_versal_mini_emmc0_defconfig b/configs/xilinx_versal_mini_emmc0_defconfig index 4b626d34654..29b868f2752 100644 --- a/configs/xilinx_versal_mini_emmc0_defconfig +++ b/configs/xilinx_versal_mini_emmc0_defconfig @@ -3,7 +3,7 @@ CONFIG_SYS_CONFIG_NAME="xilinx_versal_mini" CONFIG_SYS_ICACHE_OFF=y CONFIG_COUNTER_FREQUENCY=100000000 CONFIG_ARCH_VERSAL=y -CONFIG_SYS_TEXT_BASE=0x10000 +CONFIG_TEXT_BASE=0x10000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/xilinx_versal_mini_emmc1_defconfig b/configs/xilinx_versal_mini_emmc1_defconfig index 6fe2ebf876e..9f8fa4960db 100644 --- a/configs/xilinx_versal_mini_emmc1_defconfig +++ b/configs/xilinx_versal_mini_emmc1_defconfig @@ -3,7 +3,7 @@ CONFIG_SYS_CONFIG_NAME="xilinx_versal_mini" CONFIG_SYS_ICACHE_OFF=y CONFIG_COUNTER_FREQUENCY=100000000 CONFIG_ARCH_VERSAL=y -CONFIG_SYS_TEXT_BASE=0x10000 +CONFIG_TEXT_BASE=0x10000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/xilinx_versal_net_mini_defconfig b/configs/xilinx_versal_net_mini_defconfig index e8fa08e3ef0..e3aa45c83e6 100644 --- a/configs/xilinx_versal_net_mini_defconfig +++ b/configs/xilinx_versal_net_mini_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_ICACHE_OFF=y # CONFIG_ARM64_CRC32 is not set # CONFIG_ARM64_SUPPORT_AARCH32 is not set CONFIG_ARCH_VERSAL_NET=y -CONFIG_SYS_TEXT_BASE=0xBBF10000 +CONFIG_TEXT_BASE=0xBBF10000 CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=3 diff --git a/configs/xilinx_versal_net_virt_defconfig b/configs/xilinx_versal_net_virt_defconfig index 4a9910b7c4f..8a53490ba87 100644 --- a/configs/xilinx_versal_net_virt_defconfig +++ b/configs/xilinx_versal_net_virt_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_SYS_INIT_SP_BSS_OFFSET=1572864 CONFIG_ARCH_VERSAL_NET=y -CONFIG_SYS_TEXT_BASE=0x8000000 +CONFIG_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x100000 CONFIG_DEFAULT_DEVICE_TREE="xilinx-versal-net-virt" CONFIG_SYS_PROMPT="Versal NET> " diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index 6afd06798d0..de74b705504 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -3,7 +3,7 @@ CONFIG_COUNTER_FREQUENCY=100000000 CONFIG_POSITION_INDEPENDENT=y CONFIG_SYS_INIT_SP_BSS_OFFSET=1572864 CONFIG_ARCH_VERSAL=y -CONFIG_SYS_TEXT_BASE=0x8000000 +CONFIG_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x100000 CONFIG_DEFAULT_DEVICE_TREE="xilinx-versal-virt" CONFIG_SYS_PROMPT="Versal> " diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig index c12a1cbbc8a..1b4aa850f70 100644 --- a/configs/xilinx_zynq_virt_defconfig +++ b/configs/xilinx_zynq_virt_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SPL_SYS_DCACHE_OFF=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_ZYNQ=y -CONFIG_SYS_TEXT_BASE=0x4000000 +CONFIG_TEXT_BASE=0x4000000 CONFIG_ENV_OFFSET=0xE00000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706" diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig index 1474434fb8d..245b6a42b93 100644 --- a/configs/xilinx_zynqmp_mini_defconfig +++ b/configs/xilinx_zynqmp_mini_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_qspi" CONFIG_SYS_ICACHE_OFF=y CONFIG_ARCH_ZYNQMP=y -CONFIG_SYS_TEXT_BASE=0xFFFC0000 +CONFIG_TEXT_BASE=0xFFFC0000 CONFIG_SYS_MALLOC_LEN=0x1a00 CONFIG_ENV_SIZE=0x80 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini" diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig index 16f1d490953..adf1dae66ed 100644 --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_emmc" CONFIG_SYS_ICACHE_OFF=y CONFIG_ARCH_ZYNQMP=y -CONFIG_SYS_TEXT_BASE=0x10000 +CONFIG_TEXT_BASE=0x10000 CONFIG_SYS_MALLOC_LEN=0x800000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig index cfaffa147aa..9d799ad0e3d 100644 --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_emmc" CONFIG_SYS_ICACHE_OFF=y CONFIG_ARCH_ZYNQMP=y -CONFIG_SYS_TEXT_BASE=0x10000 +CONFIG_TEXT_BASE=0x10000 CONFIG_SYS_MALLOC_LEN=0x800000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig index e6054fe1774..29040a39e97 100644 --- a/configs/xilinx_zynqmp_mini_nand_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_nand" CONFIG_SYS_ICACHE_OFF=y CONFIG_ARCH_ZYNQMP=y -CONFIG_SYS_TEXT_BASE=0x10000 +CONFIG_TEXT_BASE=0x10000 CONFIG_SYS_MALLOC_LEN=0x800000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x80 diff --git a/configs/xilinx_zynqmp_mini_nand_single_defconfig b/configs/xilinx_zynqmp_mini_nand_single_defconfig index aa35b48c72d..7c17c061d42 100644 --- a/configs/xilinx_zynqmp_mini_nand_single_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_single_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_nand" CONFIG_SYS_ICACHE_OFF=y CONFIG_ARCH_ZYNQMP=y -CONFIG_SYS_TEXT_BASE=0x10000 +CONFIG_TEXT_BASE=0x10000 CONFIG_SYS_MALLOC_LEN=0x800000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x80 diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index d0cc0360d27..513b51998d2 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_qspi" CONFIG_SYS_ICACHE_OFF=y CONFIG_ARCH_ZYNQMP=y -CONFIG_SYS_TEXT_BASE=0xFFFC0000 +CONFIG_TEXT_BASE=0xFFFC0000 CONFIG_SYS_MALLOC_LEN=0x1b00 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x80 diff --git a/configs/xilinx_zynqmp_r5_defconfig b/configs/xilinx_zynqmp_r5_defconfig index 59c58524cce..86674f57ba2 100644 --- a/configs/xilinx_zynqmp_r5_defconfig +++ b/configs/xilinx_zynqmp_r5_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_ZYNQMP_R5=y -CONFIG_SYS_TEXT_BASE=0x10000000 +CONFIG_TEXT_BASE=0x10000000 CONFIG_SYS_MALLOC_LEN=0x1400000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_NR_DRAM_BANKS=1 diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index f203a0fe4a1..ea111272366 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_ZYNQMP=y -CONFIG_SYS_TEXT_BASE=0x8000000 +CONFIG_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_LEN=0x4040000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_DM_GPIO=y diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig index 22f7456d33c..7ca74837aec 100644 --- a/configs/zynq_cse_nand_defconfig +++ b/configs/zynq_cse_nand_defconfig @@ -6,7 +6,7 @@ CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_ZYNQ=y -CONFIG_SYS_TEXT_BASE=0x100000 +CONFIG_TEXT_BASE=0x100000 CONFIG_SYS_MALLOC_LEN=0x8000 CONFIG_ENV_SIZE=0x190 CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nand" diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig index 9f2d33782f5..28e9c459817 100644 --- a/configs/zynq_cse_nor_defconfig +++ b/configs/zynq_cse_nor_defconfig @@ -6,7 +6,7 @@ CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_ZYNQ=y -CONFIG_SYS_TEXT_BASE=0xFFFC0000 +CONFIG_TEXT_BASE=0xFFFC0000 CONFIG_SYS_MALLOC_LEN=0x1000 CONFIG_ENV_SIZE=0x190 CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nor" diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig index a7672247958..215d5ed5ebf 100644 --- a/configs/zynq_cse_qspi_defconfig +++ b/configs/zynq_cse_qspi_defconfig @@ -6,7 +6,7 @@ CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_L2CACHE_OFF=y CONFIG_ARCH_ZYNQ=y -CONFIG_SYS_TEXT_BASE=0xFFFC0000 +CONFIG_TEXT_BASE=0xFFFC0000 CONFIG_SYS_MALLOC_LEN=0x1000 CONFIG_ENV_SIZE=0x190 CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-qspi-single" diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c index 551f8b1dca4..d32747e2242 100644 --- a/disk/disk-uclass.c +++ b/disk/disk-uclass.c @@ -65,7 +65,7 @@ int part_create_block_devices(struct udevice *blk_dev) return 0; } -static ulong blk_part_read(struct udevice *dev, lbaint_t start, +static ulong part_blk_read(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, void *buffer) { struct udevice *parent; @@ -88,7 +88,7 @@ static ulong blk_part_read(struct udevice *dev, lbaint_t start, return ops->read(parent, start, blkcnt, buffer); } -static ulong blk_part_write(struct udevice *dev, lbaint_t start, +static ulong part_blk_write(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, const void *buffer) { struct udevice *parent; @@ -111,7 +111,7 @@ static ulong blk_part_write(struct udevice *dev, lbaint_t start, return ops->write(parent, start, blkcnt, buffer); } -static ulong blk_part_erase(struct udevice *dev, lbaint_t start, +static ulong part_blk_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt) { struct udevice *parent; @@ -135,9 +135,9 @@ static ulong blk_part_erase(struct udevice *dev, lbaint_t start, } static const struct blk_ops blk_part_ops = { - .read = blk_part_read, - .write = blk_part_write, - .erase = blk_part_erase, + .read = part_blk_read, + .write = part_blk_write, + .erase = part_blk_erase, }; U_BOOT_DRIVER(blk_partition) = { @@ -151,34 +151,34 @@ U_BOOT_DRIVER(blk_partition) = { */ static struct blk_desc *dev_get_blk(struct udevice *dev) { - struct blk_desc *block_dev; + struct blk_desc *desc; switch (device_get_uclass_id(dev)) { /* * We won't support UCLASS_BLK with dev_* interfaces. */ case UCLASS_PARTITION: - block_dev = dev_get_uclass_plat(dev_get_parent(dev)); + desc = dev_get_uclass_plat(dev_get_parent(dev)); break; default: - block_dev = NULL; + desc = NULL; break; } - return block_dev; + return desc; } -unsigned long dev_read(struct udevice *dev, lbaint_t start, - lbaint_t blkcnt, void *buffer) +unsigned long disk_blk_read(struct udevice *dev, lbaint_t start, + lbaint_t blkcnt, void *buffer) { - struct blk_desc *block_dev; + struct blk_desc *desc; const struct blk_ops *ops; struct disk_part *part; lbaint_t start_in_disk; ulong blks_read; - block_dev = dev_get_blk(dev); - if (!block_dev) + desc = dev_get_blk(dev); + if (!desc) return -ENOSYS; ops = blk_get_ops(dev); @@ -191,51 +191,51 @@ unsigned long dev_read(struct udevice *dev, lbaint_t start, start_in_disk += part->gpt_part_info.start; } - if (blkcache_read(block_dev->uclass_id, block_dev->devnum, - start_in_disk, blkcnt, block_dev->blksz, buffer)) + if (blkcache_read(desc->uclass_id, desc->devnum, start_in_disk, blkcnt, + desc->blksz, buffer)) return blkcnt; blks_read = ops->read(dev, start, blkcnt, buffer); if (blks_read == blkcnt) - blkcache_fill(block_dev->uclass_id, block_dev->devnum, - start_in_disk, blkcnt, block_dev->blksz, buffer); + blkcache_fill(desc->uclass_id, desc->devnum, start_in_disk, + blkcnt, desc->blksz, buffer); return blks_read; } -unsigned long dev_write(struct udevice *dev, lbaint_t start, - lbaint_t blkcnt, const void *buffer) +unsigned long disk_blk_write(struct udevice *dev, lbaint_t start, + lbaint_t blkcnt, const void *buffer) { - struct blk_desc *block_dev; + struct blk_desc *desc; const struct blk_ops *ops; - block_dev = dev_get_blk(dev); - if (!block_dev) + desc = dev_get_blk(dev); + if (!desc) return -ENOSYS; ops = blk_get_ops(dev); if (!ops->write) return -ENOSYS; - blkcache_invalidate(block_dev->uclass_id, block_dev->devnum); + blkcache_invalidate(desc->uclass_id, desc->devnum); return ops->write(dev, start, blkcnt, buffer); } -unsigned long dev_erase(struct udevice *dev, lbaint_t start, - lbaint_t blkcnt) +unsigned long disk_blk_erase(struct udevice *dev, lbaint_t start, + lbaint_t blkcnt) { - struct blk_desc *block_dev; + struct blk_desc *desc; const struct blk_ops *ops; - block_dev = dev_get_blk(dev); - if (!block_dev) + desc = dev_get_blk(dev); + if (!desc) return -ENOSYS; ops = blk_get_ops(dev); if (!ops->erase) return -ENOSYS; - blkcache_invalidate(block_dev->uclass_id, block_dev->devnum); + blkcache_invalidate(desc->uclass_id, desc->devnum); return ops->erase(dev, start, blkcnt); } diff --git a/disk/part_efi.c b/disk/part_efi.c index 26738a57d5d..18f7e584050 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -94,10 +94,10 @@ static int validate_gpt_header(gpt_header *gpt_h, lbaint_t lba, /* Check the GPT header signature */ if (le64_to_cpu(gpt_h->signature) != GPT_HEADER_SIGNATURE_UBOOT) { - printf("%s signature is wrong: 0x%llX != 0x%llX\n", - "GUID Partition Table Header", - le64_to_cpu(gpt_h->signature), - GPT_HEADER_SIGNATURE_UBOOT); + log_debug("%s signature is wrong: %#llX != %#llX\n", + "GUID Partition Table Header", + le64_to_cpu(gpt_h->signature), + GPT_HEADER_SIGNATURE_UBOOT); return -1; } @@ -111,9 +111,9 @@ static int validate_gpt_header(gpt_header *gpt_h, lbaint_t lba, memcpy(&gpt_h->header_crc32, &crc32_backup, sizeof(crc32_backup)); if (calc_crc32 != le32_to_cpu(crc32_backup)) { - printf("%s CRC is wrong: 0x%x != 0x%x\n", - "GUID Partition Table Header", - le32_to_cpu(crc32_backup), calc_crc32); + log_debug("%s: CRC is wrong: %#x != %#x\n", + "GUID Partition Table Header", + le32_to_cpu(crc32_backup), calc_crc32); return -1; } @@ -121,9 +121,8 @@ static int validate_gpt_header(gpt_header *gpt_h, lbaint_t lba, * Check that the my_lba entry points to the LBA that contains the GPT */ if (le64_to_cpu(gpt_h->my_lba) != lba) { - printf("GPT: my_lba incorrect: %llX != " LBAF "\n", - le64_to_cpu(gpt_h->my_lba), - lba); + log_debug("GPT: my_lba incorrect: %llX != " LBAF "\n", + le64_to_cpu(gpt_h->my_lba), lba); return -1; } @@ -132,13 +131,13 @@ static int validate_gpt_header(gpt_header *gpt_h, lbaint_t lba, * within the disk. */ if (le64_to_cpu(gpt_h->first_usable_lba) > lastlba) { - printf("GPT: first_usable_lba incorrect: %llX > " LBAF "\n", - le64_to_cpu(gpt_h->first_usable_lba), lastlba); + log_debug("GPT: first_usable_lba incorrect: %llX > " LBAF "\n", + le64_to_cpu(gpt_h->first_usable_lba), lastlba); return -1; } if (le64_to_cpu(gpt_h->last_usable_lba) > lastlba) { - printf("GPT: last_usable_lba incorrect: %llX > " LBAF "\n", - le64_to_cpu(gpt_h->last_usable_lba), lastlba); + log_debug("GPT: last_usable_lba incorrect: %llX > " LBAF "\n", + le64_to_cpu(gpt_h->last_usable_lba), lastlba); return -1; } @@ -159,10 +158,10 @@ static int validate_gpt_entries(gpt_header *gpt_h, gpt_entry *gpt_e) le32_to_cpu(gpt_h->sizeof_partition_entry)); if (calc_crc32 != le32_to_cpu(gpt_h->partition_entry_array_crc32)) { - printf("%s: 0x%x != 0x%x\n", - "GUID Partition Table Entry Array CRC is wrong", - le32_to_cpu(gpt_h->partition_entry_array_crc32), - calc_crc32); + log_debug("%s: %#x != %#x\n", + "GUID Partition Table Entry Array CRC is wrong", + le32_to_cpu(gpt_h->partition_entry_array_crc32), + calc_crc32); return -1; } @@ -274,7 +273,7 @@ int part_get_info_efi(struct blk_desc *dev_desc, int part, if (part > le32_to_cpu(gpt_head->num_partition_entries) || !is_pte_valid(&gpt_pte[part - 1])) { - log_debug("*** ERROR: Invalid partition number %d ***\n", part); + log_debug("Invalid partition number %d\n", part); free(gpt_pte); return -EPERM; } @@ -330,14 +329,15 @@ static int set_protective_mbr(struct blk_desc *dev_desc) /* Setup the Protective MBR */ ALLOC_CACHE_ALIGN_BUFFER_PAD(legacy_mbr, p_mbr, 1, dev_desc->blksz); if (p_mbr == NULL) { - printf("%s: calloc failed!\n", __func__); - return -1; + log_debug("calloc failed!\n"); + return -ENOMEM; } /* Read MBR to backup boot code if it exists */ if (blk_dread(dev_desc, 0, 1, p_mbr) != 1) { - pr_err("** Can't read from device %d **\n", dev_desc->devnum); - return -1; + log_debug("** Can't read from device %d **\n", + dev_desc->devnum); + return -EIO; } /* Clear all data in MBR except of backed up boot code */ @@ -352,9 +352,8 @@ static int set_protective_mbr(struct blk_desc *dev_desc) /* Write MBR sector to the MMC device */ if (blk_dwrite(dev_desc, 0, 1, p_mbr) != 1) { - printf("** Can't write to device %d **\n", - dev_desc->devnum); - return -1; + log_debug("** Can't write to device %d **\n", dev_desc->devnum); + return -EIO; } return 0; @@ -404,8 +403,8 @@ int write_gpt_table(struct blk_desc *dev_desc, return 0; err: - printf("** Can't write to device %d **\n", dev_desc->devnum); - return -1; + log_debug("** Can't write to device %d **\n", dev_desc->devnum); + return -EIO; } int gpt_fill_pte(struct blk_desc *dev_desc, @@ -451,15 +450,15 @@ int gpt_fill_pte(struct blk_desc *dev_desc, */ if (((start < hdr_end && hdr_start < (start + size)) || (start < pte_end && pte_start < (start + size)))) { - printf("Partition overlap\n"); - return -1; + log_debug("Partition overlap\n"); + return -ENOSPC; } gpt_e[i].starting_lba = cpu_to_le64(start); if (offset > (last_usable_lba + 1)) { - printf("Partitions layout exceds disk size\n"); - return -1; + log_debug("Partitions layout exceeds disk size\n"); + return -E2BIG; } /* partition ending lba */ if ((i == parts - 1) && (size == 0)) @@ -474,9 +473,9 @@ int gpt_fill_pte(struct blk_desc *dev_desc, if (strlen(str_type_guid)) { if (uuid_str_to_bin(str_type_guid, bin_type_guid, UUID_STR_FORMAT_GUID)) { - printf("Partition no. %d: invalid type guid: %s\n", - i, str_type_guid); - return -1; + log_debug("Partition no. %d: invalid type guid: %s\n", + i, str_type_guid); + return -EINVAL; } } else { /* default partition type GUID */ @@ -494,9 +493,9 @@ int gpt_fill_pte(struct blk_desc *dev_desc, bin_uuid = gpt_e[i].unique_partition_guid.b; if (uuid_str_to_bin(str_uuid, bin_uuid, UUID_STR_FORMAT_GUID)) { - printf("Partition no. %d: invalid guid: %s\n", - i, str_uuid); - return -1; + log_debug("Partition no. %d: invalid guid: %s\n", + i, str_uuid); + return -EINVAL; } #endif @@ -608,8 +607,8 @@ int gpt_restore(struct blk_desc *dev_desc, char *str_disk_guid, size = PAD_TO_BLOCKSIZE(sizeof(gpt_header), dev_desc); gpt_h = malloc_cache_aligned(size); if (gpt_h == NULL) { - printf("%s: calloc failed!\n", __func__); - return -1; + log_debug("calloc failed!\n"); + return -ENOMEM; } memset(gpt_h, 0, size); @@ -617,9 +616,9 @@ int gpt_restore(struct blk_desc *dev_desc, char *str_disk_guid, dev_desc); gpt_e = malloc_cache_aligned(size); if (gpt_e == NULL) { - printf("%s: calloc failed!\n", __func__); + log_debug("calloc failed!\n"); free(gpt_h); - return -1; + return -ENOMEM; } memset(gpt_e, 0, size); @@ -675,8 +674,7 @@ int gpt_verify_headers(struct blk_desc *dev_desc, gpt_header *gpt_head, if (is_gpt_valid(dev_desc, GPT_PRIMARY_PARTITION_TABLE_LBA, gpt_head, gpt_pte) != 1) { - printf("%s: *** ERROR: Invalid GPT ***\n", - __func__); + log_debug("Invalid GPT\n"); return -1; } @@ -687,15 +685,13 @@ int gpt_verify_headers(struct blk_desc *dev_desc, gpt_header *gpt_head, * Check that the alternate_lba entry points to the last LBA */ if (le64_to_cpu(gpt_head->alternate_lba) != (dev_desc->lba - 1)) { - printf("%s: *** ERROR: Misplaced Backup GPT ***\n", - __func__); + log_debug("Misplaced Backup GPT\n"); return -1; } if (is_gpt_valid(dev_desc, (dev_desc->lba - 1), gpt_head, gpt_pte) != 1) { - printf("%s: *** ERROR: Invalid Backup GPT ***\n", - __func__); + log_debug("Invalid Backup GPT\n"); return -1; } @@ -913,8 +909,8 @@ int write_mbr_and_gpt_partitions(struct blk_desc *dev_desc, void *buf) lba = 0; /* MBR is always at 0 */ cnt = 1; /* MBR (1 block) */ if (blk_dwrite(dev_desc, lba, cnt, buf) != cnt) { - printf("%s: failed writing '%s' (%d blks at 0x" LBAF ")\n", - __func__, "MBR", cnt, lba); + log_debug("failed writing '%s' (%d blks at 0x" LBAF ")\n", + "MBR", cnt, lba); return 1; } @@ -922,16 +918,16 @@ int write_mbr_and_gpt_partitions(struct blk_desc *dev_desc, void *buf) lba = GPT_PRIMARY_PARTITION_TABLE_LBA; cnt = 1; /* GPT Header (1 block) */ if (blk_dwrite(dev_desc, lba, cnt, gpt_h) != cnt) { - printf("%s: failed writing '%s' (%d blks at 0x" LBAF ")\n", - __func__, "Primary GPT Header", cnt, lba); + log_debug("failed writing '%s' (%d blks at 0x" LBAF ")\n", + "Primary GPT Header", cnt, lba); return 1; } lba = le64_to_cpu(gpt_h->partition_entry_lba); cnt = gpt_e_blk_cnt; if (blk_dwrite(dev_desc, lba, cnt, gpt_e) != cnt) { - printf("%s: failed writing '%s' (%d blks at 0x" LBAF ")\n", - __func__, "Primary GPT Entries", cnt, lba); + log_debug("failed writing '%s' (%d blks at 0x" LBAF ")\n", + "Primary GPT Entries", cnt, lba); return 1; } @@ -941,16 +937,16 @@ int write_mbr_and_gpt_partitions(struct blk_desc *dev_desc, void *buf) lba = le64_to_cpu(gpt_h->partition_entry_lba); cnt = gpt_e_blk_cnt; if (blk_dwrite(dev_desc, lba, cnt, gpt_e) != cnt) { - printf("%s: failed writing '%s' (%d blks at 0x" LBAF ")\n", - __func__, "Backup GPT Entries", cnt, lba); + log_debug("failed writing '%s' (%d blks at 0x" LBAF ")\n", + "Backup GPT Entries", cnt, lba); return 1; } lba = le64_to_cpu(gpt_h->my_lba); cnt = 1; /* GPT Header (1 block) */ if (blk_dwrite(dev_desc, lba, cnt, gpt_h) != cnt) { - printf("%s: failed writing '%s' (%d blks at 0x" LBAF ")\n", - __func__, "Backup GPT Header", cnt, lba); + log_debug("failed writing '%s' (%d blks at 0x" LBAF ")\n", + "Backup GPT Header", cnt, lba); return 1; } @@ -1017,7 +1013,7 @@ static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba, { /* Confirm valid arguments prior to allocation. */ if (!dev_desc || !pgpt_head) { - printf("%s: Invalid Argument(s)\n", __func__); + log_debug("Invalid Argument(s)\n"); return 0; } @@ -1025,19 +1021,19 @@ static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba, /* Read MBR Header from device */ if (blk_dread(dev_desc, 0, 1, (ulong *)mbr) != 1) { - printf("*** ERROR: Can't read MBR header ***\n"); + log_debug("Can't read MBR header\n"); return 0; } /* Read GPT Header from device */ if (blk_dread(dev_desc, (lbaint_t)lba, 1, pgpt_head) != 1) { - printf("*** ERROR: Can't read GPT header ***\n"); + log_debug("Can't read GPT header\n"); return 0; } /* Invalid but nothing to yell about. */ if (le64_to_cpu(pgpt_head->signature) == GPT_HEADER_CHROMEOS_IGNORE) { - debug("ChromeOS 'IGNOREME' GPT header found and ignored\n"); + log_debug("ChromeOS 'IGNOREME' GPT header found and ignored\n"); return 2; } @@ -1089,17 +1085,15 @@ static int find_valid_gpt(struct blk_desc *dev_desc, gpt_header *gpt_head, if (r != 1) { if (r != 2) - printf("%s: *** ERROR: Invalid GPT ***\n", __func__); + log_debug("Invalid GPT\n"); if (is_gpt_valid(dev_desc, (dev_desc->lba - 1), gpt_head, pgpt_pte) != 1) { - printf("%s: *** ERROR: Invalid Backup GPT ***\n", - __func__); + log_debug("Invalid Backup GPT\n"); return 0; } if (r != 2) - printf("%s: *** Using Backup GPT ***\n", - __func__); + log_debug(" Using Backup GPT\n"); } return 1; } @@ -1121,17 +1115,17 @@ static gpt_entry *alloc_read_gpt_entries(struct blk_desc *dev_desc, gpt_entry *pte = NULL; if (!dev_desc || !pgpt_head) { - printf("%s: Invalid Argument(s)\n", __func__); + log_debug("Invalid Argument(s)\n"); return NULL; } count = le32_to_cpu(pgpt_head->num_partition_entries) * le32_to_cpu(pgpt_head->sizeof_partition_entry); - debug("%s: count = %u * %u = %lu\n", __func__, - (u32) le32_to_cpu(pgpt_head->num_partition_entries), - (u32) le32_to_cpu(pgpt_head->sizeof_partition_entry), - (ulong)count); + log_debug("count = %u * %u = %lu\n", + (u32)le32_to_cpu(pgpt_head->num_partition_entries), + (u32)le32_to_cpu(pgpt_head->sizeof_partition_entry), + (ulong)count); /* Allocate memory for PTE, remember to FREE */ if (count != 0) { @@ -1140,8 +1134,8 @@ static gpt_entry *alloc_read_gpt_entries(struct blk_desc *dev_desc, } if (count == 0 || pte == NULL) { - printf("%s: ERROR: Can't allocate %#lX bytes for GPT Entries\n", - __func__, (ulong)count); + log_debug("ERROR: Can't allocate %#lX bytes for GPT Entries\n", + (ulong)count); return NULL; } @@ -1149,7 +1143,7 @@ static gpt_entry *alloc_read_gpt_entries(struct blk_desc *dev_desc, blk = le64_to_cpu(pgpt_head->partition_entry_lba); blk_cnt = BLOCK_CNT(count, dev_desc); if (blk_dread(dev_desc, blk, (lbaint_t)blk_cnt, pte) != blk_cnt) { - printf("*** ERROR: Can't read GPT Entries ***\n"); + log_debug("Can't read GPT Entries\n"); free(pte); return NULL; } @@ -1167,7 +1161,7 @@ static int is_pte_valid(gpt_entry * pte) efi_guid_t unused_guid; if (!pte) { - printf("%s: Invalid Argument(s)\n", __func__); + log_debug("Invalid Argument(s)\n"); return 0; } @@ -1179,8 +1173,8 @@ static int is_pte_valid(gpt_entry * pte) if (memcmp(pte->partition_type_guid.b, unused_guid.b, sizeof(unused_guid.b)) == 0) { - debug("%s: Found an unused PTE GUID at 0x%08X\n", __func__, - (unsigned int)(uintptr_t)pte); + log_debug("Found an unused PTE GUID at 0x%08X\n", + (unsigned int)(uintptr_t)pte); return 0; } else { diff --git a/doc/README.arm-relocation b/doc/README.arm-relocation index bc6644911b9..6bb4e178474 100644 --- a/doc/README.arm-relocation +++ b/doc/README.arm-relocation @@ -41,7 +41,7 @@ Boards which are not fixed to support relocation will be REMOVED! ----------------------------------------------------------------------------- For boards which boot from spl, it is possible to save one copy -if CONFIG_SYS_TEXT_BASE == relocation address! This prevents that uboot code +if CONFIG_TEXT_BASE == relocation address! This prevents that uboot code is copied again in relocate_code(). example for the tx25 board booting from NAND Flash: @@ -58,7 +58,7 @@ e) there it copy u-boot to CONFIG_SYS_NAND_U_BOOT_DST and f) u-boot code steps through board_init_f() and calculates the relocation address and copy itself to it -If CONFIG_SYS_TEXT_BASE == relocation address, the copying of u-boot +If CONFIG_TEXT_BASE == relocation address, the copying of u-boot in f) could be saved. ----------------------------------------------------------------------------- @@ -68,10 +68,10 @@ TODO - fill in struct bd_info infos (check) - adapt all boards -- maybe adapt CONFIG_SYS_TEXT_BASE (this must be checked from board maintainers) +- maybe adapt CONFIG_TEXT_BASE (this must be checked from board maintainers) This *must* be done for boards, which boot from NOR flash - on other boards if CONFIG_SYS_TEXT_BASE = relocation baseaddr, this saves + on other boards if CONFIG_TEXT_BASE = relocation baseaddr, this saves one copying from u-boot code. - new function dram_init_banksize() is actual board specific. Maybe @@ -91,7 +91,7 @@ Relocation with SPL (example for the tx25 booting from NAND Flash): - This u-boot does no RAM init, nor CPU register setup. Just look where it has to copy and relocate itself to this address. If - relocate address = CONFIG_SYS_TEXT_BASE (not the same, as the + relocate address = CONFIG_TEXT_BASE (not the same, as the CONFIG_SPL_TEXT_BASE from the spl code), then there is no need to copy, just go on with bss clear and jump to board_init_r. diff --git a/doc/SPL/README.omap3 b/doc/SPL/README.omap3 index c77ca4300af..c0f4bab29b3 100644 --- a/doc/SPL/README.omap3 +++ b/doc/SPL/README.omap3 @@ -36,17 +36,17 @@ Option 1 (SPL only): 0x40200800 - 0x4020BBFF: Area for SPL text, data and rodata 0x4020E000 - 0x4020FFFC: Area for the SPL stack. 0x80000000 - 0x8007FFFF: Area for the SPL BSS. -0x80100000: CONFIG_SYS_TEXT_BASE of U-Boot +0x80100000: CONFIG_TEXT_BASE of U-Boot 0x80208000 - 0x80307FFF: malloc() pool available to SPL. Option 2 (SPL or X-Loader): 0x40200800 - 0x4020BBFF: Area for SPL text, data and rodata 0x4020E000 - 0x4020FFFC: Area for the SPL stack. -0x80008000: CONFIG_SYS_TEXT_BASE of U-Boot +0x80008000: CONFIG_TEXT_BASE of U-Boot 0x87000000 - 0x8707FFFF: Area for the SPL BSS. 0x87080000 - 0x870FFFFF: malloc() pool available to SPL. For the areas that reside within DDR1 they must not be used prior to s_init() -completing. Note that CONFIG_SYS_TEXT_BASE must be clear of the areas that SPL +completing. Note that CONFIG_TEXT_BASE must be clear of the areas that SPL uses while running. This is why we have two versions of the memory map that only vary in where the BSS and malloc pool reside. diff --git a/doc/arch/m68k.rst b/doc/arch/m68k.rst index 87a51e5b7db..15806dfaee1 100644 --- a/doc/arch/m68k.rst +++ b/doc/arch/m68k.rst @@ -97,7 +97,7 @@ CONFIG_MONITOR_IS_IN_RAM must be defined. If it is defined the initial vector table and basic processor initialization will not be compiled in. The start address of U-Boot must be adjusted in the boards config header file (CONFIG_SYS_MONITOR_BASE) and Makefile -(CONFIG_SYS_TEXT_BASE) to the load address. +(CONFIG_TEXT_BASE) to the load address. ColdFire CPU specific options/settings ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/doc/arch/sandbox.rst b/doc/arch/sandbox.rst index 068d4a3be40..ed66f70f619 100644 --- a/doc/arch/sandbox.rst +++ b/doc/arch/sandbox.rst @@ -619,5 +619,5 @@ Addr Config Usage f0000 CONFIG_PRE_CON_BUF_ADDR Pre-console buffer 100000 CONFIG_TRACE_EARLY_ADDR Early trace buffer (if enabled). Also used as the SPL load buffer in spl_test_load(). - 200000 CONFIG_SYS_TEXT_BASE Load buffer for U-Boot (sandbox_spl only) + 200000 CONFIG_TEXT_BASE Load buffer for U-Boot (sandbox_spl only) ======= ======================== =============================== diff --git a/doc/board/coreboot/coreboot.rst b/doc/board/coreboot/coreboot.rst index 3792f9e1c8d..4a5f101cad2 100644 --- a/doc/board/coreboot/coreboot.rst +++ b/doc/board/coreboot/coreboot.rst @@ -26,7 +26,7 @@ this capability yet. The command is as follows:: $ ./build/util/cbfstool/cbfstool build/coreboot.rom add-flat-binary \ -f u-boot-dtb.bin -n fallback/payload -c lzma -l 0x1110000 -e 0x1110000 -Make sure 0x1110000 matches CONFIG_SYS_TEXT_BASE, which is the symbol address +Make sure 0x1110000 matches CONFIG_TEXT_BASE, which is the symbol address of _x86boot_start (in arch/x86/cpu/start.S). If you want to use ELF as the coreboot payload, change U-Boot configuration to @@ -64,7 +64,7 @@ Memory map 10000000 Memory reserved by coreboot for mapping PCI devices (typical size 2151000, includes framebuffer) 1920000 CONFIG_SYS_CAR_ADDR, fake Cache-as-RAM memory, used during startup - 1110000 CONFIG_SYS_TEXT_BASE (start address of U-Boot code, before reloc) + 1110000 CONFIG_TEXT_BASE (start address of U-Boot code, before reloc) 110000 CONFIG_BLOBLIST_ADDR (before being relocated) 100000 CONFIG_PRE_CON_BUF_ADDR f0000 ACPI tables set up by U-Boot diff --git a/doc/board/google/chromebook_coral.rst b/doc/board/google/chromebook_coral.rst index 4b585678dcf..8edbf0429cd 100644 --- a/doc/board/google/chromebook_coral.rst +++ b/doc/board/google/chromebook_coral.rst @@ -250,7 +250,7 @@ boots. Be warned that SPL can take 30 seconds without this cache! This is a known issue with Intel SoCs with modern DRAM and apparently cannot be improved. The MRC caches are used to work around this. -Once SPL is finished it loads U-Boot into SDRAM at CONFIG_SYS_TEXT_BASE, which +Once SPL is finished it loads U-Boot into SDRAM at CONFIG_TEXT_BASE, which is normally 1110000. Note that CAR is still active. @@ -355,7 +355,7 @@ Partial memory map f0000 CONFIG_ROM_TABLE_ADDR 120000 BSS (defined in u-boot-spl.lds) 200000 FSP-S (which is run after U-Boot is relocated) - 1110000 CONFIG_SYS_TEXT_BASE + 1110000 CONFIG_TEXT_BASE Speeding up SPL for development diff --git a/doc/board/google/chromebook_samus.rst b/doc/board/google/chromebook_samus.rst index eab1128e4f9..822ba575e2f 100644 --- a/doc/board/google/chromebook_samus.rst +++ b/doc/board/google/chromebook_samus.rst @@ -91,7 +91,7 @@ Flash map for samus / broadwell: :fffd8000: TPL_TEXT_BASE :fffa0000: X86_MRC_ADDR :fff90000: VGA_BIOS_ADDR - :ffed0000: SYS_TEXT_BASE + :ffed0000: TEXT_BASE :ffea0000: X86_REFCODE_ADDR :ffe70000: SPL_TEXT_BASE :ffbf8000: CONFIG_ENV_OFFSET (environemnt offset) diff --git a/doc/board/intel/minnowmax.rst b/doc/board/intel/minnowmax.rst index 028121735ae..1ba25b50d21 100644 --- a/doc/board/intel/minnowmax.rst +++ b/doc/board/intel/minnowmax.rst @@ -56,7 +56,7 @@ Offset Description Controlling config 500000 <spare> 6ef000 Environment CONFIG_ENV_OFFSET 6f0000 MRC cache CONFIG_ENABLE_MRC_CACHE -700000 u-boot-dtb.bin CONFIG_SYS_TEXT_BASE +700000 u-boot-dtb.bin CONFIG_TEXT_BASE 7b0000 vga.bin CONFIG_VGA_BIOS_ADDR 7c0000 fsp.bin CONFIG_FSP_ADDR 7f8000 <spare> (depends on size of fsp.bin) diff --git a/doc/board/intel/slimbootloader.rst b/doc/board/intel/slimbootloader.rst index 18f1cc0569c..87d71a55bdc 100644 --- a/doc/board/intel/slimbootloader.rst +++ b/doc/board/intel/slimbootloader.rst @@ -69,7 +69,7 @@ The PayloadId can be any 4 Bytes value. +GEN_CFG_DATA.PayloadId | 'U-BT' 2. Update payload text base. PAYLOAD_EXE_BASE must be the same as U-Boot - CONFIG_SYS_TEXT_BASE in board/intel/slimbootloader/Kconfig. + CONFIG_TEXT_BASE in board/intel/slimbootloader/Kconfig. PAYLOAD_LOAD_HIGH must be 0:: $ vi Platform/QemuBoardPkg/BoardConfig.py @@ -122,7 +122,7 @@ Also, the PayloadId needs to be set for APL board. 2. Update payload text base. -* PAYLOAD_EXE_BASE must be the same as U-Boot CONFIG_SYS_TEXT_BASE +* PAYLOAD_EXE_BASE must be the same as U-Boot CONFIG_TEXT_BASE in board/intel/slimbootloader/Kconfig. * PAYLOAD_LOAD_HIGH must be 0:: diff --git a/doc/board/nxp/mx6ul_14x14_evk.rst b/doc/board/nxp/mx6ul_14x14_evk.rst index 8298bf8e1e7..3e57ba1ee81 100644 --- a/doc/board/nxp/mx6ul_14x14_evk.rst +++ b/doc/board/nxp/mx6ul_14x14_evk.rst @@ -74,9 +74,9 @@ The following script should be created to boot SPL + u-boot-dtb.img binaries: SDPU: jump -addr 0x877fffc0 SDPU: done -Please note that the address above is calculated based on SYS_TEXT_BASE address: +Please note that the address above is calculated based on TEXT_BASE address: -0x877fffc0 = 0x87800000 (SYS_TEXT_BASE) - 0x40 (U-Boot proper Header size) +0x877fffc0 = 0x87800000 (TEXT_BASE) - 0x40 (U-Boot proper Header size) Power on the target and run the following command from U-Boot root directory: diff --git a/doc/board/sipeed/maix.rst b/doc/board/sipeed/maix.rst index 903f8831d70..4568bb3e4b7 100644 --- a/doc/board/sipeed/maix.rst +++ b/doc/board/sipeed/maix.rst @@ -93,7 +93,7 @@ The OpenSBI source can be downloaded via: As OpenSBI will be loaded at 0x80000000 we have to adjust the U-Boot text base. Furthermore we have to enable building U-Boot for S-mode:: - CONFIG_SYS_TEXT_BASE=0x80020000 + CONFIG_TEXT_BASE=0x80020000 CONFIG_RISCV_SMODE=y Both settings are contained in sipeed_maix_smode_defconfig so we can build @@ -115,7 +115,7 @@ To build OpenSBI with U-Boot as a payload: FW_PAYLOAD_OFFSET=0x20000 \ FW_PAYLOAD_PATH=<path to U-Boot>/u-boot-dtb.bin -The value of FW_PAYLOAD_OFFSET must match CONFIG_SYS_TEXT_BASE - 0x80000000. +The value of FW_PAYLOAD_OFFSET must match CONFIG_TEXT_BASE - 0x80000000. The file to flash is build/platform/kendryte/k210/firmware/fw_payload.bin. diff --git a/doc/chromium/chainload.rst b/doc/chromium/chainload.rst index 7b6bb10d36d..b00ee94eaa4 100644 --- a/doc/chromium/chainload.rst +++ b/doc/chromium/chainload.rst @@ -140,7 +140,7 @@ bytes of U-Boot:: The 'data' property of the FIT is set up to start at offset 0x100 bytes into -the file. The change to CONFIG_SYS_TEXT_BASE is also an offset of 0x100 bytes +the file. The change to CONFIG_TEXT_BASE is also an offset of 0x100 bytes from the load address. If this changes, you either need to modify U-Boot to be fully relocatable, or expect it to hang. @@ -156,11 +156,11 @@ Open include/configs/rk3288_common.h Change:: - #define CONFIG_SYS_TEXT_BASE 0x00100000 + #define CONFIG_TEXT_BASE 0x00100000 to:: - #define CONFIG_SYS_TEXT_BASE 0x02000100 + #define CONFIG_TEXT_BASE 0x02000100 @@ -254,4 +254,4 @@ it uses a fixed address to load the FIT and does not support load/exec addresses. This means that U-Boot must be able to boot from whatever address Depthcharge happens to use (it is the CONFIG_KERNEL_START setting in Depthcharge). In practice this means that the data in the kernel@1 FIT node -(see above) must start at the same address as U-Boot's CONFIG_SYS_TEXT_BASE. +(see above) must start at the same address as U-Boot's CONFIG_TEXT_BASE. diff --git a/doc/develop/moveconfig.rst b/doc/develop/moveconfig.rst index bfb7aff3582..ad8596e6c61 100644 --- a/doc/develop/moveconfig.rst +++ b/doc/develop/moveconfig.rst @@ -20,10 +20,10 @@ First, you must edit the Kconfig to add the menu entries for the configs you are moving. Then run this tool giving CONFIG names you want to move. -For example, if you want to move CONFIG_CMD_USB and CONFIG_SYS_TEXT_BASE, +For example, if you want to move CONFIG_CMD_USB and CONFIG_TEXT_BASE, simply type as follows:: - $ tools/moveconfig.py CONFIG_CMD_USB CONFIG_SYS_TEXT_BASE + $ tools/moveconfig.py CONFIG_CMD_USB CONFIG_TEXT_BASE The tool walks through all the defconfig files and move the given CONFIGs. diff --git a/doc/develop/tests_writing.rst b/doc/develop/tests_writing.rst index 1ddf7a353a7..bb1145da268 100644 --- a/doc/develop/tests_writing.rst +++ b/doc/develop/tests_writing.rst @@ -74,6 +74,33 @@ NOT rely on running with sandbox, but instead should function correctly on any board supported by U-Boot. +Mixing Python and C +------------------- + +The best of both worlds is sometimes to have a Python test set things up and +perform some operations, with a 'checker' C unit test doing the checks +afterwards. This can be achieved with these steps: + +- Add the `UT_TESTF_MANUAL` flag to the checker test so that the `ut` command + does not run it by default +- Add a `_norun` suffix to the name so that pytest knows to skip it too + +In your Python test use the `-f` flag to the `ut` command to force the checker +test to run it, e.g.:: + + # Do the Python part + host load ... + bootm ... + + # Run the checker to make sure that everything worked + ut -f bootstd vbe_test_fixup_norun + +Note that apart from the `UT_TESTF_MANUAL` flag, the code in a 'manual' C test +is just like any other C test. It still uses ut_assert...() and other such +constructs, in this case to check that the expected things happened in the +Python test. + + How slow are Python tests? -------------------------- diff --git a/doc/imx/habv4/csf_examples/mx8m/csf.sh b/doc/imx/habv4/csf_examples/mx8m/csf.sh index 7d267a7218d..7a9a05e6339 100644 --- a/doc/imx/habv4/csf_examples/mx8m/csf.sh +++ b/doc/imx/habv4/csf_examples/mx8m/csf.sh @@ -38,7 +38,7 @@ dd if=csf_spl.bin of=flash.bin bs=1 seek=${spl_dd_offset} conv=notrunc # 3) Sign u-boot.itb # fitImage tree -fit_block_base=$(printf "0x%x" $(( $(sed -n "/CONFIG_SYS_TEXT_BASE=/ s@.*=@@p" .config) - $(sed -n "/CONFIG_FIT_EXTERNAL_OFFSET=/ s@.*=@@p" .config) - 0x200 - 0x40)) ) +fit_block_base=$(printf "0x%x" $(( $(sed -n "/CONFIG_TEXT_BASE=/ s@.*=@@p" .config) - $(sed -n "/CONFIG_FIT_EXTERNAL_OFFSET=/ s@.*=@@p" .config) - 0x200 - 0x40)) ) fit_block_offset=$(printf "0x%s" $(fdtget -t x u-boot.dtb /binman/imx-boot/uboot offset)) fit_block_size=$(printf "0x%x" $(( ( ($(fdtdump u-boot.itb 2>/dev/null | sed -n "/^...totalsize:/ s@.*\(0x[0-9a-f]\+\).*@\1@p") + 0x1000 - 0x1 ) & ~(0x1000 - 0x1)) + 0x20 )) ) sed -i "/Blocks = / s@.*@ Blocks = $fit_block_base $fit_block_offset $fit_block_size \"flash.bin\", \\\\@" csf_fit.tmp diff --git a/doc/imx/habv4/guides/mx8m_spl_secure_boot.txt b/doc/imx/habv4/guides/mx8m_spl_secure_boot.txt index 747f7cd260f..3e3d38440f9 100644 --- a/doc/imx/habv4/guides/mx8m_spl_secure_boot.txt +++ b/doc/imx/habv4/guides/mx8m_spl_secure_boot.txt @@ -79,7 +79,7 @@ code within it: The diagram below illustrate a signed U-Boot binary, DT blob and external ATF BL31 blob combined to form fitImage part of flash.bin container layout. -The *load_address is derived from CONFIG_SYS_TEXT_BASE such that the U-Boot +The *load_address is derived from CONFIG_TEXT_BASE such that the U-Boot binary *start is placed exactly at CONFIG_SPL_TEXT_BASE in DRAM, however the SPL moves the fitImage tree further to location: *load_address = CONFIG_SPL_TEXT_BASE - CONFIG_FIT_EXTERNAL_OFFSET (=12kiB) - @@ -203,7 +203,7 @@ dd if=csf_spl.bin of=flash.bin bs=1 seek=${spl_dd_offset} conv=notrunc CSF "Blocks" line for csf_fit.txt can be generated as follows: ``` # fitImage tree -fit_block_base=$(printf "0x%x" $(( $(sed -n "/CONFIG_SYS_TEXT_BASE=/ s@.*=@@p" .config) - $(sed -n "/CONFIG_FIT_EXTERNAL_OFFSET=/ s@.*=@@p" .config) - 0x200 - 0x40)) ) +fit_block_base=$(printf "0x%x" $(( $(sed -n "/CONFIG_TEXT_BASE=/ s@.*=@@p" .config) - $(sed -n "/CONFIG_FIT_EXTERNAL_OFFSET=/ s@.*=@@p" .config) - 0x200 - 0x40)) ) fit_block_offset=$(printf "0x%s" $(fdtget -t x u-boot.dtb /binman/imx-boot/uboot offset)) fit_block_size=$(printf "0x%x" $(( ( $(fdtdump u-boot.itb 2>/dev/null | sed -n "/^...totalsize:/ s@.*\(0x[0-9a-f]\+\).*@\1@p") + 0x1000 - 0x1 ) & ~(0x1000 - 0x1) + 0x20 )) ) sed -i "/Blocks = / s@.*@ Blocks = $fit_block_base $fit_block_offset $fit_block_size \"flash.bin\", \\\\@" csf_fit.tmp diff --git a/doc/uImage.FIT/howto.txt b/doc/uImage.FIT/howto.txt index 019dda24a08..6dbd17dc8ca 100644 --- a/doc/uImage.FIT/howto.txt +++ b/doc/uImage.FIT/howto.txt @@ -70,6 +70,12 @@ The SPL also records to a DT all additional images (called loadables) which are loaded. The information about loadables locations is passed via the DT node with fit-images name. +Finally, if there are multiple xPL phases (e.g. SPL, VPL), images can be marked +as intended for a particular phase using the 'phase' property. For example, if +fit_image_load() is called with image_ph(IH_PHASE_SPL, IH_TYPE_FIRMWARE), then +only the image listed into the "firmware" property where phase is set to "spl" +will be loaded. + Loadables Example ----------------- Consider the following case for an ARM64 platform where U-Boot runs in EL2 diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt index 0a03c942bda..4640e38e3cc 100644 --- a/doc/uImage.FIT/source_file_format.txt +++ b/doc/uImage.FIT/source_file_format.txt @@ -190,6 +190,9 @@ the '/images' node should have the following layout: Xilinx Zynq UltraScale+ (ZymqMP) device. "u-boot,zynqmp-fpga-enc" - encrypted FPGA bitstream for Xilinx Zynq UltraScale+ (ZynqMP) device. + - phase : U-Boot phase for which the image is intended. + "spl" - image is an SPL image + "u-boot" - image is a U-Boot image Optional nodes: - hash-1 : Each hash sub-node represents separate hash or checksum diff --git a/drivers/Makefile b/drivers/Makefile index 9d9f69a3c9a..a1700c819de 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+ +obj-$(CONFIG_$(SPL_TPL_)BLK) += block/ obj-$(CONFIG_$(SPL_TPL_)BOOTCOUNT_LIMIT) += bootcount/ obj-$(CONFIG_$(SPL_TPL_)BUTTON) += button/ obj-$(CONFIG_$(SPL_TPL_)CACHE) += cache/ @@ -60,7 +61,6 @@ obj-$(CONFIG_SPL_USB_HOST) += usb/host/ obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/ obj-$(CONFIG_SPL_SATA) += ata/ scsi/ obj-$(CONFIG_SPL_LEGACY_BLOCK) += block/ -obj-$(CONFIG_SPL_BLK) += block/ obj-$(CONFIG_SPL_THERMAL) += thermal/ endif diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 707e2bcd238..e95da48bdc0 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -37,7 +37,6 @@ config SPL_BLK config TPL_BLK bool "Support block devices in TPL" depends on TPL_DM && BLK - default y help Enable support for block devices, such as SCSI, MMC and USB flash sticks. These provide a block-level interface which permits diff --git a/drivers/block/Makefile b/drivers/block/Makefile index f48d3e12140..19d9317c825 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -obj-$(CONFIG_$(SPL_)BLK) += blk-uclass.o +obj-$(CONFIG_$(SPL_TPL_)BLK) += blk-uclass.o ifndef CONFIG_$(SPL_)BLK obj-$(CONFIG_SPL_LEGACY_BLOCK) += blk_legacy.o diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index bcc14a684be..e82789f4a38 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -444,53 +444,70 @@ int blk_get_device(int uclass_id, int devnum, struct udevice **devp) return device_probe(*devp); } -unsigned long blk_dread(struct blk_desc *block_dev, lbaint_t start, - lbaint_t blkcnt, void *buffer) +long blk_read(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, void *buf) { - struct udevice *dev = block_dev->bdev; + struct blk_desc *desc = dev_get_uclass_plat(dev); const struct blk_ops *ops = blk_get_ops(dev); ulong blks_read; if (!ops->read) return -ENOSYS; - if (blkcache_read(block_dev->uclass_id, block_dev->devnum, - start, blkcnt, block_dev->blksz, buffer)) + if (blkcache_read(desc->uclass_id, desc->devnum, + start, blkcnt, desc->blksz, buf)) return blkcnt; - blks_read = ops->read(dev, start, blkcnt, buffer); + blks_read = ops->read(dev, start, blkcnt, buf); if (blks_read == blkcnt) - blkcache_fill(block_dev->uclass_id, block_dev->devnum, - start, blkcnt, block_dev->blksz, buffer); + blkcache_fill(desc->uclass_id, desc->devnum, start, blkcnt, + desc->blksz, buf); return blks_read; } -unsigned long blk_dwrite(struct blk_desc *block_dev, lbaint_t start, - lbaint_t blkcnt, const void *buffer) +long blk_write(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, + const void *buf) { - struct udevice *dev = block_dev->bdev; + struct blk_desc *desc = dev_get_uclass_plat(dev); const struct blk_ops *ops = blk_get_ops(dev); if (!ops->write) return -ENOSYS; - blkcache_invalidate(block_dev->uclass_id, block_dev->devnum); - return ops->write(dev, start, blkcnt, buffer); + blkcache_invalidate(desc->uclass_id, desc->devnum); + + return ops->write(dev, start, blkcnt, buf); } -unsigned long blk_derase(struct blk_desc *block_dev, lbaint_t start, - lbaint_t blkcnt) +long blk_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt) { - struct udevice *dev = block_dev->bdev; + struct blk_desc *desc = dev_get_uclass_plat(dev); const struct blk_ops *ops = blk_get_ops(dev); if (!ops->erase) return -ENOSYS; - blkcache_invalidate(block_dev->uclass_id, block_dev->devnum); + blkcache_invalidate(desc->uclass_id, desc->devnum); + return ops->erase(dev, start, blkcnt); } +ulong blk_dread(struct blk_desc *desc, lbaint_t start, lbaint_t blkcnt, + void *buffer) +{ + return blk_read(desc->bdev, start, blkcnt, buffer); +} + +ulong blk_dwrite(struct blk_desc *desc, lbaint_t start, lbaint_t blkcnt, + const void *buffer) +{ + return blk_write(desc->bdev, start, blkcnt, buffer); +} + +ulong blk_derase(struct blk_desc *desc, lbaint_t start, lbaint_t blkcnt) +{ + return blk_erase(desc->bdev, start, blkcnt); +} + int blk_get_from_parent(struct udevice *parent, struct udevice **devp) { struct udevice *dev; diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 5d5104bbf1d..3a664c2ebbb 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -10,7 +10,7 @@ ifdef CONFIG_$(SPL_TPL_)DM_MMC obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += mmc_bootdev.o endif -obj-$(CONFIG_$(SPL_)MMC_WRITE) += mmc_write.o +obj-$(CONFIG_$(SPL_TPL_)MMC_WRITE) += mmc_write.o obj-$(CONFIG_MMC_PWRSEQ) += mmc-pwrseq.o obj-$(CONFIG_MMC_SDHCI_ADMA_HELPERS) += sdhci-adma.o diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c index 451fe4a4e5a..ba79a5565c3 100644 --- a/drivers/mmc/sandbox_mmc.c +++ b/drivers/mmc/sandbox_mmc.c @@ -23,6 +23,8 @@ struct sandbox_mmc_plat { #define MMC_CMULT 8 /* 8 because the card is high-capacity */ #define MMC_BL_LEN_SHIFT 10 #define MMC_BL_LEN BIT(MMC_BL_LEN_SHIFT) + +/* Granularity of priv->csize - this is 1MB */ #define SIZE_MULTIPLE ((1 << (MMC_CMULT + 2)) * MMC_BL_LEN) struct sandbox_mmc_priv { @@ -41,7 +43,6 @@ static int sandbox_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { struct sandbox_mmc_priv *priv = dev_get_priv(dev); - struct mmc *mmc = mmc_get_mmc_dev(dev); static ulong erase_start, erase_end; switch (cmd->cmdidx) { @@ -95,10 +96,15 @@ static int sandbox_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, case SD_CMD_ERASE_WR_BLK_END: erase_end = cmd->cmdarg; break; - case MMC_CMD_ERASE: +#if CONFIG_IS_ENABLED(MMC_WRITE) + case MMC_CMD_ERASE: { + struct mmc *mmc = mmc_get_mmc_dev(dev); + memset(&priv->buf[erase_start * mmc->write_bl_len], '\0', (erase_end - erase_start + 1) * mmc->write_bl_len); break; + } +#endif case SD_CMD_APP_SEND_OP_COND: cmd->response[0] = OCR_BUSY | OCR_HCS; cmd->response[1] = 0; diff --git a/drivers/scsi/scsi_emul.c b/drivers/scsi/scsi_emul.c index 5ba364bdac7..6b8468f7994 100644 --- a/drivers/scsi/scsi_emul.c +++ b/drivers/scsi/scsi_emul.c @@ -62,6 +62,15 @@ int sb_scsi_emul_command(struct scsi_emul_info *info, ret = SCSI_EMUL_DO_READ; break; } + case SCSI_WRITE10: { + const struct scsi_write10_req *write_req = (void *)req; + + info->seek_block = be32_to_cpu(write_req->lba); + info->write_len = be16_to_cpu(write_req->xfer_len); + info->buff_used = info->write_len * info->block_size; + ret = SCSI_EMUL_DO_WRITE; + break; + } default: debug("Command not supported: %x\n", req->cmd[0]); ret = -EPROTONOSUPPORT; diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c index 2589c708d88..6e8cfe1650a 100644 --- a/drivers/usb/emul/sandbox_flash.c +++ b/drivers/usb/emul/sandbox_flash.c @@ -4,6 +4,8 @@ * Written by Simon Glass <sjg@chromium.org> */ +#define LOG_CATEGORY UCLASS_USB + #include <common.h> #include <dm.h> #include <log.h> @@ -190,7 +192,8 @@ static int handle_ufi_command(struct sandbox_flash_priv *priv, const void *buff, ret = sb_scsi_emul_command(info, req, len); if (!ret) { setup_response(priv); - } else if (ret == SCSI_EMUL_DO_READ && priv->fd != -1) { + } else if ((ret == SCSI_EMUL_DO_READ || ret == SCSI_EMUL_DO_WRITE) && + priv->fd != -1) { os_lseek(priv->fd, info->seek_block * info->block_size, OS_SEEK_SET); setup_response(priv); @@ -217,6 +220,7 @@ static int sandbox_flash_bulk(struct udevice *dev, struct usb_device *udev, case SCSIPH_START: info->alloc_len = 0; info->read_len = 0; + info->write_len = 0; if (priv->error || len != UMASS_BBB_CBW_SIZE || cbw->dCBWSignature != CBWSIGNATURE) goto err; @@ -230,8 +234,31 @@ static int sandbox_flash_bulk(struct udevice *dev, struct usb_device *udev, return handle_ufi_command(priv, cbw->CBWCDB, cbw->bCDBLength); case SCSIPH_DATA: - debug("data out\n"); - break; + log_debug("data out, len=%x, info->write_len=%x\n", len, + info->write_len); + info->transfer_len = cbw->dCBWDataTransferLength; + priv->tag = cbw->dCBWTag; + if (!info->write_len) + return 0; + if (priv->fd != -1) { + ulong bytes_written; + + bytes_written = os_write(priv->fd, buff, len); + log_debug("bytes_written=%lx", bytes_written); + if (bytes_written != len) + return -EIO; + info->write_len -= len / info->block_size; + if (!info->write_len) + info->phase = SCSIPH_STATUS; + } else { + if (info->alloc_len && len > info->alloc_len) + len = info->alloc_len; + if (len > SANDBOX_FLASH_BUF_SIZE) + len = SANDBOX_FLASH_BUF_SIZE; + memcpy(info->buff, buff, len); + info->phase = SCSIPH_STATUS; + } + return len; default: break; } @@ -310,7 +337,7 @@ static int sandbox_flash_probe(struct udevice *dev) struct scsi_emul_info *info = &priv->eminfo; int ret; - priv->fd = os_open(plat->pathname, OS_O_RDONLY); + priv->fd = os_open(plat->pathname, OS_O_RDWR); if (priv->fd != -1) { ret = os_get_filesize(plat->pathname, &info->file_size); if (ret) diff --git a/include/blk.h b/include/blk.h index d3ab9a10b96..e854166edb9 100644 --- a/include/blk.h +++ b/include/blk.h @@ -274,6 +274,43 @@ unsigned long blk_derase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt); /** + * blk_read() - Read from a block device + * + * @dev: Device to read from + * @start: Start block for the read + * @blkcnt: Number of blocks to read + * @buf: Place to put the data + * @return number of blocks read (which may be less than @blkcnt), + * or -ve on error. This never returns 0 unless @blkcnt is 0 + */ +long blk_read(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, + void *buffer); + +/** + * blk_write() - Write to a block device + * + * @dev: Device to write to + * @start: Start block for the write + * @blkcnt: Number of blocks to write + * @buf: Data to write + * @return number of blocks written (which may be less than @blkcnt), + * or -ve on error. This never returns 0 unless @blkcnt is 0 + */ +long blk_write(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, + const void *buffer); + +/** + * blk_erase() - Erase part of a block device + * + * @dev: Device to erase + * @start: Start block for the erase + * @blkcnt: Number of blocks to erase + * @return number of blocks erased (which may be less than @blkcnt), + * or -ve on error. This never returns 0 unless @blkcnt is 0 + */ +long blk_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt); + +/** * blk_find_device() - Find a block device * * This function does not activate the device. The device will be returned @@ -428,7 +465,7 @@ const char *blk_get_devtype(struct udevice *dev); /** * blk_get_by_device() - Get the block device descriptor for the given device - * @dev: Instance of a storage device + * @dev: Instance of a storage device (the parent of the block device) * * Return: With block device descriptor on success , NULL if there is no such * block device. diff --git a/include/bloblist.h b/include/bloblist.h index 9684bfd5f4b..2a2f1700eb0 100644 --- a/include/bloblist.h +++ b/include/bloblist.h @@ -112,6 +112,7 @@ enum bloblist_tag_t { */ BLOBLISTT_PROJECT_AREA = 0x8000, BLOBLISTT_U_BOOT_SPL_HANDOFF = 0x8000, /* Hand-off info from SPL */ + BLOBLISTT_VBE = 0x8001, /* VBE per-phase state */ /* * Vendor-specific tags are permitted here. Projects can be open source diff --git a/include/bootflow.h b/include/bootflow.h index 6aa3d1fff8d..32dbbbbe261 100644 --- a/include/bootflow.h +++ b/include/bootflow.h @@ -145,6 +145,18 @@ struct bootflow_iter { }; /** + * bootflow_init() - Set up a bootflow struct + * + * The bootflow is zeroed and set to state BOOTFLOWST_BASE + * + * @bflow: Struct to set up + * @bootdev: Bootdev to use + * @meth: Bootmeth to use + */ +void bootflow_init(struct bootflow *bflow, struct udevice *bootdev, + struct udevice *meth); + +/** * bootflow_iter_init() - Reset a bootflow iterator * * This sets everything to the starting point, ready for use. diff --git a/include/bootstage.h b/include/bootstage.h index 7088d0b875e..685939ccffc 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -166,6 +166,8 @@ enum bootstage_id { BOOTSTAGE_ID_NAND_FIT_READ_OK, BOOTSTAGE_ID_FIT_LOADABLE_START = 160, /* for Loadable Images */ + + BOOTSTAGE_ID_FIT_SPL_START = 170, /* for SPL Images */ /* * These boot stages are new, higher level, and not directly related * to the old boot progress numbers. They are useful for recording diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 9d0683829ec..1826a6fece8 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -68,7 +68,7 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* FLASH organization */ -#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_FLASH_BASE CONFIG_TEXT_BASE /* * For booting Linux, the board info and command line data diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index c2f4f2bee2c..edf9b34f61c 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -256,15 +256,15 @@ "netdev=" CONFIG_NETDEV "\0" \ "uboot=" CONFIG_UBOOTPATH "\0" \ "tftpflash=tftp $loadaddr $uboot;" \ - "protect off " __stringify(CONFIG_SYS_TEXT_BASE) \ + "protect off " __stringify(CONFIG_TEXT_BASE) \ " +$filesize; " \ - "erase " __stringify(CONFIG_SYS_TEXT_BASE) \ + "erase " __stringify(CONFIG_TEXT_BASE) \ " +$filesize; " \ - "cp.b $loadaddr " __stringify(CONFIG_SYS_TEXT_BASE) \ + "cp.b $loadaddr " __stringify(CONFIG_TEXT_BASE) \ " $filesize; " \ - "protect on " __stringify(CONFIG_SYS_TEXT_BASE) \ + "protect on " __stringify(CONFIG_TEXT_BASE) \ " +$filesize; " \ - "cmp.b $loadaddr " __stringify(CONFIG_SYS_TEXT_BASE) \ + "cmp.b $loadaddr " __stringify(CONFIG_TEXT_BASE) \ " $filesize\0" \ "fdtaddr=780000\0" \ "fdtfile=" CONFIG_FDTFILE "\0" \ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index eb7a8351794..095193153a7 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -367,15 +367,15 @@ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " __stringify(CONFIG_SYS_TEXT_BASE) \ + "protect off " __stringify(CONFIG_TEXT_BASE) \ " +$filesize; " \ - "erase " __stringify(CONFIG_SYS_TEXT_BASE) \ + "erase " __stringify(CONFIG_TEXT_BASE) \ " +$filesize; " \ - "cp.b $loadaddr " __stringify(CONFIG_SYS_TEXT_BASE) \ + "cp.b $loadaddr " __stringify(CONFIG_TEXT_BASE) \ " $filesize; " \ - "protect on " __stringify(CONFIG_SYS_TEXT_BASE) \ + "protect on " __stringify(CONFIG_TEXT_BASE) \ " +$filesize; " \ - "cmp.b $loadaddr " __stringify(CONFIG_SYS_TEXT_BASE) \ + "cmp.b $loadaddr " __stringify(CONFIG_TEXT_BASE) \ " $filesize\0" \ "consoledev=ttyS1\0" \ "ramdiskaddr=2000000\0" \ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 925720d2340..0ac7f161bca 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -12,13 +12,13 @@ #define __CONFIG_H #ifdef CONFIG_RAMBOOT_PBL -#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc #endif #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE /* Set 1M boot space */ -#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_SYS_TEXT_BASE & 0xfff00000) +#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000) #define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc @@ -347,7 +347,7 @@ "bank_intlv=cs0_cs1\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ - "ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0" \ + "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \ "tftpflash=tftpboot $loadaddr $uboot && " \ "protect off $ubootaddr +$filesize && " \ "erase $ubootaddr +$filesize && " \ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index e0aa2b9598c..14f0ce60e29 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -86,7 +86,7 @@ #define CONFIG_SYS_SRIO_PCIE_BOOT_UCODE_ENV_ADDR_PHYS \ (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_UCODE_ENV_ADDR) /* Set 1M boot space for PCIe boot */ -#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_SYS_TEXT_BASE & 0xfff00000) +#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000) #define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc @@ -469,7 +469,7 @@ "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ - "ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0" \ + "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \ "bootargs=root=/dev/ram rw console=ttyS0,115200\0" \ "netdev=eth0\0" \ "tftpflash=tftpboot $loadaddr $uboot && " \ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 918aabcbb5c..fad9594cb76 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -465,7 +465,7 @@ "usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ - "ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0" \ + "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \ "tftpflash=tftpboot $loadaddr $uboot && " \ "protect off $ubootaddr +$filesize && " \ "erase $ubootaddr +$filesize && " \ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index e852fc4cdc8..285e5fcd2dc 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -55,7 +55,7 @@ #define CONFIG_SRIO_PCIE_BOOT_MASTER #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE /* Set 1M boot space */ -#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_SYS_TEXT_BASE & 0xfff00000) +#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000) #define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc @@ -466,7 +466,7 @@ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ - "ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0" \ + "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \ "tftpflash=tftpboot $loadaddr $uboot && " \ "protect off $ubootaddr +$filesize && " \ "erase $ubootaddr +$filesize && " \ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 68cf13581ad..7fe499bb80f 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -50,7 +50,7 @@ #define CONFIG_SRIO_PCIE_BOOT_MASTER #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE /* Set 1M boot space */ -#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_SYS_TEXT_BASE & 0xfff00000) +#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000) #define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc @@ -421,7 +421,7 @@ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ - "ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0" \ + "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \ "tftpflash=tftpboot $loadaddr $uboot && " \ "protect off $ubootaddr +$filesize && " \ "erase $ubootaddr +$filesize && " \ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index bba82f1e0cd..0dde24eff64 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -16,7 +16,7 @@ #ifdef CONFIG_RAMBOOT_PBL #ifndef CONFIG_SDCARD -#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc #else #define RESET_VECTOR_OFFSET 0x27FFC @@ -419,7 +419,7 @@ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ - "ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0" \ + "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \ "tftpflash=tftpboot $loadaddr $uboot && " \ "protect off $ubootaddr +$filesize && " \ "erase $ubootaddr +$filesize && " \ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 2dc6bd2f2cd..9cfae04218a 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -27,7 +27,7 @@ #define CONFIG_SYS_NAND_ECCBYTES 13 #define CONFIG_SYS_NAND_MAX_OOBFREE 2 #define CONFIG_SYS_NAND_MAX_ECCPOS 56 -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE /* NAND block size is 128 KiB. Synchronize these values with * corresponding Device Tree entries in Linux: * MLO(SPL) 4 * NAND_BLOCK_SIZE = 512 KiB @ 0x000000 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index ef9335c523f..ca5815fe36b 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -17,7 +17,7 @@ #include <asm/hardware.h> /* - * Warning: changing CONFIG_SYS_TEXT_BASE requires + * Warning: changing CONFIG_TEXT_BASE requires * adapting the initial boot program. * Since the linker has to swallow that define, we must use a pure * hex number here! diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 266b2ae04b3..f4161d7a6de 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -205,7 +205,7 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 14 -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE #endif #endif diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 134a3ec2892..5aa720da3d7 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -65,7 +65,7 @@ extern phys_addr_t prior_stage_fdt_address; * : [~500 KiB in size, stripped] * 0xc000 0000 Top of RAM * - * Setting gd->relocaddr to CONFIG_SYS_TEXT_BASE in dram_init_banksize + * Setting gd->relocaddr to CONFIG_TEXT_BASE in dram_init_banksize * prevents U-Boot from relocating itself when it is run as an ELF * program by the prior stage bootloader. * diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index ba0662f1f40..898ca968c9d 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -65,7 +65,7 @@ * * Setting #if 0: u-boot will start from flash and relocate itself to RAM * - * Please do not forget to modify the setting of CONFIG_SYS_TEXT_BASE + * Please do not forget to modify the setting of CONFIG_TEXT_BASE * in board/cobra5272/config.mk accordingly (#if 0: 0xffe00000; #if 1: 0x20000) * * --- diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h new file mode 100644 index 00000000000..434da314442 --- /dev/null +++ b/include/configs/corenet_ds.h @@ -0,0 +1,365 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2009-2012 Freescale Semiconductor, Inc. + * Copyright 2020-2021 NXP + */ + +/* + * Corenet DS style board configuration file + */ +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <linux/stringify.h> + +#include "../board/freescale/common/ics307_clk.h" + +#ifdef CONFIG_RAMBOOT_PBL +#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_TEXT_BASE +#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#endif + +#ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE +/* Set 1M boot space */ +#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000) +#define CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \ + (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR) +#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc +#endif + +/* High Level Configuration Options */ + +#ifndef CONFIG_RESET_VECTOR_ADDRESS +#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#endif + +#define CONFIG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS + +/* + * These can be toggled for performance analysis, otherwise use default. + */ +#define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E +#ifdef CONFIG_DDR_ECC +#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#endif + +#define CONFIG_POST CONFIG_SYS_POST_MEMORY /* test POST memory test */ + +/* + * Config the L3 Cache as L3 SRAM + */ +#define CONFIG_SYS_INIT_L3_ADDR CONFIG_RAMBOOT_TEXT_BASE +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_INIT_L3_ADDR_PHYS (0xf00000000ull | CONFIG_RAMBOOT_TEXT_BASE) +#else +#define CONFIG_SYS_INIT_L3_ADDR_PHYS CONFIG_SYS_INIT_L3_ADDR +#endif +#define CONFIG_SYS_L3_SIZE (1024 << 10) +#define CONFIG_SYS_INIT_L3_END (CONFIG_SYS_INIT_L3_ADDR + CONFIG_SYS_L3_SIZE) + +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_DCSRBAR 0xf0000000 +#define CONFIG_SYS_DCSRBAR_PHYS 0xf00000000ull +#endif + +/* + * DDR Setup + */ +#define CONFIG_VERY_BIG_RAM +#define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 +#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE + +#define SPD_EEPROM_ADDRESS1 0x51 +#define SPD_EEPROM_ADDRESS2 0x52 +#define SPD_EEPROM_ADDRESS SPD_EEPROM_ADDRESS1 /* for p3041/p5010 */ +#define CONFIG_SYS_SDRAM_SIZE 4096 /* for fixed parameter use */ + +/* + * Local Bus Definitions + */ + +/* Set the local bus clock 1/8 of platform clock */ +#define CONFIG_SYS_LBC_LCRR LCRR_CLKDIV_8 + +#define CONFIG_SYS_FLASH_BASE 0xe0000000 /* Start of PromJet */ +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_FLASH_BASE_PHYS 0xfe0000000ull +#else +#define CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE +#endif + +#define PIXIS_BASE 0xffdf0000 /* PIXIS registers */ +#ifdef CONFIG_PHYS_64BIT +#define PIXIS_BASE_PHYS 0xfffdf0000ull +#else +#define PIXIS_BASE_PHYS PIXIS_BASE +#endif + +#define PIXIS_LBMAP_SWITCH 7 +#define PIXIS_LBMAP_MASK 0xf0 +#define PIXIS_LBMAP_SHIFT 4 +#define PIXIS_LBMAP_ALTBANK 0x40 + +#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ + +/* Nand Flash */ +#ifdef CONFIG_NAND_FSL_ELBC +#define CONFIG_SYS_NAND_BASE 0xffa00000 +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_NAND_BASE_PHYS 0xfffa00000ull +#else +#define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE +#endif + +#define CONFIG_SYS_NAND_BASE_LIST {CONFIG_SYS_NAND_BASE} +#define CONFIG_SYS_MAX_NAND_DEVICE 1 + +/* NAND flash config */ +#define CONFIG_SYS_NAND_BR_PRELIM (BR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \ + | (2<<BR_DECC_SHIFT) /* Use HW ECC */ \ + | BR_PS_8 /* Port Size = 8 bit */ \ + | BR_MS_FCM /* MSEL = FCM */ \ + | BR_V) /* valid */ +#define CONFIG_SYS_NAND_OR_PRELIM (0xFFFC0000 /* length 256K */ \ + | OR_FCM_PGS /* Large Page*/ \ + | OR_FCM_CSCT \ + | OR_FCM_CST \ + | OR_FCM_CHT \ + | OR_FCM_SCY_1 \ + | OR_FCM_TRLX \ + | OR_FCM_EHTR) +#endif /* CONFIG_NAND_FSL_ELBC */ + +#define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS} + +#define CONFIG_HWCONFIG + +/* define to use L1 as initial stack */ +#define CONFIG_L1_INIT_RAM +#define CONFIG_SYS_INIT_RAM_LOCK +#define CONFIG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */ +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf +#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW CONFIG_SYS_INIT_RAM_ADDR +/* The assembler doesn't like typecast */ +#define CONFIG_SYS_INIT_RAM_ADDR_PHYS \ + ((CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH * 1ull << 32) | \ + CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW) +#else +#define CONFIG_SYS_INIT_RAM_ADDR_PHYS CONFIG_SYS_INIT_RAM_ADDR /* Initial L1 address */ +#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0 +#define CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW CONFIG_SYS_INIT_RAM_ADDR_PHYS +#endif +#define CONFIG_SYS_INIT_RAM_SIZE 0x00004000 /* Size of used area in RAM */ + +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) + +#define CONFIG_SYS_MONITOR_LEN (768 * 1024) + +/* Serial Port - controlled on board with jumper J8 + * open - index 2 + * shorted - index 1 + */ +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE 1 +#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2) + +#define CONFIG_SYS_BAUDRATE_TABLE \ + {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200} + +#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500) +#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600) +#define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) +#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) + +/* I2C */ + +/* + * RapidIO + */ +#define CONFIG_SYS_SRIO1_MEM_VIRT 0xa0000000 +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_SRIO1_MEM_PHYS 0xc20000000ull +#else +#define CONFIG_SYS_SRIO1_MEM_PHYS 0xa0000000 +#endif +#define CONFIG_SYS_SRIO1_MEM_SIZE 0x10000000 /* 256M */ + +#define CONFIG_SYS_SRIO2_MEM_VIRT 0xb0000000 +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_SRIO2_MEM_PHYS 0xc30000000ull +#else +#define CONFIG_SYS_SRIO2_MEM_PHYS 0xb0000000 +#endif +#define CONFIG_SYS_SRIO2_MEM_SIZE 0x10000000 /* 256M */ + +/* + * for slave u-boot IMAGE instored in master memory space, + * PHYS must be aligned based on the SIZE + */ +#define CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_PHYS 0xfef200000ull +#define CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_BUS1 0xfff00000ull +#define CONFIG_SRIO_PCIE_BOOT_IMAGE_SIZE 0x100000 /* 1M */ +#define CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_BUS2 0x3fff00000ull +/* + * for slave UCODE and ENV instored in master memory space, + * PHYS must be aligned based on the SIZE + */ +#define CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_MEM_PHYS 0xfef100000ull +#define CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_MEM_BUS 0x3ffe00000ull +#define CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_SIZE 0x40000 /* 256K */ + +/* slave core release by master*/ +#define CONFIG_SRIO_PCIE_BOOT_BRR_OFFSET 0xe00e4 +#define CONFIG_SRIO_PCIE_BOOT_RELEASE_MASK 0x00000001 /* release core 0 */ + +/* + * SRIO_PCIE_BOOT - SLAVE + */ +#ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE +#define CONFIG_SYS_SRIO_PCIE_BOOT_UCODE_ENV_ADDR 0xFFE00000 +#define CONFIG_SYS_SRIO_PCIE_BOOT_UCODE_ENV_ADDR_PHYS \ + (0x300000000ull | CONFIG_SYS_SRIO_PCIE_BOOT_UCODE_ENV_ADDR) +#endif + +/* + * eSPI - Enhanced SPI + */ + +/* + * General PCI + * Memory space is mapped 1-1, but I/O space must start from 0. + */ + +/* controller 1, direct to uli, tgtid 3, Base address 20000 */ +#define CONFIG_SYS_PCIE1_MEM_VIRT 0x80000000 +#define CONFIG_SYS_PCIE1_MEM_PHYS 0xc00000000ull +#define CONFIG_SYS_PCIE1_IO_VIRT 0xf8000000 +#define CONFIG_SYS_PCIE1_IO_PHYS 0xff8000000ull + +/* controller 2, Slot 2, tgtid 2, Base address 201000 */ +#define CONFIG_SYS_PCIE2_MEM_VIRT 0xa0000000 +#define CONFIG_SYS_PCIE2_MEM_PHYS 0xc20000000ull +#define CONFIG_SYS_PCIE2_IO_VIRT 0xf8010000 +#define CONFIG_SYS_PCIE2_IO_PHYS 0xff8010000ull + +/* controller 3, Slot 1, tgtid 1, Base address 202000 */ +#define CONFIG_SYS_PCIE3_MEM_VIRT 0xc0000000 +#define CONFIG_SYS_PCIE3_MEM_PHYS 0xc40000000ull +#define CONFIG_SYS_PCIE3_IO_VIRT 0xf8020000 +#define CONFIG_SYS_PCIE3_IO_PHYS 0xff8020000ull + +/* controller 4, Base address 203000 */ +#define CONFIG_SYS_PCIE4_MEM_PHYS 0xc60000000ull +#define CONFIG_SYS_PCIE4_IO_PHYS 0xff8030000ull + +/* Qman/Bman */ +#define CONFIG_SYS_BMAN_NUM_PORTALS 10 +#define CONFIG_SYS_BMAN_MEM_BASE 0xf4000000 +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_BMAN_MEM_PHYS 0xff4000000ull +#else +#define CONFIG_SYS_BMAN_MEM_PHYS CONFIG_SYS_BMAN_MEM_BASE +#endif +#define CONFIG_SYS_BMAN_MEM_SIZE 0x00200000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 +#define CONFIG_SYS_QMAN_NUM_PORTALS 10 +#define CONFIG_SYS_QMAN_MEM_BASE 0xf4200000 +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_QMAN_MEM_PHYS 0xff4200000ull +#else +#define CONFIG_SYS_QMAN_MEM_PHYS CONFIG_SYS_QMAN_MEM_BASE +#endif +#define CONFIG_SYS_QMAN_MEM_SIZE 0x00200000 +#define CONFIG_SYS_QMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_QMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_QMAN_CENA_BASE CONFIG_SYS_QMAN_MEM_BASE +#define CONFIG_SYS_QMAN_CENA_SIZE (CONFIG_SYS_QMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_QMAN_CINH_BASE (CONFIG_SYS_QMAN_MEM_BASE + \ + CONFIG_SYS_QMAN_CENA_SIZE) +#define CONFIG_SYS_QMAN_CINH_SIZE (CONFIG_SYS_QMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_QMAN_SWP_ISDR_REG 0xE08 + +#define CONFIG_SYS_DPAA_FMAN +#define CONFIG_SYS_DPAA_PME + +#ifdef CONFIG_FMAN_ENET +#define CONFIG_SYS_FM1_DTSEC1_PHY_ADDR 0x1c +#define CONFIG_SYS_FM1_DTSEC2_PHY_ADDR 0x1d +#define CONFIG_SYS_FM1_DTSEC3_PHY_ADDR 0x1e +#define CONFIG_SYS_FM1_DTSEC4_PHY_ADDR 0x1f +#define CONFIG_SYS_FM1_10GEC1_PHY_ADDR 4 + +#define CONFIG_SYS_FM2_DTSEC1_PHY_ADDR 0x1c +#define CONFIG_SYS_FM2_DTSEC2_PHY_ADDR 0x1d +#define CONFIG_SYS_FM2_DTSEC3_PHY_ADDR 0x1e +#define CONFIG_SYS_FM2_DTSEC4_PHY_ADDR 0x1f +#define CONFIG_SYS_FM2_10GEC1_PHY_ADDR 0 + +#define CONFIG_SYS_TBIPA_VALUE 8 +#endif + +/* + * Environment + */ +#define CONFIG_LOADS_ECHO /* echo on for serial download */ +#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ + +#ifdef CONFIG_MMC +#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR +#endif + +/* + * Miscellaneous configurable options + */ + +/* + * For booting Linux, the board info and command line data + * have to be in the first 64 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + */ +#define CONFIG_SYS_BOOTMAPSZ (64 << 20) /* Initial Memory map for Linux*/ + +/* + * Environment Configuration + */ +#define CONFIG_ROOTPATH "/opt/nfsroot" +#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ + +#ifdef CONFIG_TARGET_P4080DS +#define __USB_PHY_TYPE ulpi +#else +#define __USB_PHY_TYPE utmi +#endif + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ + "bank_intlv=cs0_cs1;" \ + "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\ + "usb2:dr_mode=peripheral,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ + "netdev=eth0\0" \ + "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ + "ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0" \ + "tftpflash=tftpboot $loadaddr $uboot && " \ + "protect off $ubootaddr +$filesize && " \ + "erase $ubootaddr +$filesize && " \ + "cp.b $loadaddr $ubootaddr $filesize && " \ + "protect on $ubootaddr +$filesize && " \ + "cmp.b $loadaddr $ubootaddr $filesize\0" \ + "consoledev=ttyS0\0" \ + "ramdiskaddr=2000000\0" \ + "ramdiskfile=p4080ds/ramdisk.uboot\0" \ + "fdtaddr=1e00000\0" \ + "fdtfile=p4080ds/p4080ds.dtb\0" \ + "bdev=sda3\0" + +#include <asm/fsl_secure_boot.h> + +#endif /* __CONFIG_H */ diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 698da6b6dac..5e43c217749 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -17,7 +17,7 @@ #include <linux/sizes.h> /* - * Warning: changing CONFIG_SYS_TEXT_BASE requires + * Warning: changing CONFIG_TEXT_BASE requires * adapting the initial boot program. * Since the linker has to swallow that define, we must use a pure * hex number here! @@ -56,8 +56,8 @@ /* Defines for SPL */ #define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000 -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_TEXT_BASE #define CONFIG_SYS_NAND_ECCSIZE 256 #define CONFIG_SYS_NAND_ECCBYTES 3 diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 7916ca8a6cd..66fb25bc029 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -79,11 +79,11 @@ * U-Boot Commands */ -/* U-Boot will be 0x60000 bytes, loaded and run at CONFIG_SYS_TEXT_BASE */ +/* U-Boot will be 0x60000 bytes, loaded and run at CONFIG_TEXT_BASE */ #define CONFIG_SYS_NAND_U_BOOT_SIZE 0x60000 -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_TEXT_BASE /* See common/spl/spl.c spl_set_header_raw_uboot() */ #define CONFIG_SYS_MONITOR_LEN CONFIG_SYS_NAND_U_BOOT_SIZE diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h index b109a151838..cd6cb062eca 100644 --- a/include/configs/evb_ast2500.h +++ b/include/configs/evb_ast2500.h @@ -11,7 +11,7 @@ #include <configs/aspeed-common.h> -#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_BASE CONFIG_TEXT_BASE /* Misc */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h index 3c2155da46d..ecd05fe15ce 100644 --- a/include/configs/evb_ast2600.h +++ b/include/configs/evb_ast2600.h @@ -8,7 +8,7 @@ #include <configs/aspeed-common.h> -#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_BASE CONFIG_TEXT_BASE /* Misc */ #define STR_HELPER(s) #s diff --git a/include/configs/gardena-smart-gateway-at91sam.h b/include/configs/gardena-smart-gateway-at91sam.h index 331e9ca8ba1..635d0f01b23 100644 --- a/include/configs/gardena-smart-gateway-at91sam.h +++ b/include/configs/gardena-smart-gateway-at91sam.h @@ -42,7 +42,7 @@ #define CONFIG_SYS_MCKR_CSS 0x1302 #define CONFIG_SYS_NAND_U_BOOT_SIZE 0xa0000 -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_TEXT_BASE #endif diff --git a/include/configs/gardena-smart-gateway-mt7688.h b/include/configs/gardena-smart-gateway-mt7688.h index d21a9b9383a..5f33470dfc0 100644 --- a/include/configs/gardena-smart-gateway-mt7688.h +++ b/include/configs/gardena-smart-gateway-mt7688.h @@ -16,7 +16,7 @@ /* SPL */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_START CONFIG_TEXT_BASE /* Dummy value */ #define CONFIG_SYS_UBOOT_BASE 0 diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 5be6eb4e766..18c1e83aeb4 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -17,7 +17,7 @@ /* Physical Memory Map */ -/* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */ +/* CONFIG_TEXT_BASE needs to align with where ATF loads bl33.bin */ #define PHYS_SDRAM_1 0x00000000 diff --git a/include/configs/hikey960.h b/include/configs/hikey960.h index ad070439d00..bdc9c479c22 100644 --- a/include/configs/hikey960.h +++ b/include/configs/hikey960.h @@ -11,7 +11,7 @@ /* Physical Memory Map */ -/* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */ +/* CONFIG_TEXT_BASE needs to align with where ATF loads bl33.bin */ #define PHYS_SDRAM_1 0x00000000 #define PHYS_SDRAM_1_SIZE 0xC0000000 diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index a2d5080a10e..fa73cabda36 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -128,7 +128,7 @@ #ifdef CONFIG_NAND_MXS # define CONFIG_SYS_MAX_NAND_DEVICE 1 # define CONFIG_SYS_NAND_BASE 0x40000000 -# define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE +# define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE /* MTD device */ #endif diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 2913549c883..9ab3f8abeff 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -118,7 +118,7 @@ /* NAND stuff */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE /* USB Configs */ #ifdef CONFIG_CMD_USB diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h index f0586f7f721..3bf7970ea80 100644 --- a/include/configs/kontron-sl-mx6ul.h +++ b/include/configs/kontron-sl-mx6ul.h @@ -22,7 +22,7 @@ #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE -#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_BASE CONFIG_TEXT_BASE /* Board and environment settings */ #define CONFIG_MXC_UART_BASE UART4_BASE diff --git a/include/configs/linkit-smart-7688.h b/include/configs/linkit-smart-7688.h index 2e077dd5161..a65decd3fd3 100644 --- a/include/configs/linkit-smart-7688.h +++ b/include/configs/linkit-smart-7688.h @@ -16,7 +16,7 @@ /* SPL */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_START CONFIG_TEXT_BASE /* Dummy value */ #define CONFIG_SYS_UBOOT_BASE 0 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index d383b6c655b..37b8cd7e696 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -16,8 +16,8 @@ #ifdef CONFIG_NAND_BOOT #define CONFIG_SYS_NAND_U_BOOT_SIZE (400 << 10) -#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN 0x80000 #endif diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 1fb1d05eba3..9f146c43055 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -62,8 +62,8 @@ /* NAND SPL */ #ifdef CONFIG_NAND_BOOT -#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE #ifdef CONFIG_NXP_ESBC #define CONFIG_U_BOOT_HDR_SIZE (16 << 10) @@ -93,7 +93,7 @@ * CONFIG_SYS_FLASH_BASE has the final address (core view) * CONFIG_SYS_FLASH_BASE_PHYS has the final address (IFC view) * CONFIG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address - * CONFIG_SYS_TEXT_BASE is linked to 0x60000000 for booting + * CONFIG_TEXT_BASE is linked to 0x60000000 for booting */ #define CONFIG_SYS_FLASH_BASE 0x60000000 #define CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index e5fb111f1b8..26ce93a699d 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -66,8 +66,8 @@ /* NAND SPL */ #ifdef CONFIG_NAND_BOOT -#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN 0xa0000 #endif diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 1f54e516455..b411efd832d 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -36,7 +36,7 @@ * CONFIG_SYS_FLASH_BASE has the final address (core view) * CONFIG_SYS_FLASH_BASE_PHYS has the final address (IFC view) * CONFIG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address - * CONFIG_SYS_TEXT_BASE is linked to 0x60000000 for booting + * CONFIG_TEXT_BASE is linked to 0x60000000 for booting */ #define CONFIG_SYS_FLASH_BASE 0x60000000 #define CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 21afe80e70d..7d76170bf76 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -69,7 +69,7 @@ * CONFIG_SYS_FLASH_BASE has the final address (core view) * CONFIG_SYS_FLASH_BASE_PHYS has the final address (IFC view) * CONFIG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address - * CONFIG_SYS_TEXT_BASE is linked to 0x30000000 for booting + * CONFIG_TEXT_BASE is linked to 0x30000000 for booting */ #define CONFIG_SYS_FLASH_BASE 0x580000000ULL diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index e170b5aa2c7..dc43ecbd183 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -61,7 +61,7 @@ * CONFIG_SYS_FLASH_BASE has the final address (core view) * CONFIG_SYS_FLASH_BASE_PHYS has the final address (IFC view) * CONFIG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address - * CONFIG_SYS_TEXT_BASE is linked to 0x30000000 for booting + * CONFIG_TEXT_BASE is linked to 0x30000000 for booting */ #define CONFIG_SYS_FLASH_BASE 0x580000000ULL diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 6b2296788dc..cffcd9dd2f2 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -21,7 +21,7 @@ #include <asm/hardware.h> /* - * Warning: changing CONFIG_SYS_TEXT_BASE requires + * Warning: changing CONFIG_TEXT_BASE requires * adapting the initial boot program. * Since the linker has to swallow that define, we must use a pure * hex number here! diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index dfae8cea7b5..139b5bca108 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -95,6 +95,6 @@ /* SPL part */ -#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_BASE CONFIG_TEXT_BASE #endif /* __CONFIG_H */ diff --git a/include/configs/mt7620.h b/include/configs/mt7620.h index 049d9a1b55b..c6bee5f1403 100644 --- a/include/configs/mt7620.h +++ b/include/configs/mt7620.h @@ -16,7 +16,7 @@ /* SPL */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_START CONFIG_TEXT_BASE /* Dummy value */ #define CONFIG_SYS_UBOOT_BASE 0 diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h index 78d79b7780b..f9953993677 100644 --- a/include/configs/mt7622.h +++ b/include/configs/mt7622.h @@ -14,10 +14,10 @@ #define CONFIG_SYS_NONCACHED_MEMORY SZ_1M /* Uboot definition */ -#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_BASE CONFIG_TEXT_BASE /* SPL -> Uboot */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_START CONFIG_TEXT_BASE /* DRAM */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 diff --git a/include/configs/mt7628.h b/include/configs/mt7628.h index 3680c0fe442..317d1d2b0f0 100644 --- a/include/configs/mt7628.h +++ b/include/configs/mt7628.h @@ -28,7 +28,7 @@ /* SPL */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_START CONFIG_TEXT_BASE /* Dummy value */ #define CONFIG_SYS_UBOOT_BASE 0 diff --git a/include/configs/mt7981.h b/include/configs/mt7981.h index 01ad3096088..1f81b0b4f87 100644 --- a/include/configs/mt7981.h +++ b/include/configs/mt7981.h @@ -14,10 +14,10 @@ #define CONFIG_SYS_NONCACHED_MEMORY SZ_1M /* Uboot definition */ -#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_BASE CONFIG_TEXT_BASE /* SPL -> Uboot */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_START CONFIG_TEXT_BASE /* DRAM */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 diff --git a/include/configs/mt7986.h b/include/configs/mt7986.h index ccdd6abdb18..00e1c57ae8a 100644 --- a/include/configs/mt7986.h +++ b/include/configs/mt7986.h @@ -14,10 +14,10 @@ #define CONFIG_SYS_NONCACHED_MEMORY SZ_1M /* Uboot definition */ -#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_BASE CONFIG_TEXT_BASE /* SPL -> Uboot */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_START CONFIG_TEXT_BASE /* DRAM */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h index 964c9578133..5ff5541c509 100644 --- a/include/configs/mt8512.h +++ b/include/configs/mt8512.h @@ -14,7 +14,7 @@ #define CONFIG_SYS_NONCACHED_MEMORY SZ_1M /* Uboot definition */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_START CONFIG_TEXT_BASE #define ENV_BOOT_READ_IMAGE \ "boot_rd_img=mmc dev 0" \ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 384a8f7d1dd..20e00ec7222 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -23,7 +23,7 @@ */ /* - * Custom CONFIG_SYS_TEXT_BASE can be done in <board>.h + * Custom CONFIG_TEXT_BASE can be done in <board>.h */ /* additions for new ARM relocation support */ diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h index 2c430e8d376..25116c5ed23 100644 --- a/include/configs/octeontx2_common.h +++ b/include/configs/octeontx2_common.h @@ -10,7 +10,7 @@ /** Maximum size of image supported for bootm (and bootable FIT images) */ /** Memory base address */ -#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_SDRAM_BASE CONFIG_TEXT_BASE /** Stack starting address */ diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h index e7a6bd41db0..373eb9119cd 100644 --- a/include/configs/octeontx_common.h +++ b/include/configs/octeontx_common.h @@ -36,7 +36,7 @@ /** Maximum size of image supported for bootm (and bootable FIT images) */ /** Memory base address */ -#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_SDRAM_BASE CONFIG_TEXT_BASE /** Stack starting address */ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index d201c72a6c4..543a16f1d1e 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -87,8 +87,8 @@ #ifdef CONFIG_SDCARD #define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10) -#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MMC_U_BOOT_DST CONFIG_TEXT_BASE +#define CONFIG_SYS_MMC_U_BOOT_START CONFIG_TEXT_BASE #ifdef CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR #define CONFIG_SYS_MMC_U_BOOT_OFFS (CONFIG_SPL_PAD_TO - CONFIG_FSL_PREPBL_ESDHC_BOOT_SECTOR_DATA*512) #else @@ -96,8 +96,8 @@ #endif #elif defined(CONFIG_SPIFLASH) #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) -#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST CONFIG_TEXT_BASE +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START CONFIG_TEXT_BASE #define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS CONFIG_SPL_PAD_TO #elif defined(CONFIG_MTD_RAW_NAND) #ifdef CONFIG_TPL_BUILD @@ -456,11 +456,11 @@ "loadaddr=1000000\0" \ "bootfile=uImage\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " __stringify(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ - "erase " __stringify(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " __stringify(CONFIG_SYS_TEXT_BASE) " $filesize; " \ - "protect on " __stringify(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " __stringify(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ + "protect off " __stringify(CONFIG_TEXT_BASE) " +$filesize; " \ + "erase " __stringify(CONFIG_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " __stringify(CONFIG_TEXT_BASE) " $filesize; " \ + "protect on " __stringify(CONFIG_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " __stringify(CONFIG_TEXT_BASE) " $filesize\0" \ "hwconfig=usb1:dr_mode=host,phy_type=ulpi\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=2000000\0" \ diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 4f5025d0da5..cd8fe8b518b 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -24,7 +24,7 @@ /* Memory layout */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_BASE CONFIG_TEXT_BASE /* * The board really has 256M. However, the VC (VideoCore co-processor) shares * the RAM, and uses a configurable portion at the top. We tell U-Boot that a diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index fcb0fd5cec3..5759794b145 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -63,7 +63,7 @@ #define CONFIG_SYS_NAND_ECCTOTAL (CONFIG_SYS_NAND_ECCBYTES * \ CONFIG_SYS_NAND_ECCSTEPS) -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE /* * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 1a3ac817fbf..802ed07b9ea 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -30,7 +30,7 @@ #include <linux/sizes.h> /* - * Warning: changing CONFIG_SYS_TEXT_BASE requires adapting the initial boot + * Warning: changing CONFIG_TEXT_BASE requires adapting the initial boot * program. Since the linker has to swallow that define, we must use a pure * hex number here! */ @@ -96,8 +96,8 @@ #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) #define CONFIG_SYS_NAND_U_BOOT_SIZE SZ_512K -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_TEXT_BASE #define CONFIG_SYS_NAND_SIZE (SZ_256M) #define CONFIG_SYS_NAND_ECCSIZE 256 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 4758e23f557..a29652dd56e 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -22,7 +22,7 @@ #include <linux/sizes.h> /* - * Warning: changing CONFIG_SYS_TEXT_BASE requires + * Warning: changing CONFIG_TEXT_BASE requires * adapting the initial boot program. * Since the linker has to swallow that define, we must use a pure * hex number here! @@ -130,8 +130,8 @@ #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) #define CONFIG_SYS_NAND_U_BOOT_SIZE SZ_512K -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_TEXT_BASE #define CONFIG_SYS_NAND_SIZE (256 * SZ_1M) #define CONFIG_SYS_NAND_ECCSIZE 256 diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 2d1f0372ae3..05536c3eedc 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -123,7 +123,7 @@ /* General parts of the framework, required. */ #ifdef CONFIG_MTD_RAW_NAND -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE #endif #endif /* !CONFIG_NOR_BOOT */ diff --git a/include/configs/vocore2.h b/include/configs/vocore2.h index 6a7a0832c95..b2572caaf27 100644 --- a/include/configs/vocore2.h +++ b/include/configs/vocore2.h @@ -16,7 +16,7 @@ /* SPL */ -#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_START CONFIG_TEXT_BASE /* Dummy value */ #define CONFIG_SYS_UBOOT_BASE 0 diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 8d1eee2fcac..f53ea3ccd21 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -63,10 +63,10 @@ /* Use the framework and generic lib */ /* SPL will use serial */ /* SPL will load U-Boot from NAND offset 0x40000 */ -/* U-Boot will be 0x40000 bytes, loaded and run at CONFIG_SYS_TEXT_BASE */ +/* U-Boot will be 0x40000 bytes, loaded and run at CONFIG_TEXT_BASE */ #define CONFIG_SYS_MONITOR_LEN 0x40000 /* actually, MAX size */ -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_TEXT_BASE /* * Include SoC specific configuration diff --git a/include/image.h b/include/image.h index d7d6a3fe5b8..65d0d4f4387 100644 --- a/include/image.h +++ b/include/image.h @@ -58,6 +58,7 @@ enum ih_category { IH_COMP, IH_OS, IH_TYPE, + IH_PHASE, IH_COUNT, }; @@ -184,8 +185,7 @@ enum { * New IDs *MUST* be appended at the end of the list and *NEVER* * inserted for backward compatibility. */ - -enum { +enum image_type_t { IH_TYPE_INVALID = 0, /* Invalid Image */ IH_TYPE_STANDALONE, /* Standalone Program */ IH_TYPE_KERNEL, /* OS Kernel Image */ @@ -252,6 +252,59 @@ enum { IH_COMP_COUNT, }; +/** + * Phases - images intended for particular U-Boot phases (SPL, etc.) + * + * @IH_PHASE_NONE: No phase information, can be loaded by any phase + * @IH_PHASE_U_BOOT: Only for U-Boot proper + * @IH_PHASE_SPL: Only for SPL + */ +enum image_phase_t { + IH_PHASE_NONE = 0, + IH_PHASE_U_BOOT, + IH_PHASE_SPL, + + IH_PHASE_COUNT, +}; + +#define IMAGE_PHASE_SHIFT 8 +#define IMAGE_PHASE_MASK (0xff << IMAGE_PHASE_SHIFT) +#define IMAGE_TYPE_MASK 0xff + +/** + * image_ph() - build a composite value combining and type + * + * @phase: Image phase value + * @type: Image type value + * Returns: Composite value containing both + */ +static inline int image_ph(enum image_phase_t phase, enum image_type_t type) +{ + return type | (phase << IMAGE_PHASE_SHIFT); +} + +/** + * image_ph_phase() - obtain the phase from a composite phase/type value + * + * @image_ph_type: Composite value to convert + * Returns: Phase value taken from the composite value + */ +static inline int image_ph_phase(int image_ph_type) +{ + return (image_ph_type & IMAGE_PHASE_MASK) >> IMAGE_PHASE_SHIFT; +} + +/** + * image_ph_type() - obtain the type from a composite phase/type value + * + * @image_ph_type: Composite value to convert + * Returns: Type value taken from the composite value + */ +static inline int image_ph_type(int image_ph_type) +{ + return image_ph_type & IMAGE_TYPE_MASK; +} + #define LZ4F_MAGIC 0x184D2204 /* LZ4 Magic Number */ #define IH_MAGIC 0x27051956 /* Image Magic Number */ #define IH_NMLEN 32 /* Image Name Length */ @@ -438,6 +491,22 @@ const char *genimg_get_os_short_name(uint8_t comp); const char *genimg_get_arch_name(uint8_t arch); /** + * genimg_get_phase_name() - Get the friendly name for a phase + * + * @phase: Phase value to look up + * Returns: Friendly name for the phase (e.g. "U-Boot phase") + */ +const char *genimg_get_phase_name(enum image_phase_t phase); + +/** + * genimg_get_phase_id() - Convert a phase name to an ID + * + * @name: Name to convert (e.g. "u-boot") + * Returns: ID for that phase (e.g. IH_PHASE_U_BOOT) + */ +int genimg_get_phase_id(const char *name); + +/** * genimg_get_arch_short_name() - get the short name for an architecture * * @param arch Architecture type (IH_ARCH_...) @@ -622,9 +691,10 @@ int boot_get_fdt_fit(struct bootm_headers *images, ulong addr, * name (e.g. "conf-1") or NULL to use the default. On * exit points to the selected configuration name. * @param arch Expected architecture (IH_ARCH_...) - * @param image_type Required image type (IH_TYPE_...). If this is + * @param image_ph_type Required image type (IH_TYPE_...). If this is * IH_TYPE_KERNEL then we allow IH_TYPE_KERNEL_NOLOAD - * also. + * also. If a phase is required, this is included also, + * see image_phase_and_type() * @param bootstage_id ID of starting bootstage to use for progress updates. * This will be added to the BOOTSTAGE_SUB values when * calling bootstage_mark() @@ -635,7 +705,7 @@ int boot_get_fdt_fit(struct bootm_headers *images, ulong addr, */ int fit_image_load(struct bootm_headers *images, ulong addr, const char **fit_unamep, const char **fit_uname_configp, - int arch, int image_type, int bootstage_id, + int arch, int image_ph_type, int bootstage_id, enum fit_load_op load_op, ulong *datap, ulong *lenp); /** @@ -955,6 +1025,7 @@ int booti_setup(ulong image, ulong *relocated_addr, ulong *size, #define FIT_FPGA_PROP "fpga" #define FIT_FIRMWARE_PROP "firmware" #define FIT_STANDALONE_PROP "standalone" +#define FIT_PHASE_PROP "phase" #define FIT_MAX_HASH_LEN HASH_MAX_DIGEST_SIZE @@ -1206,6 +1277,47 @@ int fit_image_check_comp(const void *fit, int noffset, uint8_t comp); */ int fit_check_format(const void *fit, ulong size); +/** + * fit_conf_find_compat() - find most compatible configuration + * @fit: pointer to the FIT format image header + * @fdt: pointer to the device tree to compare against + * + * Attempts to find the configuration whose fdt is the most compatible with the + * passed in device tree + * + * Example:: + * + * / o image-tree + * |-o images + * | |-o fdt-1 + * | |-o fdt-2 + * | + * |-o configurations + * |-o config-1 + * | |-fdt = fdt-1 + * | + * |-o config-2 + * |-fdt = fdt-2 + * + * / o U-Boot fdt + * |-compatible = "foo,bar", "bim,bam" + * + * / o kernel fdt1 + * |-compatible = "foo,bar", + * + * / o kernel fdt2 + * |-compatible = "bim,bam", "baz,biz" + * + * Configuration 1 would be picked because the first string in U-Boot's + * compatible list, "foo,bar", matches a compatible string in the root of fdt1. + * "bim,bam" in fdt2 matches the second string which isn't as good as fdt1. + * + * As an optimization, the compatible property from the FDT's root node can be + * copied into the configuration node in the FIT image. This is required to + * match configurations with compressed FDTs. + * + * Returns: offset to the configuration to use if one was found, -1 otherwise + */ int fit_conf_find_compat(const void *fit, const void *fdt); /** @@ -1238,14 +1350,15 @@ int fit_conf_get_prop_node_index(const void *fit, int noffset, * @fit: FIT to check * @noffset: Offset of conf@xxx node to check * @prop_name: Property to read from the conf node + * @phase: Image phase to use, IH_PHASE_NONE for any * * The conf- nodes contain references to other nodes, using properties * like 'kernel = "kernel"'. Given such a property name (e.g. "kernel"), * return the offset of the node referred to (e.g. offset of node * "/images/kernel". */ -int fit_conf_get_prop_node(const void *fit, int noffset, - const char *prop_name); +int fit_conf_get_prop_node(const void *fit, int noffset, const char *prop_name, + enum image_phase_t phase); int fit_check_ramdisk(const void *fit, int os_noffset, uint8_t arch, int verify); diff --git a/include/part.h b/include/part.h index 6f604e7315a..807370d9429 100644 --- a/include/part.h +++ b/include/part.h @@ -313,12 +313,42 @@ struct udevice; */ int part_create_block_devices(struct udevice *blk_dev); -unsigned long dev_read(struct udevice *dev, lbaint_t start, - lbaint_t blkcnt, void *buffer); -unsigned long dev_write(struct udevice *dev, lbaint_t start, - lbaint_t blkcnt, const void *buffer); -unsigned long dev_erase(struct udevice *dev, lbaint_t start, - lbaint_t blkcnt); +/** + * disk_blk_read() - read blocks from a disk partition + * + * @dev: Device to read from (UCLASS_PARTITION) + * @start: Start block number to read in the partition (0=first) + * @blkcnt: Number of blocks to read + * @buffer: Destination buffer for data read + * Returns: number of blocks read, or -ve error number (see the + * IS_ERR_VALUE() macro + */ +ulong disk_blk_read(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, + void *buffer); + +/** + * disk_blk_write() - write to a disk partition + * + * @dev: Device to write to (UCLASS_PARTITION) + * @start: Start block number to write in the partition (0=first) + * @blkcnt: Number of blocks to write + * @buffer: Source buffer for data to write + * Returns: number of blocks written, or -ve error number (see the + * IS_ERR_VALUE() macro + */ +ulong disk_blk_write(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, + const void *buffer); + +/** + * disk_blk_erase() - erase a section of a disk partition + * + * @dev: Device to (partially) erase (UCLASS_PARTITION) + * @start: Start block number to erase in the partition (0=first) + * @blkcnt: Number of blocks to erase + * Returns: number of blocks erased, or -ve error number (see the + * IS_ERR_VALUE() macro + */ +ulong disk_blk_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt); /* * We don't support printing partition information in SPL and only support diff --git a/include/scsi.h b/include/scsi.h index 94e1d8ccb28..9efefea99bb 100644 --- a/include/scsi.h +++ b/include/scsi.h @@ -255,6 +255,16 @@ struct __packed scsi_read10_req { u8 spare2[3]; }; +/** struct scsi_write10_req - data for the write10 command */ +struct __packed scsi_write10_req { + u8 cmd; + u8 lun_flags; + u32 lba; + u8 spare; + u16 xfer_len; + u8 spare2[3]; +}; + /** * struct scsi_plat - stores information about SCSI controller * diff --git a/include/scsi_emul.h b/include/scsi_emul.h index 13c3f860b40..d439f7c00c2 100644 --- a/include/scsi_emul.h +++ b/include/scsi_emul.h @@ -41,13 +41,20 @@ struct scsi_emul_info { enum scsi_cmd_phase phase; int buff_used; int read_len; + int write_len; uint seek_pos; int alloc_len; uint transfer_len; }; -/* Indicates that a read is being started */ -#define SCSI_EMUL_DO_READ 1 +/** + * Return value from sb_scsi_emul_command() indicates that a read or write is + * being started + */ +enum { + SCSI_EMUL_DO_READ = 1, + SCSI_EMUL_DO_WRITE = 2, +}; /** * sb_scsi_emul_command() - Process a SCSI command @@ -61,8 +68,9 @@ struct scsi_emul_info { * @info: Emulation information * @req: Request to process * @len: Length of request in bytes - * @return SCSI_EMUL_DO_READ if a read has started, 0 if some other operation - * has started, -ve if there was an error + * @return SCSI_EMUL_DO_READ if a read has started, SCSI_EMUL_DO_WRITE if a + * write has started, 0 if some other operation has started, -ve if there + * was an error */ int sb_scsi_emul_command(struct scsi_emul_info *info, const struct scsi_cmd *req, int len); diff --git a/include/spl.h b/include/spl.h index 303a657bf5c..3eb27de6166 100644 --- a/include/spl.h +++ b/include/spl.h @@ -66,6 +66,8 @@ enum u_boot_phase { PHASE_SPL, /* Running in SPL */ PHASE_BOARD_F, /* Running in U-Boot before relocation */ PHASE_BOARD_R, /* Running in U-Boot after relocation */ + + PHASE_COUNT, }; /** @@ -228,6 +230,18 @@ static inline const char *spl_phase_prefix(enum u_boot_phase phase) # define SPL_TPL_PROMPT "" #endif +/** + * enum spl_sandbox_flags - flags for sandbox's use of spl_image_info->flags + * + * @SPL_SANDBOXF_ARG_IS_FNAME: arg is the filename to jump to (default) + * @SPL_SANDBOXF_ARG_IS_BUF: arg is the containing image to jump to, @offset is + * the start offset within the image, @size is the size of the image + */ +enum spl_sandbox_flags { + SPL_SANDBOXF_ARG_IS_FNAME = 0, + SPL_SANDBOXF_ARG_IS_BUF, +}; + struct spl_image_info { const char *name; u8 os; @@ -286,10 +300,10 @@ struct spl_load_info { */ binman_sym_extern(ulong, u_boot_any, image_pos); binman_sym_extern(ulong, u_boot_any, size); -binman_sym_extern(ulong, u_boot_spl, image_pos); -binman_sym_extern(ulong, u_boot_spl, size); -binman_sym_extern(ulong, u_boot_vpl, image_pos); -binman_sym_extern(ulong, u_boot_vpl, size); +binman_sym_extern(ulong, u_boot_spl_any, image_pos); +binman_sym_extern(ulong, u_boot_spl_any, size); +binman_sym_extern(ulong, u_boot_vpl_any, image_pos); +binman_sym_extern(ulong, u_boot_vpl_any, size); /** * spl_get_image_pos() - get the image position of the next phase @@ -309,7 +323,7 @@ ulong spl_get_image_size(void); * spl_get_image_text_base() - get the text base of the next phase * * This returns the address that the next stage is linked to run at, i.e. - * CONFIG_SPL_TEXT_BASE or CONFIG_SYS_TEXT_BASE + * CONFIG_SPL_TEXT_BASE or CONFIG_TEXT_BASE * * Return: text-base address */ @@ -457,7 +471,7 @@ void spl_set_bd(void); * * This sets up the given spl_image which the standard values obtained from * config options: CONFIG_SYS_MONITOR_LEN, CONFIG_SYS_UBOOT_START, - * CONFIG_SYS_TEXT_BASE. + * CONFIG_TEXT_BASE. * * @spl_image: Image description to set up */ diff --git a/include/test/test.h b/include/test/test.h index 3bbd77c38b5..4ad74614afc 100644 --- a/include/test/test.h +++ b/include/test/test.h @@ -13,6 +13,7 @@ * struct unit_test_state - Entire state of test system * * @fail_count: Number of tests that failed + * @skip_count: Number of tests that were skipped * @start: Store the starting mallinfo when doing leak test * @of_live: true to use livetree if available, false to use flattree * @of_root: Record of the livetree root node (used for setting up tests) @@ -27,11 +28,13 @@ * @other_fdt_size: Size of the other FDT (UT_TESTF_OTHER_FDT) * @of_other: Live tree for the other FDT * @runs_per_test: Number of times to run each test (typically 1) + * @force_run: true to run tests marked with the UT_TESTF_MANUAL flag * @expect_str: Temporary string used to hold expected string value * @actual_str: Temporary string used to hold actual string value */ struct unit_test_state { int fail_count; + int skip_count; struct mallinfo start; struct device_node *of_root; bool of_live; @@ -46,6 +49,7 @@ struct unit_test_state { int other_fdt_size; struct device_node *of_other; int runs_per_test; + bool force_run; char expect_str[512]; char actual_str[512]; }; @@ -61,6 +65,12 @@ enum { /* do extra driver model init and uninit */ UT_TESTF_DM = BIT(6), UT_TESTF_OTHER_FDT = BIT(7), /* read in other device tree */ + /* + * Only run if explicitly requested with 'ut -f <suite> <test>'. The + * test name must end in "_norun" so that pytest detects this also, + * since it cannot access the flags. + */ + UT_TESTF_MANUAL = BIT(8), }; /** diff --git a/include/test/ut.h b/include/test/ut.h index f7217aa8ac5..e0e618b58c2 100644 --- a/include/test/ut.h +++ b/include/test/ut.h @@ -409,9 +409,11 @@ void test_set_state(struct unit_test_state *uts); * @select_name: Name of a single test to run (from the list provided). If NULL * then all tests are run * @runs_per_test: Number of times to run each test (typically 1) + * @force_run: Run tests that are marked as manual-only (UT_TESTF_MANUAL) * Return: 0 if all tests passed, -1 if any failed */ int ut_run_list(const char *name, const char *prefix, struct unit_test *tests, - int count, const char *select_name, int runs_per_test); + int count, const char *select_name, int runs_per_test, + bool force_run); #endif diff --git a/include/vbe.h b/include/vbe.h index b83f6f0c519..5ede8181b98 100644 --- a/include/vbe.h +++ b/include/vbe.h @@ -11,6 +11,43 @@ #define __VBE_H /** + * enum vbe_phase_t - current phase of VBE + * + * VBE operates in two distinct phases. In VPL it has to choose which firmware + * to run (SPL, U-Boot, OP-TEE, etc.). It then carries on running until it gets + * to U-Boot, where it decides which OS to run + * + * @VBE_PHASE_FIRMWARE: Selecting the firmware to run + * @VBE_PHASE_OS: Selecting the Operating System to run + */ +enum vbe_phase_t { + VBE_PHASE_FIRMWARE, + VBE_PHASE_OS, +}; + +/** + * struct vbe_handoff - information about VBE progress + * + * @phases: Indicates which phases used the VBE bootmeth (1 << PHASE_...) + */ +struct vbe_handoff { + u8 phases; +}; + +/** + * vbe_phase() - get current VBE phase + * + * Returns: Current VBE phase + */ +static inline enum vbe_phase_t vbe_phase(void) +{ + if (IS_ENABLED(CONFIG_SPL_BUILD)) + return VBE_PHASE_FIRMWARE; + + return VBE_PHASE_OS; +} + +/** * vbe_list() - List the VBE bootmeths * * This shows a list of the VBE bootmeth devices diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c index a35fce13855..c9eb32ec104 100644 --- a/lib/efi/efi_stub.c +++ b/lib/efi/efi_stub.c @@ -126,7 +126,7 @@ static void jump_to_uboot(ulong cs32, ulong addr, ulong info) ((func_t)addr)(0, 0, info); #else - cpu_call32(cs32, CONFIG_SYS_TEXT_BASE, info); + cpu_call32(cs32, CONFIG_TEXT_BASE, info); #endif } @@ -184,8 +184,8 @@ static int get_codeseg32(void) if ((desc & GDT_PRESENT) && (desc & GDT_NOTSYS) && !(desc & GDT_LONG) && (desc & GDT_4KB) && (desc & GDT_32BIT) && (desc & GDT_CODE) && - CONFIG_SYS_TEXT_BASE > base && - CONFIG_SYS_TEXT_BASE + CONFIG_SYS_MONITOR_LEN < limit + CONFIG_TEXT_BASE > base && + CONFIG_TEXT_BASE + CONFIG_SYS_MONITOR_LEN < limit ) { cs32 = i; break; @@ -360,7 +360,7 @@ efi_status_t EFIAPI efi_main(efi_handle_t image, priv->memmap_desc, priv->memmap_size); add_entry_addr(priv, EFIET_END, NULL, 0, 0, 0); - memcpy((void *)CONFIG_SYS_TEXT_BASE, _binary_u_boot_bin_start, + memcpy((void *)CONFIG_TEXT_BASE, _binary_u_boot_bin_start, (ulong)_binary_u_boot_bin_end - (ulong)_binary_u_boot_bin_start); @@ -371,7 +371,7 @@ efi_status_t EFIAPI efi_main(efi_handle_t image, printhex8(priv->info->total_size); #endif putc('\n'); - jump_to_uboot(cs32, CONFIG_SYS_TEXT_BASE, (ulong)priv->info); + jump_to_uboot(cs32, CONFIG_TEXT_BASE, (ulong)priv->info); return EFI_LOAD_ERROR; } diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index cef4e45124e..f11722db2ce 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -123,9 +123,11 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, if (CONFIG_IS_ENABLED(PARTITIONS) && device_get_uclass_id(diskobj->header.dev) == UCLASS_PARTITION) { if (direction == EFI_DISK_READ) - n = dev_read(diskobj->header.dev, lba, blocks, buffer); + n = disk_blk_read(diskobj->header.dev, lba, blocks, + buffer); else - n = dev_write(diskobj->header.dev, lba, blocks, buffer); + n = disk_blk_write(diskobj->header.dev, lba, blocks, + buffer); } else { /* dev is a block device (UCLASS_BLK) */ struct blk_desc *desc; diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index 93a695fc27e..ad2ab825d19 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -672,12 +672,12 @@ void efi_runtime_relocate(ulong offset, struct efi_mem_desc *map) struct elf_rela *rel = (void*)&__efi_runtime_rel_start; #else struct elf_rel *rel = (void*)&__efi_runtime_rel_start; - static ulong lastoff = CONFIG_SYS_TEXT_BASE; + static ulong lastoff = CONFIG_TEXT_BASE; #endif debug("%s: Relocating to offset=%lx\n", __func__, offset); for (; (ulong)rel < (ulong)&__efi_runtime_rel_stop; rel++) { - ulong base = CONFIG_SYS_TEXT_BASE; + ulong base = CONFIG_TEXT_BASE; ulong *p; ulong newaddr; @@ -696,7 +696,7 @@ void efi_runtime_relocate(ulong offset, struct efi_mem_desc *map) switch (rel->info & R_MASK) { case R_RELATIVE: #ifdef IS_RELA - newaddr = rel->addend + offset - CONFIG_SYS_TEXT_BASE; + newaddr = rel->addend + offset - CONFIG_TEXT_BASE; #else newaddr = *p - lastoff + offset; #endif @@ -707,7 +707,7 @@ void efi_runtime_relocate(ulong offset, struct efi_mem_desc *map) extern struct dyn_sym __dyn_sym_start[]; newaddr = __dyn_sym_start[symidx].addr + offset; #ifdef IS_RELA - newaddr -= CONFIG_SYS_TEXT_BASE; + newaddr -= CONFIG_TEXT_BASE; #endif break; } diff --git a/lib/trace.c b/lib/trace.c index 505a31806ce..54f0bf2f578 100644 --- a/lib/trace.c +++ b/lib/trace.c @@ -53,7 +53,7 @@ static inline uintptr_t __attribute__((no_instrument_function)) if (gd->flags & GD_FLG_RELOC) offset -= gd->relocaddr; else - offset -= CONFIG_SYS_TEXT_BASE; + offset -= CONFIG_TEXT_BASE; #endif return offset / FUNC_SITE_SIZE; } @@ -123,7 +123,7 @@ static void __attribute__((no_instrument_function)) add_textbase(void) if (hdr->ftrace_count < hdr->ftrace_size) { struct trace_call *rec = &hdr->ftrace[hdr->ftrace_count]; - rec->func = CONFIG_SYS_TEXT_BASE; + rec->func = CONFIG_TEXT_BASE; rec->caller = 0; rec->flags = FUNCF_TEXTBASE; } diff --git a/test/boot/Makefile b/test/boot/Makefile index 5bb3f889759..d724629d3b0 100644 --- a/test/boot/Makefile +++ b/test/boot/Makefile @@ -3,6 +3,7 @@ # Copyright 2021 Google LLC obj-$(CONFIG_BOOTSTD) += bootdev.o bootstd_common.o bootflow.o bootmeth.o +obj-$(CONFIG_FIT) += image.o ifdef CONFIG_OF_LIVE obj-$(CONFIG_BOOTMETH_VBE_SIMPLE) += vbe_simple.o diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index 1e8ea754bcd..e1e07082105 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -330,7 +330,7 @@ static int bootflow_system(struct unit_test_state *uts) struct udevice *dev; if (!IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) - return 0; + return -EAGAIN; ut_assertok(uclass_get_device_by_name(UCLASS_BOOTMETH, "efi_mgr", &dev)); sandbox_set_fake_efi_mgr_dev(dev, true); @@ -395,7 +395,7 @@ BOOTSTD_TEST(bootflow_iter_disable, UT_TESTF_DM | UT_TESTF_SCAN_FDT); static int bootflow_scan_glob_bootmeth(struct unit_test_state *uts) { if (!IS_ENABLED(CONFIG_BOOTMETH_GLOBAL)) - return 0; + return -EAGAIN; ut_assertok(bootstd_test_drop_bootdev_order(uts)); diff --git a/test/boot/bootmeth.c b/test/boot/bootmeth.c index f0b5ab9adb3..0098ef3efd0 100644 --- a/test/boot/bootmeth.c +++ b/test/boot/bootmeth.c @@ -103,10 +103,17 @@ static int bootmeth_cmd_order(struct unit_test_state *uts) ut_asserteq_str("efi syslinux", env_get("bootmeths")); ut_assert_console_end(); - /* Try with global bootmeths */ + return 0; +} +BOOTSTD_TEST(bootmeth_cmd_order, UT_TESTF_DM | UT_TESTF_SCAN_FDT); + +/* Check 'bootmeth order' command with global bootmeths */ +static int bootmeth_cmd_order_glob(struct unit_test_state *uts) +{ if (!IS_ENABLED(CONFIG_BOOTMETH_GLOBAL)) - return 0; + return -EAGAIN; + console_record_reset_enable(); ut_assertok(run_command("bootmeth order \"efi firmware0\"", 0)); ut_assert_console_end(); ut_assertok(run_command("bootmeth list", 0)); @@ -122,7 +129,7 @@ static int bootmeth_cmd_order(struct unit_test_state *uts) return 0; } -BOOTSTD_TEST(bootmeth_cmd_order, UT_TESTF_DM | UT_TESTF_SCAN_FDT); +BOOTSTD_TEST(bootmeth_cmd_order_glob, UT_TESTF_DM | UT_TESTF_SCAN_FDT); /* Check 'bootmeths' env var */ static int bootmeth_env(struct unit_test_state *uts) diff --git a/test/boot/image.c b/test/boot/image.c new file mode 100644 index 00000000000..2844b057859 --- /dev/null +++ b/test/boot/image.c @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Test for vbe-simple bootmeth. All start with 'vbe_simple' + * + * Copyright 2023 Google LLC + * Written by Simon Glass <sjg@chromium.org> + */ + +#include <common.h> +#include <image.h> +#include <test/suites.h> +#include <test/ut.h> +#include "bootstd_common.h" + +/* Test of image phase */ +static int test_image_phase(struct unit_test_state *uts) +{ + int val; + + ut_asserteq_str("U-Boot phase", genimg_get_phase_name(IH_PHASE_U_BOOT)); + ut_asserteq_str("SPL Phase", genimg_get_phase_name(IH_PHASE_SPL)); + ut_asserteq_str("any", genimg_get_phase_name(IH_PHASE_NONE)); + ut_asserteq_str("Unknown Phase", genimg_get_phase_name(-1)); + + ut_asserteq(IH_PHASE_U_BOOT, genimg_get_phase_id("u-boot")); + ut_asserteq(IH_PHASE_SPL, genimg_get_phase_id("spl")); + ut_asserteq(IH_PHASE_NONE, genimg_get_phase_id("none")); + ut_asserteq(-1, genimg_get_phase_id("fred")); + + val = image_ph(IH_PHASE_SPL, IH_TYPE_FIRMWARE); + ut_asserteq(IH_PHASE_SPL, image_ph_phase(val)); + ut_asserteq(IH_TYPE_FIRMWARE, image_ph_type(val)); + + return 0; +} +BOOTSTD_TEST(test_image_phase, 0); diff --git a/test/boot/vbe_fixup.c b/test/boot/vbe_fixup.c index 1b488e25ab6..eba5c4ebe6c 100644 --- a/test/boot/vbe_fixup.c +++ b/test/boot/vbe_fixup.c @@ -13,21 +13,18 @@ #include <test/ut.h> #include "bootstd_common.h" -/* Basic test of reading nvdata and updating a fwupd node in the device tree */ -static int vbe_test_fixup(struct unit_test_state *uts) +/* + * Basic test of reading nvdata and updating a fwupd node in the device tree + * This test works when called from test_vbe.py and it must use the flat tree, + * since device tree fix-ups do not yet support live tree. + */ +static int vbe_test_fixup_norun(struct unit_test_state *uts) { ofnode chosen, node; const char *data; oftree tree; int size; - /* - * This test works when called from test_vbe.py and it must use the - * flat tree, since device tree fix-ups do not yet support live tree. - */ - if (!working_fdt) - return 0; - tree = oftree_from_fdt(working_fdt); ut_assert(oftree_valid(tree)); @@ -55,5 +52,5 @@ static int vbe_test_fixup(struct unit_test_state *uts) return 0; } -BOOTSTD_TEST(vbe_test_fixup, - UT_TESTF_DM | UT_TESTF_SCAN_FDT | UT_TESTF_FLAT_TREE); +BOOTSTD_TEST(vbe_test_fixup_norun, UT_TESTF_DM | UT_TESTF_SCAN_FDT | + UT_TESTF_FLAT_TREE | UT_TESTF_MANUAL); diff --git a/test/boot/vbe_simple.c b/test/boot/vbe_simple.c index faba9e8f90b..5e61840652c 100644 --- a/test/boot/vbe_simple.c +++ b/test/boot/vbe_simple.c @@ -16,7 +16,12 @@ #include <test/ut.h> #include "bootstd_common.h" -/* Basic test of reading nvdata and updating a fwupd node in the device tree */ +/* + * Basic test of reading nvdata and updating a fwupd node in the device tree + * + * This sets up its own VBE info in the device, using bootstd_setup_for_tests() + * then does a VBE fixup and checks that everything is present. + */ static int vbe_simple_test_base(struct unit_test_state *uts) { const char *version, *bl_version; @@ -77,7 +82,7 @@ static int vbe_simple_test_base(struct unit_test_state *uts) bl_version = ofnode_read_string(node, "bootloader-version"); ut_assertnonnull(bl_version); - ut_asserteq_str(version_string, bl_version); + ut_asserteq_str(version_string + 7, bl_version); return 0; } diff --git a/test/cmd_ut.c b/test/cmd_ut.c index dc88c5fb88c..beebd5ce381 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -19,16 +19,26 @@ int cmd_ut_category(const char *name, const char *prefix, int argc, char *const argv[]) { int runs_per_text = 1; + bool force_run = false; int ret; - if (argc > 1 && !strncmp("-r", argv[1], 2)) { - runs_per_text = dectoul(argv[1] + 2, NULL); + while (argc > 1 && *argv[1] == '-') { + const char *str = argv[1]; + + switch (str[1]) { + case 'r': + runs_per_text = dectoul(str + 2, NULL); + break; + case 'f': + force_run = true; + break; + } argv++; argc++; } ret = ut_run_list(name, prefix, tests, n_ents, - argc > 1 ? argv[1] : NULL, runs_per_text); + argc > 1 ? argv[1] : NULL, runs_per_text, force_run); return ret ? CMD_RET_FAILURE : 0; } diff --git a/test/dm/of_platdata.c b/test/dm/of_platdata.c index 7af798b8d35..a241c427936 100644 --- a/test/dm/of_platdata.c +++ b/test/dm/of_platdata.c @@ -150,7 +150,7 @@ static int dm_test_of_plat_dev(struct unit_test_state *uts) /* Skip this test if there is no platform data */ if (!CONFIG_IS_ENABLED(OF_PLATDATA_DRIVER_RT)) - return 0; + return -EAGAIN; /* Record the indexes that are found */ memset(found, '\0', sizeof(found)); diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index 41811ec3bb5..8077affabb7 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -753,10 +753,7 @@ static int make_ofnode_fdt(struct unit_test_state *uts, void *fdt, int size, static int dm_test_ofnode_root(struct unit_test_state *uts) { - char fdt[256]; - oftree tree; ofnode node; - int ret; /* Check that aliases work on the control FDT */ node = ofnode_get_aliases_node("ethernet3"); @@ -765,14 +762,22 @@ static int dm_test_ofnode_root(struct unit_test_state *uts) ut_assert(!oftree_valid(oftree_null())); - ut_assertok(make_ofnode_fdt(uts, fdt, sizeof(fdt), 0)); - ret = get_oftree(uts, fdt, &tree); + return 0; +} +DM_TEST(dm_test_ofnode_root, UT_TESTF_SCAN_FDT); - /* skip the rest of this test if multiple FDTs are not supported */ - if (ret == -EOVERFLOW) - return 0; +static int dm_test_ofnode_root_mult(struct unit_test_state *uts) +{ + char fdt[256]; + oftree tree; + ofnode node; - ut_assertok(ret); + /* skip this test if multiple FDTs are not supported */ + if (!IS_ENABLED(CONFIG_OFNODE_MULTI_TREE)) + return -EAGAIN; + + ut_assertok(make_ofnode_fdt(uts, fdt, sizeof(fdt), 0)); + ut_assertok(get_oftree(uts, fdt, &tree)); ut_assert(oftree_valid(tree)); /* Make sure they don't work on this new tree */ @@ -791,7 +796,7 @@ static int dm_test_ofnode_root(struct unit_test_state *uts) return 0; } -DM_TEST(dm_test_ofnode_root, UT_TESTF_SCAN_FDT); +DM_TEST(dm_test_ofnode_root_mult, UT_TESTF_SCAN_FDT); static int dm_test_ofnode_livetree_writing(struct unit_test_state *uts) { diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c index eb3581333b9..66cc2bc6cce 100644 --- a/test/dm/test-dm.c +++ b/test/dm/test-dm.c @@ -36,7 +36,7 @@ static int dm_test_run(const char *test_name, int runs_per_text) int ret; ret = ut_run_list("driver model", "dm_test_", tests, n_ents, test_name, - runs_per_text); + runs_per_text, false); return ret ? CMD_RET_FAILURE : 0; } diff --git a/test/dm/usb.c b/test/dm/usb.c index 5d6ceefce0b..7671ef156d8 100644 --- a/test/dm/usb.c +++ b/test/dm/usb.c @@ -43,20 +43,42 @@ DM_TEST(dm_test_usb_base, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); */ static int dm_test_usb_flash(struct unit_test_state *uts) { - struct udevice *dev; - struct blk_desc *dev_desc; + struct blk_desc *dev_desc, *chk; + struct udevice *dev, *blk; char cmp[1024]; state_set_skip_delays(true); ut_assertok(usb_init()); ut_assertok(uclass_get_device(UCLASS_MASS_STORAGE, 0, &dev)); ut_assertok(blk_get_device_by_str("usb", "0", &dev_desc)); + chk = blk_get_by_device(dev); + ut_asserteq_ptr(chk, dev_desc); + + ut_assertok(device_find_first_child_by_uclass(dev, UCLASS_BLK, &blk)); + ut_asserteq_ptr(chk, blk_get_by_device(dev)); /* Read a few blocks and look for the string we expect */ ut_asserteq(512, dev_desc->blksz); memset(cmp, '\0', sizeof(cmp)); - ut_asserteq(2, blk_dread(dev_desc, 0, 2, cmp)); - ut_assertok(strcmp(cmp, "this is a test")); + ut_asserteq(2, blk_read(blk, 0, 2, cmp)); + ut_asserteq_str("this is a test", cmp); + + strcpy(cmp, "another test"); + ut_asserteq(1, blk_write(blk, 1, 1, cmp)); + + memset(cmp, '\0', sizeof(cmp)); + ut_asserteq(2, blk_read(blk, 0, 2, cmp)); + ut_asserteq_str("this is a test", cmp); + ut_asserteq_str("another test", cmp + 512); + + memset(cmp, '\0', sizeof(cmp)); + ut_asserteq(1, blk_write(blk, 1, 1, cmp)); + + memset(cmp, '\0', sizeof(cmp)); + ut_asserteq(2, blk_read(blk, 0, 2, cmp)); + ut_asserteq_str("this is a test", cmp); + ut_asserteq_str("", cmp + 512); + ut_assertok(usb_stop()); return 0; diff --git a/test/py/conftest.py b/test/py/conftest.py index 304e93164aa..fc9dd3a83f8 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -289,7 +289,13 @@ def generate_ut_subtest(metafunc, fixture_name, sym_path): m = re_ut_test_list.search(l) if not m: continue - vals.append(m.group(1) + ' ' + m.group(2)) + suite, name = m.groups() + + # Tests marked with _norun should only be run manually using 'ut -f' + if name.endswith('_norun'): + continue + + vals.append(f'{suite} {name}') ids = ['ut_' + s.replace(' ', '_') for s in vals] metafunc.parametrize(fixture_name, vals, ids=ids) diff --git a/test/py/tests/test_event_dump.py b/test/py/tests/test_event_dump.py index 674df2ea001..1a46ca30f42 100644 --- a/test/py/tests/test_event_dump.py +++ b/test/py/tests/test_event_dump.py @@ -16,7 +16,7 @@ def test_event_dump(u_boot_console): out = util.run_and_log(cons, ['scripts/event_dump.py', sandbox]) expect = '''.*Event type Id Source location -------------------- ------------------------------ ------------------------------ -EVT_FT_FIXUP bootmeth_vbe_ft_fixup .*vbe_fixup.c:.* -EVT_FT_FIXUP bootmeth_vbe_simple_ft_fixup .*vbe_simple.c:.* +EVT_FT_FIXUP bootmeth_vbe_ft_fixup .*vbe_request.c:.* +EVT_FT_FIXUP bootmeth_vbe_simple_ft_fixup .*vbe_simple_os.c:.* EVT_MISC_INIT_F sandbox_misc_init_f .*start.c:''' assert re.match(expect, out, re.MULTILINE) is not None diff --git a/test/py/tests/test_vbe.py b/test/py/tests/test_vbe.py index 559c2918868..50b6c1cd911 100644 --- a/test/py/tests/test_vbe.py +++ b/test/py/tests/test_vbe.py @@ -85,7 +85,7 @@ bootm loados bootm prep fdt addr fdt print -ut bootstd vbe_test_fixup +ut bootstd -f vbe_test_fixup_norun ''' @pytest.mark.boardspec('sandbox_flattree') @@ -117,7 +117,4 @@ def test_vbe(u_boot_console): with cons.log.section('Kernel load'): output = cons.run_command_list(cmd.splitlines()) - # This is a little wonky since there are two tests running in CI. The final - # one is the 'ut bootstd' command above - failures = [line for line in output if 'Failures' in line] - assert len(failures) >= 1 and 'Failures: 0' in failures[-1] + assert 'Failures: 0' in output[-1] diff --git a/test/py/tests/test_vbe_vpl.py b/test/py/tests/test_vbe_vpl.py new file mode 100644 index 00000000000..d1c9d0548ae --- /dev/null +++ b/test/py/tests/test_vbe_vpl.py @@ -0,0 +1,38 @@ +# SPDX-License-Identifier: GPL-2.0+ +# Copyright 2022 Google LLC +# +# Test addition of VBE + +import os + +import pytest +import u_boot_utils + +@pytest.mark.boardspec('sandbox_vpl') +@pytest.mark.requiredtool('dtc') +def test_vbe_vpl(u_boot_console): + cons = u_boot_console + #cmd = [cons.config.build_dir + fname, '-v'] + ram = os.path.join(cons.config.build_dir, 'ram.bin') + fdt = os.path.join(cons.config.build_dir, 'arch/sandbox/dts/test.dtb') + + # Enable firmware1 and the mmc that it uses. These are needed for the full + # VBE flow. + u_boot_utils.run_and_log( + cons, f'fdtput -t s {fdt} /bootstd/firmware0 status disabled') + u_boot_utils.run_and_log( + cons, f'fdtput -t s {fdt} /bootstd/firmware1 status okay') + u_boot_utils.run_and_log( + cons, f'fdtput -t s {fdt} /mmc3 status okay') + + # Remove any existing RAM file, so we don't have old data present + if os.path.exists(ram): + os.remove(ram) + flags = ['-p', os.path.join(cons.config.build_dir, 'image.bin'), '-w', + '-s', 'state.dtb'] + cons.restart_uboot_with_flags(flags) + + # Make sure that VBE was used in both VPL (to load SPL) and SPL (to load + # U-Boot + output = cons.run_command('vbe state') + assert output == 'Phases: VPL SPL' diff --git a/test/test-main.c b/test/test-main.c index a98a77d68fc..ddfd89c089a 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -357,6 +357,19 @@ static int test_post_run(struct unit_test_state *uts, struct unit_test *test) } /** + * skip_test() - Handle skipping a test + * + * @uts: Test state to update + * @return -EAGAIN (always) + */ +static int skip_test(struct unit_test_state *uts) +{ + uts->skip_count++; + + return -EAGAIN; +} + +/** * ut_run_test() - Run a single test * * This runs the test, handling any preparation and clean-up needed. It prints @@ -386,11 +399,13 @@ static int ut_run_test(struct unit_test_state *uts, struct unit_test *test, ret = test_pre_run(uts, test); if (ret == -EAGAIN) - return -EAGAIN; + return skip_test(uts); if (ret) return ret; - test->func(uts); + ret = test->func(uts); + if (ret == -EAGAIN) + skip_test(uts); ret = test_post_run(uts, test); if (ret) @@ -424,7 +439,7 @@ static int ut_run_test_live_flat(struct unit_test_state *uts, int runs; if ((test->flags & UT_TESTF_OTHER_FDT) && !IS_ENABLED(CONFIG_SANDBOX)) - return -EAGAIN; + return skip_test(uts); /* Run with the live tree if possible */ runs = 0; @@ -493,6 +508,30 @@ static int ut_run_tests(struct unit_test_state *uts, const char *prefix, if (!test_matches(prefix, test_name, select_name)) continue; + + if (test->flags & UT_TESTF_MANUAL) { + int len; + + /* + * manual tests must have a name ending "_norun" as this + * is how pytest knows to skip them. See + * generate_ut_subtest() for this check. + */ + len = strlen(test_name); + if (len < 6 || strcmp(test_name + len - 6, "_norun")) { + printf("Test %s is manual so must have a name ending in _norun\n", + test_name); + uts->fail_count++; + return -EBADF; + } + if (!uts->force_run) { + if (select_name) { + printf("Test %s skipped as it is manual (use -f to run it)\n", + test_name); + } + continue; + } + } old_fail_count = uts->fail_count; for (i = 0; i < uts->runs_per_test; i++) ret = ut_run_test_live_flat(uts, test, select_name); @@ -514,7 +553,7 @@ static int ut_run_tests(struct unit_test_state *uts, const char *prefix, int ut_run_list(const char *category, const char *prefix, struct unit_test *tests, int count, const char *select_name, - int runs_per_test) + int runs_per_test, bool force_run) { struct unit_test_state uts = { .fail_count = 0 }; bool has_dm_tests = false; @@ -548,6 +587,7 @@ int ut_run_list(const char *category, const char *prefix, } memcpy(uts.fdt_copy, gd->fdt_blob, uts.fdt_size); } + uts.force_run = force_run; ret = ut_run_tests(&uts, prefix, tests, count, select_name); /* Best efforts only...ignore errors */ @@ -558,6 +598,8 @@ int ut_run_list(const char *category, const char *prefix, os_free(uts.other_fdt); } + if (uts.skip_count) + printf("Skipped: %d, ", uts.skip_count); if (ret == -ENOENT) printf("Test '%s' not found\n", select_name); else diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst index d8a3d776f46..fda16f1992d 100644 --- a/tools/binman/binman.rst +++ b/tools/binman/binman.rst @@ -766,11 +766,11 @@ end-at-4gb: skip-at-start: This property specifies the entry offset of the first entry. - For PowerPC mpc85xx based CPU, CONFIG_SYS_TEXT_BASE is the entry + For PowerPC mpc85xx based CPU, CONFIG_TEXT_BASE is the entry offset of the first entry. It can be 0xeff40000 or 0xfff40000 for nor flash boot, 0x201000 for sd boot etc. - 'end-at-4gb' property is not applicable where CONFIG_SYS_TEXT_BASE + + 'end-at-4gb' property is not applicable where CONFIG_TEXT_BASE + Image size != 4gb. align-default: diff --git a/tools/binman/elf.py b/tools/binman/elf.py index 6d440ddf21d..fe50bf542c3 100644 --- a/tools/binman/elf.py +++ b/tools/binman/elf.py @@ -188,7 +188,29 @@ def GetSymbolAddress(fname, sym_name): return None return sym.address -def LookupAndWriteSymbols(elf_fname, entry, section): +def GetPackString(sym, msg): + """Get the struct.pack/unpack string to use with a given symbol + + Args: + sym (Symbol): Symbol to check. Only the size member is checked + @msg (str): String which indicates the entry being processed, used for + errors + + Returns: + str: struct string to use, .e.g. '<I' + + Raises: + ValueError: Symbol has an unexpected size + """ + if sym.size == 4: + return '<I' + elif sym.size == 8: + return '<Q' + else: + raise ValueError('%s has size %d: only 4 and 8 are supported' % + (msg, sym.size)) + +def LookupAndWriteSymbols(elf_fname, entry, section, is_elf=False): """Replace all symbols in an entry with their correct values The entry contents is updated so that values for referenced symbols will be @@ -204,34 +226,52 @@ def LookupAndWriteSymbols(elf_fname, entry, section): """ fname = tools.get_input_filename(elf_fname) syms = GetSymbols(fname, ['image', 'binman']) + if is_elf: + if not ELF_TOOLS: + msg = ("Section '%s': entry '%s'" % + (section.GetPath(), entry.GetPath())) + raise ValueError(f'{msg}: Cannot write symbols to an ELF file without Python elftools') + new_syms = {} + with open(fname, 'rb') as fd: + elf = ELFFile(fd) + for name, sym in syms.items(): + offset = _GetFileOffset(elf, sym.address) + new_syms[name] = Symbol(sym.section, sym.address, sym.size, + sym.weak, offset) + syms = new_syms + if not syms: + tout.debug('LookupAndWriteSymbols: no syms') return base = syms.get('__image_copy_start') - if not base: + if not base and not is_elf: + tout.debug('LookupAndWriteSymbols: no base') return + base_addr = 0 if is_elf else base.address for name, sym in syms.items(): if name.startswith('_binman'): msg = ("Section '%s': Symbol '%s'\n in entry '%s'" % (section.GetPath(), name, entry.GetPath())) - offset = sym.address - base.address - if offset < 0 or offset + sym.size > entry.contents_size: - raise ValueError('%s has offset %x (size %x) but the contents ' - 'size is %x' % (entry.GetPath(), offset, - sym.size, entry.contents_size)) - if sym.size == 4: - pack_string = '<I' - elif sym.size == 8: - pack_string = '<Q' + if is_elf: + # For ELF files, use the file offset + offset = sym.offset else: - raise ValueError('%s has size %d: only 4 and 8 are supported' % - (msg, sym.size)) - + # For blobs use the offset of the symbol, calculated by + # subtracting the base address which by definition is at the + # start + offset = sym.address - base.address + if offset < 0 or offset + sym.size > entry.contents_size: + raise ValueError('%s has offset %x (size %x) but the contents ' + 'size is %x' % (entry.GetPath(), offset, + sym.size, + entry.contents_size)) + pack_string = GetPackString(sym, msg) if name == '_binman_sym_magic': value = BINMAN_SYM_MAGIC_VALUE else: # Look up the symbol in our entry tables. value = section.GetImage().LookupImageSymbol(name, sym.weak, - msg, base.address) + msg, base_addr) if value is None: value = -1 pack_string = pack_string.lower() @@ -241,6 +281,28 @@ def LookupAndWriteSymbols(elf_fname, entry, section): entry.data = (entry.data[:offset] + value_bytes + entry.data[offset + sym.size:]) +def GetSymbolValue(sym, data, msg): + """Get the value of a symbol + + This can only be used on symbols with an integer value. + + Args: + sym (Symbol): Symbol to check + data (butes): Data for the ELF file - the symbol data appears at offset + sym.offset + @msg (str): String which indicates the entry being processed, used for + errors + + Returns: + int: Value of the symbol + + Raises: + ValueError: Symbol has an unexpected size + """ + pack_string = GetPackString(sym, msg) + value = struct.unpack(pack_string, data[sym.offset:sym.offset + sym.size]) + return value[0] + def MakeElf(elf_fname, text, data): """Make an elf file with the given data in a single section diff --git a/tools/binman/entries.rst b/tools/binman/entries.rst index 18bd328c5cd..3dc32db8a54 100644 --- a/tools/binman/entries.rst +++ b/tools/binman/entries.rst @@ -735,7 +735,7 @@ Here is an example showing ATF, TEE and a device tree all combined:: os = "U-Boot"; arch = "arm64"; compression = "none"; - load = <CONFIG_SYS_TEXT_BASE>; + load = <CONFIG_TEXT_BASE>; u-boot-nodtb { }; }; diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 63ec5cea3b2..1be31a05e00 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -12,6 +12,7 @@ import sys import time from binman import bintool +from binman import elf from dtoc import fdt_util from patman import tools from patman.tools import to_hex, to_hex_size @@ -86,10 +87,15 @@ class Entry(object): fake_fname: Fake filename, if one was created, else None required_props (dict of str): Properties which must be present. This can be added to by subclasses + elf_fname (str): Filename of the ELF file, if this entry holds an ELF + file, or is a binary file produced from an ELF file + auto_write_symbols (bool): True to write ELF symbols into this entry's + contents """ fake_dir = None - def __init__(self, section, etype, node, name_prefix=''): + def __init__(self, section, etype, node, name_prefix='', + auto_write_symbols=False): # Put this here to allow entry-docs and help to work without libfdt global state from binman import state @@ -125,6 +131,8 @@ class Entry(object): self.fake_fname = None self.required_props = [] self.comp_bintool = None + self.elf_fname = None + self.auto_write_symbols = auto_write_symbols @staticmethod def FindEntryClass(etype, expanded): @@ -647,7 +655,11 @@ class Entry(object): Args: section: Section containing the entry """ - pass + if self.auto_write_symbols: + # Check if we are writing symbols into an ELF file + is_elf = self.GetDefaultFilename() == self.elf_fname + elf.LookupAndWriteSymbols(self.elf_fname, self, section.GetImage(), + is_elf) def CheckEntries(self): """Check that the entry offsets are correct diff --git a/tools/binman/etype/blob.py b/tools/binman/etype/blob.py index ceaefb07b73..a50a8068901 100644 --- a/tools/binman/etype/blob.py +++ b/tools/binman/etype/blob.py @@ -31,8 +31,9 @@ class Entry_blob(Entry): the node (if enabled with -u) which provides the uncompressed size of the data. """ - def __init__(self, section, etype, node): - super().__init__(section, etype, node) + def __init__(self, section, etype, node, auto_write_symbols=False): + super().__init__(section, etype, node, + auto_write_symbols=auto_write_symbols) self._filename = fdt_util.GetString(self._node, 'filename', self.etype) def ObtainContents(self, fake_size=0): diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py index ad43fce18ec..7860e2aeea3 100644 --- a/tools/binman/etype/fit.py +++ b/tools/binman/etype/fit.py @@ -201,7 +201,7 @@ class Entry_fit(Entry_section): os = "U-Boot"; arch = "arm64"; compression = "none"; - load = <CONFIG_SYS_TEXT_BASE>; + load = <CONFIG_TEXT_BASE>; u-boot-nodtb { }; }; diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index 621950893f3..da561e2bcc7 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -510,6 +510,50 @@ class Entry_section(Entry): source_entry.Raise("Cannot find entry for node '%s'" % node.name) return entry.GetData(required) + def LookupEntry(self, entries, sym_name, msg): + """Look up the entry for an ENF symbol + + Args: + entries (dict): entries to search: + key: entry name + value: Entry object + sym_name: Symbol name in the ELF file to look up in the format + _binman_<entry>_prop_<property> where <entry> is the name of + the entry and <property> is the property to find (e.g. + _binman_u_boot_prop_offset). As a special case, you can append + _any to <entry> to have it search for any matching entry. E.g. + _binman_u_boot_any_prop_offset will match entries called u-boot, + u-boot-img and u-boot-nodtb) + msg: Message to display if an error occurs + + Returns: + tuple: + Entry: entry object that was found + str: name used to search for entries (uses '-' instead of the + '_' used by the symbol name) + str: property name the symbol refers to, e.g. 'image_pos' + + Raises: + ValueError:the symbol name cannot be decoded, e.g. does not have + a '_binman_' prefix + """ + m = re.match(r'^_binman_(\w+)_prop_(\w+)$', sym_name) + if not m: + raise ValueError("%s: Symbol '%s' has invalid format" % + (msg, sym_name)) + entry_name, prop_name = m.groups() + entry_name = entry_name.replace('_', '-') + entry = entries.get(entry_name) + if not entry: + if entry_name.endswith('-any'): + root = entry_name[:-4] + for name in entries: + if name.startswith(root): + rest = name[len(root):] + if rest in ['', '-elf', '-img', '-nodtb']: + entry = entries[name] + return entry, entry_name, prop_name + def LookupSymbol(self, sym_name, optional, msg, base_addr, entries=None): """Look up a symbol in an ELF file @@ -547,23 +591,9 @@ class Entry_section(Entry): ValueError if the symbol is invalid or not found, or references a property which is not supported """ - m = re.match(r'^_binman_(\w+)_prop_(\w+)$', sym_name) - if not m: - raise ValueError("%s: Symbol '%s' has invalid format" % - (msg, sym_name)) - entry_name, prop_name = m.groups() - entry_name = entry_name.replace('_', '-') if not entries: entries = self._entries - entry = entries.get(entry_name) - if not entry: - if entry_name.endswith('-any'): - root = entry_name[:-4] - for name in entries: - if name.startswith(root): - rest = name[len(root):] - if rest in ['', '-img', '-nodtb']: - entry = entries[name] + entry, entry_name, prop_name = self.LookupEntry(entries, sym_name, msg) if not entry: err = ("%s: Entry '%s' not found in list (%s)" % (msg, entry_name, ','.join(entries.keys()))) diff --git a/tools/binman/etype/u_boot_spl.py b/tools/binman/etype/u_boot_spl.py index 6f79bf59f9f..d1aa3b4fdad 100644 --- a/tools/binman/etype/u_boot_spl.py +++ b/tools/binman/etype/u_boot_spl.py @@ -5,7 +5,6 @@ # Entry-type module for spl/u-boot-spl.bin # -from binman import elf from binman.entry import Entry from binman.etype.blob import Entry_blob @@ -35,11 +34,9 @@ class Entry_u_boot_spl(Entry_blob): unless --no-expanded is used or the node has a 'no-expanded' property. """ def __init__(self, section, etype, node): - super().__init__(section, etype, node) + super().__init__(section, etype, node, auto_write_symbols=True) self.elf_fname = 'spl/u-boot-spl' + self.auto_write_symbols = True def GetDefaultFilename(self): return 'spl/u-boot-spl.bin' - - def WriteSymbols(self, section): - elf.LookupAndWriteSymbols(self.elf_fname, self, section.GetImage()) diff --git a/tools/binman/etype/u_boot_spl_elf.py b/tools/binman/etype/u_boot_spl_elf.py index 7f1236bcbb3..7b7b4e01495 100644 --- a/tools/binman/etype/u_boot_spl_elf.py +++ b/tools/binman/etype/u_boot_spl_elf.py @@ -18,7 +18,8 @@ class Entry_u_boot_spl_elf(Entry_blob): be relocated to any address for execution. """ def __init__(self, section, etype, node): - super().__init__(section, etype, node) + super().__init__(section, etype, node, auto_write_symbols=True) + self.elf_fname = 'spl/u-boot-spl' def GetDefaultFilename(self): return 'spl/u-boot-spl' diff --git a/tools/binman/etype/u_boot_spl_nodtb.py b/tools/binman/etype/u_boot_spl_nodtb.py index 316b38172ef..50a126dc7ef 100644 --- a/tools/binman/etype/u_boot_spl_nodtb.py +++ b/tools/binman/etype/u_boot_spl_nodtb.py @@ -5,7 +5,6 @@ # Entry-type module for 'u-boot-spl-nodtb.bin' # -from binman import elf from binman.entry import Entry from binman.etype.blob import Entry_blob @@ -32,11 +31,8 @@ class Entry_u_boot_spl_nodtb(Entry_blob): binman uses that to look up symbols to write into the SPL binary. """ def __init__(self, section, etype, node): - super().__init__(section, etype, node) + super().__init__(section, etype, node, auto_write_symbols=True) self.elf_fname = 'spl/u-boot-spl' def GetDefaultFilename(self): return 'spl/u-boot-spl-nodtb.bin' - - def WriteSymbols(self, section): - elf.LookupAndWriteSymbols(self.elf_fname, self, section.GetImage()) diff --git a/tools/binman/etype/u_boot_tpl.py b/tools/binman/etype/u_boot_tpl.py index 0c575df8cdc..1883a2bd5f1 100644 --- a/tools/binman/etype/u_boot_tpl.py +++ b/tools/binman/etype/u_boot_tpl.py @@ -5,7 +5,6 @@ # Entry-type module for tpl/u-boot-tpl.bin # -from binman import elf from binman.entry import Entry from binman.etype.blob import Entry_blob @@ -35,11 +34,8 @@ class Entry_u_boot_tpl(Entry_blob): unless --no-expanded is used or the node has a 'no-expanded' property. """ def __init__(self, section, etype, node): - super().__init__(section, etype, node) + super().__init__(section, etype, node, auto_write_symbols=True) self.elf_fname = 'tpl/u-boot-tpl' def GetDefaultFilename(self): return 'tpl/u-boot-tpl.bin' - - def WriteSymbols(self, section): - elf.LookupAndWriteSymbols(self.elf_fname, self, section.GetImage()) diff --git a/tools/binman/etype/u_boot_tpl_elf.py b/tools/binman/etype/u_boot_tpl_elf.py index 3f24d3aa7bc..fd100019b39 100644 --- a/tools/binman/etype/u_boot_tpl_elf.py +++ b/tools/binman/etype/u_boot_tpl_elf.py @@ -18,7 +18,8 @@ class Entry_u_boot_tpl_elf(Entry_blob): be relocated to any address for execution. """ def __init__(self, section, etype, node): - super().__init__(section, etype, node) + super().__init__(section, etype, node, auto_write_symbols=True) + self.elf_fname = 'tpl/u-boot-tpl' def GetDefaultFilename(self): return 'tpl/u-boot-tpl' diff --git a/tools/binman/etype/u_boot_tpl_nodtb.py b/tools/binman/etype/u_boot_tpl_nodtb.py index 98f3853f457..7e08e58f1e5 100644 --- a/tools/binman/etype/u_boot_tpl_nodtb.py +++ b/tools/binman/etype/u_boot_tpl_nodtb.py @@ -5,7 +5,6 @@ # Entry-type module for 'u-boot-tpl-nodtb.bin' # -from binman import elf from binman.entry import Entry from binman.etype.blob import Entry_blob @@ -32,11 +31,8 @@ class Entry_u_boot_tpl_nodtb(Entry_blob): binman uses that to look up symbols to write into the TPL binary. """ def __init__(self, section, etype, node): - super().__init__(section, etype, node) + super().__init__(section, etype, node, auto_write_symbols=True) self.elf_fname = 'tpl/u-boot-tpl' def GetDefaultFilename(self): return 'tpl/u-boot-tpl-nodtb.bin' - - def WriteSymbols(self, section): - elf.LookupAndWriteSymbols(self.elf_fname, self, section.GetImage()) diff --git a/tools/binman/etype/u_boot_vpl.py b/tools/binman/etype/u_boot_vpl.py index 9daaca4f6fd..62e5969c6ec 100644 --- a/tools/binman/etype/u_boot_vpl.py +++ b/tools/binman/etype/u_boot_vpl.py @@ -5,7 +5,6 @@ # Entry-type module for vpl/u-boot-vpl.bin # -from binman import elf from binman.entry import Entry from binman.etype.blob import Entry_blob @@ -32,11 +31,8 @@ class Entry_u_boot_vpl(Entry_blob): binman uses that to look up symbols to write into the VPL binary. """ def __init__(self, section, etype, node): - super().__init__(section, etype, node) + super().__init__(section, etype, node, auto_write_symbols=True) self.elf_fname = 'vpl/u-boot-vpl' def GetDefaultFilename(self): return 'vpl/u-boot-vpl.bin' - - def WriteSymbols(self, section): - elf.LookupAndWriteSymbols(self.elf_fname, self, section.GetImage()) diff --git a/tools/binman/etype/u_boot_vpl_elf.py b/tools/binman/etype/u_boot_vpl_elf.py new file mode 100644 index 00000000000..2c686790194 --- /dev/null +++ b/tools/binman/etype/u_boot_vpl_elf.py @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: GPL-2.0+ +# Copyright 2022 Google LLC +# Written by Simon Glass <sjg@chromium.org> +# +# Entry-type module for U-Boot VPL ELF image +# + +from binman.entry import Entry +from binman.etype.blob import Entry_blob + +class Entry_u_boot_vpl_elf(Entry_blob): + """U-Boot VPL ELF image + + Properties / Entry arguments: + - filename: Filename of VPL u-boot (default 'vpl/u-boot-vpl') + + This is the U-Boot VPL ELF image. It does not include a device tree but can + be relocated to any address for execution. + """ + def __init__(self, section, etype, node): + super().__init__(section, etype, node, auto_write_symbols=True) + self.elf_fname = 'vpl/u-boot-vpl' + + def GetDefaultFilename(self): + return 'vpl/u-boot-vpl' diff --git a/tools/binman/etype/u_boot_vpl_nodtb.py b/tools/binman/etype/u_boot_vpl_nodtb.py index 25c966cf342..db3d8a91c9b 100644 --- a/tools/binman/etype/u_boot_vpl_nodtb.py +++ b/tools/binman/etype/u_boot_vpl_nodtb.py @@ -5,7 +5,6 @@ # Entry-type module for 'u-boot-vpl-nodtb.bin' # -from binman import elf from binman.entry import Entry from binman.etype.blob import Entry_blob @@ -32,11 +31,8 @@ class Entry_u_boot_vpl_nodtb(Entry_blob): binman uses that to look up symbols to write into the VPL binary. """ def __init__(self, section, etype, node): - super().__init__(section, etype, node) + super().__init__(section, etype, node, auto_write_symbols=True) self.elf_fname = 'vpl/u-boot-vpl' def GetDefaultFilename(self): return 'vpl/u-boot-vpl-nodtb.bin' - - def WriteSymbols(self, section): - elf.LookupAndWriteSymbols(self.elf_fname, self, section.GetImage()) diff --git a/tools/binman/etype/u_boot_with_ucode_ptr.py b/tools/binman/etype/u_boot_with_ucode_ptr.py index a5fd2d1ca5e..e275698cebe 100644 --- a/tools/binman/etype/u_boot_with_ucode_ptr.py +++ b/tools/binman/etype/u_boot_with_ucode_ptr.py @@ -62,7 +62,7 @@ class Entry_u_boot_with_ucode_ptr(Entry_blob): # # The section must be set up so that U-Boot is placed at the # flash address to which it is linked. For example, if - # CONFIG_SYS_TEXT_BASE is 0xfff00000, and the ROM is 8MB, then + # CONFIG_TEXT_BASE is 0xfff00000, and the ROM is 8MB, then # the U-Boot region must start at offset 7MB in the section. In this # case the ROM starts at 0xff800000, so the offset of the first # entry in the section corresponds to that. diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 232ac2cf185..e849d96587c 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -6005,5 +6005,62 @@ fdt fdtmap Extract the devicetree blob from the fdtmap self.assertTrue(os.path.islink(sname)) self.assertEqual(os.readlink(sname), fname) + def testSymbolsElf(self): + """Test binman can assign symbols embedded in an ELF file""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') + self._SetupTplElf('u_boot_binman_syms') + self._SetupVplElf('u_boot_binman_syms') + self._SetupSplElf('u_boot_binman_syms') + data = self._DoReadFileDtb('260_symbols_elf.dts')[0] + image_fname = tools.get_output_filename('image.bin') + + image = control.images['image'] + entries = image.GetEntries() + + for entry in entries.values(): + # No symbols in u-boot and it has faked contents anyway + if entry.name == 'u-boot': + continue + edata = data[entry.image_pos:entry.image_pos + entry.size] + efname = tools.get_output_filename(f'edata-{entry.name}') + tools.write_file(efname, edata) + + syms = elf.GetSymbolFileOffset(efname, ['_binman_u_boot']) + re_name = re.compile('_binman_(u_boot_(.*))_prop_(.*)') + for name, sym in syms.items(): + msg = 'test' + val = elf.GetSymbolValue(sym, edata, msg) + entry_m = re_name.match(name) + if entry_m: + ename, prop = entry_m.group(1), entry_m.group(3) + entry, entry_name, prop_name = image.LookupEntry(entries, + name, msg) + if prop_name == 'offset': + expect_val = entry.offset + elif prop_name == 'image_pos': + expect_val = entry.image_pos + elif prop_name == 'size': + expect_val = entry.size + self.assertEqual(expect_val, val) + + def testSymbolsElfBad(self): + """Check error when trying to write symbols without the elftools lib""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') + self._SetupTplElf('u_boot_binman_syms') + self._SetupVplElf('u_boot_binman_syms') + self._SetupSplElf('u_boot_binman_syms') + try: + elf.ELF_TOOLS = False + with self.assertRaises(ValueError) as exc: + self._DoReadFileDtb('260_symbols_elf.dts') + finally: + elf.ELF_TOOLS = True + self.assertIn( + "Section '/binman': entry '/binman/u-boot-spl-elf': " + 'Cannot write symbols to an ELF file without Python elftools', + str(exc.exception)) + if __name__ == "__main__": unittest.main() diff --git a/tools/binman/test/260_symbols_elf.dts b/tools/binman/test/260_symbols_elf.dts new file mode 100644 index 00000000000..0fae118fc12 --- /dev/null +++ b/tools/binman/test/260_symbols_elf.dts @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + pad-byte = <0xff>; + u-boot-spl-elf { + }; + + u-boot { + }; + + u-boot-spl2 { + type = "u-boot-spl-elf"; + }; + + u-boot-tpl-elf { + }; + + u-boot-vpl-elf { + }; + }; +}; |