mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
arm: remove unneeded symbol offsets and _TEXT_BASE
Remove the last uses of symbol offsets in ARM U-Boot. Remove some needless uses of _TEXT_BASE. Remove all _TEXT_BASE definitions. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
This commit is contained in:
@@ -149,13 +149,9 @@ static int display_text_info(void)
|
||||
#ifndef CONFIG_SANDBOX
|
||||
ulong bss_start, bss_end;
|
||||
|
||||
#ifdef CONFIG_SYS_SYM_OFFSETS
|
||||
bss_start = _bss_start_ofs + _TEXT_BASE;
|
||||
bss_end = _bss_end_ofs + _TEXT_BASE;
|
||||
#else
|
||||
bss_start = (ulong)&__bss_start;
|
||||
bss_end = (ulong)&__bss_end;
|
||||
#endif
|
||||
|
||||
debug("U-Boot code: %08X -> %08lX BSS: -> %08lX\n",
|
||||
CONFIG_SYS_TEXT_BASE, bss_start, bss_end);
|
||||
#endif
|
||||
@@ -279,8 +275,8 @@ static int zero_global_data(void)
|
||||
|
||||
static int setup_mon_len(void)
|
||||
{
|
||||
#ifdef CONFIG_SYS_SYM_OFFSETS
|
||||
gd->mon_len = _bss_end_ofs;
|
||||
#ifdef __ARM__
|
||||
gd->mon_len = (ulong)&__bss_end - (ulong)_start;
|
||||
#elif defined(CONFIG_SANDBOX)
|
||||
gd->mon_len = (ulong)&_end - (ulong)_init;
|
||||
#else
|
||||
@@ -363,11 +359,7 @@ static int setup_fdt(void)
|
||||
gd->fdt_blob = __dtb_dt_begin;
|
||||
#elif defined CONFIG_OF_SEPARATE
|
||||
/* FDT is at end of image */
|
||||
# ifdef CONFIG_SYS_SYM_OFFSETS
|
||||
gd->fdt_blob = (void *)(_end_ofs + CONFIG_SYS_TEXT_BASE);
|
||||
# else
|
||||
gd->fdt_blob = (ulong *)&_end;
|
||||
# endif
|
||||
#elif defined(CONFIG_OF_HOSTFILE)
|
||||
if (read_fdt_from_file()) {
|
||||
puts("Failed to read control FDT\n");
|
||||
|
||||
@@ -128,8 +128,8 @@ __weak int fixup_cpu(void)
|
||||
|
||||
static int initr_reloc_global_data(void)
|
||||
{
|
||||
#ifdef CONFIG_SYS_SYM_OFFSETS
|
||||
monitor_flash_len = _end_ofs;
|
||||
#ifdef __ARM__
|
||||
monitor_flash_len = _end - __image_copy_start;
|
||||
#elif !defined(CONFIG_SANDBOX)
|
||||
monitor_flash_len = (ulong)&__init_end - gd->relocaddr;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user