diff options
| author | Tom Rini <trini@konsulko.com> | 2022-11-10 10:09:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-11-10 10:09:40 -0500 |
| commit | 0cbeed4f6648e0e4966475e3544280a69ecb59d3 (patch) | |
| tree | a7b4b6b44bc3d43628e654f0c75ef2fab49ffd1b /common/spl/spl.c | |
| parent | 77b5cc2948f5d93fe3d275302f596ffd8701a875 (diff) | |
| parent | cc1159bbfa94a60e4180846e480b887cf91fa722 (diff) | |
| download | u-boot-WIP/10Nov2022.zip u-boot-WIP/10Nov2022.tar.gz u-boot-WIP/10Nov2022.tar.bz2 | |
Merge branch '2022-11-10-symbol-migrations'WIP/10Nov2022
- Migrate a number of CONFIG symbols to Kconfig and start migrating some
symbol families from CONFIG to the CFG namespace.
Diffstat (limited to 'common/spl/spl.c')
| -rw-r--r-- | common/spl/spl.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 6f2014b..22d2a06 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -46,10 +46,6 @@ DECLARE_BINMAN_MAGIC_SYM; #ifndef CONFIG_SYS_UBOOT_START #define CONFIG_SYS_UBOOT_START CONFIG_TEXT_BASE #endif -#ifndef CONFIG_SYS_MONITOR_LEN -/* Unknown U-Boot size, let's assume it will not be more than 200 KB */ -#define CONFIG_SYS_MONITOR_LEN (200 * 1024) -#endif u32 *boot_params_ptr = NULL; @@ -232,11 +228,17 @@ __weak struct legacy_img_hdr *spl_get_load_buffer(ssize_t offset, size_t size) return map_sysmem(CONFIG_TEXT_BASE + offset, 0); } +#ifdef CONFIG_SPL_RAW_IMAGE_SUPPORT void spl_set_header_raw_uboot(struct spl_image_info *spl_image) { ulong u_boot_pos = spl_get_image_pos(); +#if CONFIG_SYS_MONITOR_LEN != 0 spl_image->size = CONFIG_SYS_MONITOR_LEN; +#else + /* Unknown U-Boot size, let's assume it will not be more than 200 KB */ + spl_image->size = 200 * 1024; +#endif /* * Binman error cases: address of the end of the previous region or the @@ -254,6 +256,7 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image) spl_image->os = IH_OS_U_BOOT; spl_image->name = "U-Boot"; } +#endif #if CONFIG_IS_ENABLED(LOAD_FIT_FULL) /* Parse and load full fitImage in SPL */ |