mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 23:50:26 +09:00
x86: apl: Enhance debugging in the SPL loader
Move to log_debug() and make use of the new SPL function to find the text base. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
parent
86c372af1a
commit
0b2bedbc6d
@ -3,6 +3,8 @@
|
||||
* Copyright 2019 Google LLC
|
||||
*/
|
||||
|
||||
#define LOG_CATEGORY LOGC_BOOT
|
||||
|
||||
#include <common.h>
|
||||
#include <binman_sym.h>
|
||||
#include <bootstage.h>
|
||||
@ -33,12 +35,11 @@ static int rom_load_image(struct spl_image_info *spl_image,
|
||||
int ret;
|
||||
|
||||
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;
|
||||
spl_image->entry_point = spl_get_image_text_base();
|
||||
spl_image->load_addr = spl_image->entry_point;
|
||||
spl_image->os = IH_OS_U_BOOT;
|
||||
spl_image->name = "U-Boot";
|
||||
debug("Reading from mapped SPI %lx, size %lx", spl_pos, spl_size);
|
||||
log_debug("Reading from mapped SPI %lx, size %lx\n", spl_pos, spl_size);
|
||||
|
||||
if (CONFIG_IS_ENABLED(SPI_FLASH_SUPPORT)) {
|
||||
ret = uclass_find_first_device(UCLASS_SPI_FLASH, &dev);
|
||||
@ -56,7 +57,8 @@ static int rom_load_image(struct spl_image_info *spl_image,
|
||||
return ret;
|
||||
}
|
||||
spl_pos += map_base & ~0xff000000;
|
||||
debug(", base %lx, pos %lx\n", map_base, spl_pos);
|
||||
log_debug(", base %lx, pos %lx, load %lx\n", map_base, spl_pos,
|
||||
spl_image->load_addr);
|
||||
bootstage_start(BOOTSTAGE_ID_ACCUM_MMAP_SPI, "mmap_spi");
|
||||
memcpy((void *)spl_image->load_addr, (void *)spl_pos, spl_size);
|
||||
cpu_flush_l1d_to_l2();
|
||||
@ -121,7 +123,7 @@ static int spl_fast_spi_load_image(struct spl_image_info *spl_image,
|
||||
spl_image->os = IH_OS_U_BOOT;
|
||||
spl_image->name = "U-Boot";
|
||||
spl_pos &= ~0xff000000;
|
||||
debug("Reading from flash %lx, size %lx\n", spl_pos, spl_size);
|
||||
log_debug("Reading from flash %lx, size %lx\n", spl_pos, spl_size);
|
||||
ret = spi_flash_read_dm(dev, spl_pos, spl_size,
|
||||
(void *)spl_image->load_addr);
|
||||
cpu_flush_l1d_to_l2();
|
||||
|
Loading…
Reference in New Issue
Block a user