diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi/efi_stub.c | 10 | ||||
| -rw-r--r-- | lib/efi_loader/efi_disk.c | 6 | ||||
| -rw-r--r-- | lib/efi_loader/efi_runtime.c | 8 | ||||
| -rw-r--r-- | lib/trace.c | 4 |
4 files changed, 15 insertions, 13 deletions
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c index a35fce1385..c9eb32ec10 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 cef4e45124..f11722db2c 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 93a695fc27..ad2ab825d1 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 505a31806c..54f0bf2f57 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; } |