diff options
| author | Tom Rini <[email protected]> | 2022-04-11 15:59:45 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-04-11 15:59:45 -0400 |
| commit | 7486c2ef9d296ad34be1567b8d26f978e683bece (patch) | |
| tree | ea1d936131f54e322db5e52f1299fc0e9db29852 /boot | |
| parent | 1583c87b1b813a04c95732ae8075d79b14a26eea (diff) | |
| parent | c3322a53f34f986ad9818df72707ebb59c9c8725 (diff) | |
Merge branch '2022-04-11-assorted-updates'
- Assorted fixes/updates including K3-J721s2 timer dts fix, assorted
crypto improvements, led-pwm driver, improve handling of mtd
partitions, align mkimage hash output buffers and backport a UBIFS
bugfix from Linux.
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/image-fit.c | 4 | ||||
| -rw-r--r-- | boot/pxe_utils.c | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/boot/image-fit.c b/boot/image-fit.c index f01cafe4e27..6610035d0ad 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -24,6 +24,7 @@ #include <mapmem.h> #include <asm/io.h> #include <malloc.h> +#include <memalign.h> #include <asm/global_data.h> #ifdef CONFIG_DM_HASH #include <dm.h> @@ -1263,7 +1264,8 @@ int calculate_hash(const void *data, int data_len, const char *name, static int fit_image_check_hash(const void *fit, int noffset, const void *data, size_t size, char **err_msgp) { - uint8_t value[FIT_MAX_HASH_LEN]; + DEFINE_ALIGN_BUFFER(uint8_t, value, FIT_MAX_HASH_LEN, + ARCH_DMA_MINALIGN); int value_len; const char *algo; uint8_t *fit_value; diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 0c24becae39..b08aee9896b 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -6,6 +6,7 @@ #include <common.h> #include <command.h> +#include <dm.h> #include <env.h> #include <image.h> #include <log.h> @@ -14,6 +15,7 @@ #include <lcd.h> #include <net.h> #include <fdt_support.h> +#include <video.h> #include <linux/libfdt.h> #include <linux/string.h> #include <linux/ctype.h> @@ -21,7 +23,6 @@ #include <linux/list.h> #ifdef CONFIG_DM_RNG -#include <dm.h> #include <rng.h> #endif @@ -1516,8 +1517,13 @@ void handle_pxe_menu(struct pxe_context *ctx, struct pxe_menu *cfg) /* display BMP if available */ if (cfg->bmp) { if (get_relfile(ctx, cfg->bmp, image_load_addr, NULL)) { - if (CONFIG_IS_ENABLED(CMD_CLS)) - run_command("cls", 0); +#if defined(CONFIG_DM_VIDEO) + struct udevice *dev; + + err = uclass_first_device_err(UCLASS_VIDEO, &dev); + if (!err) + video_clear(dev); +#endif bmp_display(image_load_addr, BMP_ALIGN_CENTER, BMP_ALIGN_CENTER); } else { |