diff options
| author | Simon Glass <sjg@chromium.org> | 2022-10-21 03:22:39 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-31 18:01:31 +0300 |
| commit | 984639039f4cfe32ec2cc531d6ace05326ac49eb (patch) | |
| tree | 472bf7e47978335a73c5d6025d3b83b534f7192b /arch/mips | |
| parent | 6f38d91158e7e4199753b79e0a25c1a65175aba4 (diff) | |
| download | u-boot-984639039f4cfe32ec2cc531d6ace05326ac49eb.tar.xz | |
Rename CONFIG_SYS_TEXT_BASE to CONFIG_TEXT_BASE
The current name is inconsistent with SPL which uses CONFIG_SPL_TEXT_BASE
and this makes it imposible to use CONFIG_VAL().
Rename it to resolve this problem.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/mach-jz47xx/jz4780/jz4780.c | 4 | ||||
| -rw-r--r-- | arch/mips/mach-mscc/lowlevel_init.S | 2 | ||||
| -rw-r--r-- | arch/mips/mach-mtmips/Kconfig | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c index 4c40bd86fd..cff98b0a77 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 91f29ae252..0c24cb5f22 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 d46be503a2..15b2792e61 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 |