diff options
| author | Simon Glass | 2022-10-20 18:22:39 -0600 |
|---|---|---|
| committer | Tom Rini | 2022-10-31 11:01:31 -0400 |
| commit | 984639039f4cfe32ec2cc531d6ace05326ac49eb (patch) | |
| tree | 472bf7e47978335a73c5d6025d3b83b534f7192b /arch/arm/mach-sunxi | |
| parent | 6f38d91158e7e4199753b79e0a25c1a65175aba4 (diff) | |
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-sunxi')
| -rw-r--r-- | arch/arm/mach-sunxi/board.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-sunxi/spl_spi_sunxi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 220ed80ba79..86233637bfc 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -363,7 +363,7 @@ __weak void sunxi_sram_init(void) static bool sunxi_valid_emmc_boot(struct mmc *mmc) { struct blk_desc *bd = mmc_get_blk_desc(mmc); - uint32_t *buffer = (void *)(uintptr_t)CONFIG_SYS_TEXT_BASE; + u32 *buffer = (void *)(uintptr_t)CONFIG_TEXT_BASE; struct boot_file_head *egon_head = (void *)buffer; int bootpart = EXT_CSD_EXTRACT_BOOT_PART(mmc->part_config); uint32_t spl_size, emmc_checksum, chksum = 0; diff --git a/arch/arm/mach-sunxi/spl_spi_sunxi.c b/arch/arm/mach-sunxi/spl_spi_sunxi.c index 520f14e5155..81159cfee61 100644 --- a/arch/arm/mach-sunxi/spl_spi_sunxi.c +++ b/arch/arm/mach-sunxi/spl_spi_sunxi.c @@ -341,7 +341,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, struct legacy_img_hdr *header; uint32_t load_offset = sunxi_get_spl_size(); - header = (struct legacy_img_hdr *)CONFIG_SYS_TEXT_BASE; + header = (struct legacy_img_hdr *)CONFIG_TEXT_BASE; load_offset = max_t(uint32_t, load_offset, CONFIG_SYS_SPI_U_BOOT_OFFS); spi0_init(); |