diff options
| author | Tom Rini <trini@konsulko.com> | 2023-10-01 11:54:31 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-01 11:54:31 -0400 |
| commit | e29b932aa07fa0226d325b35d96cd4eea0370129 (patch) | |
| tree | a824bb47e01a913c08878bfa3d32ed68644d9e33 /common | |
| parent | 613949b79a52fecc9958d44c561d327373efc6e2 (diff) | |
| parent | c3b27a826f276b67021a31369c760f1b416e4917 (diff) | |
| download | u-boot-e29b932aa07fa0226d325b35d96cd4eea0370129.zip u-boot-e29b932aa07fa0226d325b35d96cd4eea0370129.tar.gz u-boot-e29b932aa07fa0226d325b35d96cd4eea0370129.tar.bz2 | |
Merge branch '2023-09-30-Kconfig-updates' into next
- Migrate one symbol from CFG to CONFIG and move where another is.
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl.c | 6 | ||||
| -rw-r--r-- | common/spl/spl_fit.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 045a5e8..cd294e8 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -45,10 +45,6 @@ DECLARE_GLOBAL_DATA_PTR; DECLARE_BINMAN_MAGIC_SYM; -#ifndef CFG_SYS_UBOOT_START -#define CFG_SYS_UBOOT_START CONFIG_TEXT_BASE -#endif - u32 *boot_params_ptr = NULL; #if CONFIG_IS_ENABLED(BINMAN_UBOOT_SYMBOLS) @@ -252,7 +248,7 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image) spl_image->entry_point = u_boot_pos; spl_image->load_addr = u_boot_pos; } else { - spl_image->entry_point = CFG_SYS_UBOOT_START; + spl_image->entry_point = CONFIG_SYS_UBOOT_START; spl_image->load_addr = CONFIG_TEXT_BASE; } spl_image->os = IH_OS_U_BOOT; diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index cd73b25..b1668c0 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -817,7 +817,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, } /* - * If a platform does not provide CFG_SYS_UBOOT_START, U-Boot's + * If a platform does not provide CONFIG_SYS_UBOOT_START, U-Boot's * Makefile will set it to 0 and it will end up as the entry point * here. What it actually means is: use the load address. */ |