diff options
| author | Tom Rini <[email protected]> | 2021-07-23 08:30:48 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-07-23 08:30:48 -0400 |
| commit | f534d93cbf34f1d1762b04eb5680e84bef5e1fe1 (patch) | |
| tree | 09a0231852e9df884a8da30db093ac1932978814 /common | |
| parent | 4906d698d3960b70cf8000299da35412efd4f51d (diff) | |
| parent | 988002dcd931e7236422e4d158c397d964ba1360 (diff) | |
Merge branch '2021-07-23-assorted-fixes'
- Assorted FIT, optee, pcf8575, mux, vexpress64 and distro bootcmd fixes.
- Allow pinmux status to take pin names
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig.boot | 1 | ||||
| -rw-r--r-- | common/image-fit.c | 3 | ||||
| -rw-r--r-- | common/spl/spl.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/common/Kconfig.boot b/common/Kconfig.boot index ae3f2b6f62b..b4dc49e0195 100644 --- a/common/Kconfig.boot +++ b/common/Kconfig.boot @@ -358,6 +358,7 @@ config HAVE_SYS_TEXT_BASE config SYS_TEXT_BASE depends on HAVE_SYS_TEXT_BASE + default 0x0 if POSITION_INDEPENDENT default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3 default 0x4a000000 if ARCH_SUNXI && !MACH_SUN9I && !MACH_SUN8I_V3S default 0x2a000000 if ARCH_SUNXI && MACH_SUN9I diff --git a/common/image-fit.c b/common/image-fit.c index 28bd8e78c75..d6b2c3c7eca 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1777,7 +1777,8 @@ int fit_conf_find_compat(const void *fit, const void *fdt) } /* search in this config's kernel FDT */ - if (fit_image_get_data(fit, kfdt_noffset, &fdt, &sz)) { + if (fit_image_get_data_and_size(fit, kfdt_noffset, + &fdt, &sz)) { debug("Failed to get fdt \"%s\".\n", kfdt_name); continue; } diff --git a/common/spl/spl.c b/common/spl/spl.c index 3b96f2fc310..3ec16d0de65 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -200,7 +200,7 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image) spl_image->name = "U-Boot"; } -#ifdef CONFIG_SPL_LOAD_FIT_FULL +#if CONFIG_IS_ENABLED(LOAD_FIT_FULL) /* Parse and load full fitImage in SPL */ static int spl_load_fit_image(struct spl_image_info *spl_image, const struct image_header *header) @@ -307,7 +307,7 @@ __weak int spl_parse_legacy_header(struct spl_image_info *spl_image, int spl_parse_image_header(struct spl_image_info *spl_image, const struct image_header *header) { -#ifdef CONFIG_SPL_LOAD_FIT_FULL +#if CONFIG_IS_ENABLED(LOAD_FIT_FULL) int ret = spl_load_fit_image(spl_image, header); if (!ret) |