diff options
| author | Simon Glass <sjg@chromium.org> | 2022-10-20 18:22:39 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-31 11:01:31 -0400 |
| commit | 984639039f4cfe32ec2cc531d6ace05326ac49eb (patch) | |
| tree | 472bf7e47978335a73c5d6025d3b83b534f7192b /arch/arm/mach-imx | |
| parent | 6f38d91158e7e4199753b79e0a25c1a65175aba4 (diff) | |
| download | u-boot-984639039f4cfe32ec2cc531d6ace05326ac49eb.tar.gz | |
Rename CONFIG_SYS_TEXT_BASE to CONFIG_TEXT_BASE
The current name is inconsistent with SPL which uses CONFIG_SPL_TEXT_BASE
and this makes it imposible to use CONFIG_VAL().
Rename it to resolve this problem.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 10 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx8/cpu.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mx7/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/spl.c | 2 |
4 files changed, 9 insertions, 9 deletions
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 |