diff options
| author | Tom Rini <trini@konsulko.com> | 2023-11-20 09:19:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-20 09:19:50 -0500 |
| commit | dca7a8958f8d0dbd53072caa4353353e062d80ca (patch) | |
| tree | 2ba9b27f1799d23f5bd3355feaf6276646297b9d /boot | |
| parent | 9e4b42267e1fb5805ecddbb92629f456d8cd4047 (diff) | |
| parent | 24ca49b33af98d54d6cd2e845f071f6565345ffd (diff) | |
| download | u-boot-dca7a8958f8d0dbd53072caa4353353e062d80ca.tar.gz u-boot-dca7a8958f8d0dbd53072caa4353353e062d80ca.tar.bz2 u-boot-dca7a8958f8d0dbd53072caa4353353e062d80ca.zip | |
Merge tag 'v2024.01-rc3' into next
Prepare v2024.01-rc3
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/bootdev-uclass.c | 2 | ||||
| -rw-r--r-- | boot/bootflow.c | 3 | ||||
| -rw-r--r-- | boot/bootmeth_efi.c | 1 | ||||
| -rw-r--r-- | boot/expo.c | 4 | ||||
| -rw-r--r-- | boot/fdt_support.c | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c index 44ae98a926..4926a50da8 100644 --- a/boot/bootdev-uclass.c +++ b/boot/bootdev-uclass.c @@ -784,7 +784,7 @@ static int bootdev_hunt_drv(struct bootdev_hunter *info, uint seq, bool show) if (info->hunt) { ret = info->hunt(info, show); log_debug(" - hunt result %d\n", ret); - if (ret) + if (ret && ret != -ENOENT) return ret; } std->hunters_used |= BIT(seq); diff --git a/boot/bootflow.c b/boot/bootflow.c index 6922e7e0c4..1ea2966ae9 100644 --- a/boot/bootflow.c +++ b/boot/bootflow.c @@ -467,7 +467,8 @@ void bootflow_free(struct bootflow *bflow) free(bflow->name); free(bflow->subdir); free(bflow->fname); - free(bflow->buf); + if (!(bflow->flags & BOOTFLOWF_STATIC_BUF)) + free(bflow->buf); free(bflow->os_name); free(bflow->fdt_fname); free(bflow->bootmeth_priv); diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c index ae936c8daa..9ba7734911 100644 --- a/boot/bootmeth_efi.c +++ b/boot/bootmeth_efi.c @@ -160,6 +160,7 @@ static int efiload_read_file(struct bootflow *bflow, ulong addr) if (ret) return log_msg_ret("read", ret); bflow->buf = map_sysmem(addr, bflow->size); + bflow->flags |= BOOTFLOWF_STATIC_BUF; set_efi_bootdev(desc, bflow); diff --git a/boot/expo.c b/boot/expo.c index 139d684f8e..cadb6a0ad6 100644 --- a/boot/expo.c +++ b/boot/expo.c @@ -190,10 +190,12 @@ int expo_render(struct expo *exp) struct udevice *dev = exp->display; struct video_priv *vid_priv = dev_get_uclass_priv(dev); struct scene *scn = NULL; + enum colour_idx back; u32 colour; int ret; - colour = video_index_to_colour(vid_priv, VID_WHITE); + back = CONFIG_IS_ENABLED(SYS_WHITE_ON_BLACK) ? VID_BLACK : VID_WHITE; + colour = video_index_to_colour(vid_priv, back); ret = video_fill(dev, colour); if (ret) return log_msg_ret("fill", ret); diff --git a/boot/fdt_support.c b/boot/fdt_support.c index 5e49078f8c..b15d07765f 100644 --- a/boot/fdt_support.c +++ b/boot/fdt_support.c @@ -2095,7 +2095,7 @@ int fdt_overlay_apply_verbose(void *fdt, void *fdto) printf("failed on fdt_overlay_apply(): %s\n", fdt_strerror(err)); if (!has_symbols) { - printf("base fdt does did not have a /__symbols__ node\n"); + printf("base fdt does not have a /__symbols__ node\n"); printf("make sure you've compiled with -@\n"); } } |