diff options
| author | Tom Rini <[email protected]> | 2024-05-20 10:16:33 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-20 10:16:33 -0600 |
| commit | d4781422d1268aa6deca3e49d2fb227e79c160b4 (patch) | |
| tree | 420073c8a29a401a3908803000df6f54673e1731 /boot | |
| parent | 85854bc3324edd0c81047780ee60033d056fd490 (diff) | |
| parent | a7f0154c412859323396111dd0c09dbafbc153cb (diff) | |
Merge tag 'v2024.07-rc3' into next
Prepare v2024.07-rc3
Diffstat (limited to 'boot')
43 files changed, 43 insertions, 6 deletions
diff --git a/boot/android_ab.c b/boot/android_ab.c index 143f373aae9..1e5aa81b750 100644 --- a/boot/android_ab.c +++ b/boot/android_ab.c @@ -2,6 +2,7 @@ /* * Copyright (C) 2017 The Android Open Source Project */ +#include <common.h> #include <android_ab.h> #include <android_bootloader_message.h> #include <blk.h> diff --git a/boot/boot_fit.c b/boot/boot_fit.c index 4dcaf95c6ae..9d394126563 100644 --- a/boot/boot_fit.c +++ b/boot/boot_fit.c @@ -7,6 +7,7 @@ */ #include <boot_fit.h> +#include <common.h> #include <errno.h> #include <image.h> #include <log.h> diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c index 7c7bba088c9..46815ea2fdb 100644 --- a/boot/bootdev-uclass.c +++ b/boot/bootdev-uclass.c @@ -6,6 +6,7 @@ #define LOG_CATEGORY UCLASS_BOOTSTD +#include <common.h> #include <dm.h> #include <bootdev.h> #include <bootflow.h> diff --git a/boot/bootflow.c b/boot/bootflow.c index 9aa3179c388..68bf99329ab 100644 --- a/boot/bootflow.c +++ b/boot/bootflow.c @@ -6,6 +6,7 @@ #define LOG_CATEGORY UCLASS_BOOTSTD +#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootflow_menu.c b/boot/bootflow_menu.c index 143ef841332..16f9cd8f8ca 100644 --- a/boot/bootflow_menu.c +++ b/boot/bootflow_menu.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY UCLASS_BOOTSTD +#include <common.h> #include <bootflow.h> #include <bootstd.h> #include <cli.h> diff --git a/boot/bootm.c b/boot/bootm.c index 6fa8edab021..032f5a4a160 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -5,6 +5,7 @@ */ #ifndef USE_HOSTCC +#include <common.h> #include <bootm.h> #include <bootstage.h> #include <cli.h> diff --git a/boot/bootm_os.c b/boot/bootm_os.c index 15297ddb530..ccde72d22c1 100644 --- a/boot/bootm_os.c +++ b/boot/bootm_os.c @@ -4,6 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, [email protected]. */ +#include <common.h> #include <bootm.h> #include <bootstage.h> #include <cpu_func.h> diff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c index c0abadef97c..1d157d54dbd 100644 --- a/boot/bootmeth-uclass.c +++ b/boot/bootmeth-uclass.c @@ -6,6 +6,7 @@ #define LOG_CATEGORY UCLASS_BOOTSTD +#include <common.h> #include <blk.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootmeth_cros.c b/boot/bootmeth_cros.c index 645b8bed102..f015f2e1c75 100644 --- a/boot/bootmeth_cros.c +++ b/boot/bootmeth_cros.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY UCLASS_BOOTSTD +#include <common.h> #include <blk.h> #include <bootdev.h> #include <bootflow.h> diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c index c7035c0d0c4..aebc5207fc0 100644 --- a/boot/bootmeth_efi.c +++ b/boot/bootmeth_efi.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY UCLASS_BOOTSTD +#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootmeth_efi_mgr.c b/boot/bootmeth_efi_mgr.c index 23ae1e610ac..b7d429f2c3d 100644 --- a/boot/bootmeth_efi_mgr.c +++ b/boot/bootmeth_efi_mgr.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY UCLASS_BOOTSTD +#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c index 9b55686948f..ae0ad1d53e3 100644 --- a/boot/bootmeth_extlinux.c +++ b/boot/bootmeth_extlinux.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY UCLASS_BOOTSTD +#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootmeth_pxe.c b/boot/bootmeth_pxe.c index 03d2589c264..70f693aa239 100644 --- a/boot/bootmeth_pxe.c +++ b/boot/bootmeth_pxe.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY UCLASS_BOOTSTD +#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootmeth_qfw.c b/boot/bootmeth_qfw.c index dfaa944594e..8ebbc3ebcd5 100644 --- a/boot/bootmeth_qfw.c +++ b/boot/bootmeth_qfw.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY UCLASS_BOOTSTD +#include <common.h> #include <command.h> #include <bootdev.h> #include <bootflow.h> diff --git a/boot/bootmeth_sandbox.c b/boot/bootmeth_sandbox.c index 0bc8f688e30..aabc57e635a 100644 --- a/boot/bootmeth_sandbox.c +++ b/boot/bootmeth_sandbox.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY UCLASS_BOOTSTD +#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c index 0e05d28d4d9..06340e43d2d 100644 --- a/boot/bootmeth_script.c +++ b/boot/bootmeth_script.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY UCLASS_BOOTSTD +#include <common.h> #include <blk.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootretry.c b/boot/bootretry.c index 587b2de7d6b..8d850df9d48 100644 --- a/boot/bootretry.c +++ b/boot/bootretry.c @@ -4,13 +4,12 @@ * Wolfgang Denk, DENX Software Engineering, [email protected]. */ -#include <stdio.h> +#include <common.h> #include <bootretry.h> #include <cli.h> #include <env.h> #include <errno.h> #include <time.h> -#include <vsprintf.h> #include <watchdog.h> static uint64_t endtime; /* must be set, default is instant timeout */ diff --git a/boot/bootstd-uclass.c b/boot/bootstd-uclass.c index 5de8efce19a..81555d341e3 100644 --- a/boot/bootstd-uclass.c +++ b/boot/bootstd-uclass.c @@ -6,6 +6,7 @@ * Written by Simon Glass <[email protected]> */ +#include <common.h> #include <bootflow.h> #include <bootstd.h> #include <dm.h> diff --git a/boot/cedit.c b/boot/cedit.c index c29a2be14ce..8c654dba6dc 100644 --- a/boot/cedit.c +++ b/boot/cedit.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY LOGC_EXPO +#include <common.h> #include <abuf.h> #include <cedit.h> #include <cli.h> diff --git a/boot/common_fit.c b/boot/common_fit.c index a2f9b8d83c3..cde2dc45e90 100644 --- a/boot/common_fit.c +++ b/boot/common_fit.c @@ -4,6 +4,7 @@ * Written by Simon Glass <[email protected]> */ +#include <common.h> #include <errno.h> #include <image.h> #include <log.h> diff --git a/boot/expo.c b/boot/expo.c index ed01483f1d3..cadb6a0ad6e 100644 --- a/boot/expo.c +++ b/boot/expo.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY LOGC_EXPO +#include <common.h> #include <dm.h> #include <expo.h> #include <malloc.h> diff --git a/boot/expo_build.c b/boot/expo_build.c index a4df798adeb..04d88a2c308 100644 --- a/boot/expo_build.c +++ b/boot/expo_build.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY LOGC_EXPO +#include <common.h> #include <expo.h> #include <fdtdec.h> #include <log.h> diff --git a/boot/fdt_simplefb.c b/boot/fdt_simplefb.c index 53415548459..837920bd3a3 100644 --- a/boot/fdt_simplefb.c +++ b/boot/fdt_simplefb.c @@ -6,6 +6,7 @@ * Stephen Warren <[email protected]> */ +#include <common.h> #include <dm.h> #include <fdt_support.h> #include <asm/global_data.h> diff --git a/boot/fdt_support.c b/boot/fdt_support.c index 874ca4d6f5a..2bd80a9dfb1 100644 --- a/boot/fdt_support.c +++ b/boot/fdt_support.c @@ -6,6 +6,7 @@ * Copyright 2010-2011 Freescale Semiconductor, Inc. */ +#include <common.h> #include <abuf.h> #include <env.h> #include <log.h> diff --git a/boot/image-android-dt.c b/boot/image-android-dt.c index 3b25018c2e7..fb014190d44 100644 --- a/boot/image-android-dt.c +++ b/boot/image-android-dt.c @@ -6,6 +6,7 @@ #include <image-android-dt.h> #include <dt_table.h> +#include <common.h> #include <linux/libfdt.h> #include <mapmem.h> diff --git a/boot/image-android.c b/boot/image-android.c index ddd8ffd5e54..88e40bc7ec6 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -3,6 +3,7 @@ * Copyright (c) 2011 Sebastian Andrzej Siewior <[email protected]> */ +#include <common.h> #include <env.h> #include <image.h> #include <image-android-dt.h> diff --git a/boot/image-board.c b/boot/image-board.c index b7884b8c5dc..09b6e4e0bdc 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -8,7 +8,7 @@ * Wolfgang Denk, DENX Software Engineering, [email protected]. */ -#include <config.h> +#include <common.h> #include <bootstage.h> #include <cpu_func.h> #include <display_options.h> diff --git a/boot/image-cipher.c b/boot/image-cipher.c index 9d389f26cea..b9061489396 100644 --- a/boot/image-cipher.c +++ b/boot/image-cipher.c @@ -7,6 +7,7 @@ #include "mkimage.h" #include <time.h> #else +#include <common.h> #include <malloc.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/boot/image-fdt.c b/boot/image-fdt.c index 56dd7687f51..f09716cba30 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -8,6 +8,7 @@ * Wolfgang Denk, DENX Software Engineering, [email protected]. */ +#include <common.h> #include <command.h> #include <fdt_support.h> #include <fdtdec.h> diff --git a/boot/image-fit-sig.c b/boot/image-fit-sig.c index fe328df4a85..12369896fe3 100644 --- a/boot/image-fit-sig.c +++ b/boot/image-fit-sig.c @@ -7,6 +7,7 @@ #include "mkimage.h" #include <time.h> #else +#include <common.h> #include <log.h> #include <malloc.h> #include <asm/global_data.h> diff --git a/boot/image-fit.c b/boot/image-fit.c index fb03cab831b..89e377563ce 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -19,6 +19,7 @@ #else #include <linux/compiler.h> #include <linux/sizes.h> +#include <common.h> #include <errno.h> #include <log.h> #include <mapmem.h> diff --git a/boot/image-pre-load.c b/boot/image-pre-load.c index cc19017404c..b504ab42a54 100644 --- a/boot/image-pre-load.c +++ b/boot/image-pre-load.c @@ -3,6 +3,7 @@ * Copyright (C) 2021 Philippe Reynes <[email protected]> */ +#include <common.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; #include <image.h> diff --git a/boot/image-sig.c b/boot/image-sig.c index 6bc74866eae..0421a61b040 100644 --- a/boot/image-sig.c +++ b/boot/image-sig.c @@ -3,6 +3,7 @@ * Copyright (c) 2013, Google Inc. */ +#include <common.h> #include <log.h> #include <malloc.h> #include <asm/global_data.h> diff --git a/boot/image.c b/boot/image.c index eb12e4be04a..073931cd7a3 100644 --- a/boot/image.c +++ b/boot/image.c @@ -7,6 +7,7 @@ */ #ifndef USE_HOSTCC +#include <common.h> #include <env.h> #include <display_options.h> #include <init.h> diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 4b22bb6f525..5c1c962ff4c 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -4,6 +4,7 @@ * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. */ +#include <common.h> #include <command.h> #include <dm.h> #include <env.h> diff --git a/boot/scene.c b/boot/scene.c index ac976aa26bb..d4dfb49ada1 100644 --- a/boot/scene.c +++ b/boot/scene.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY LOGC_EXPO +#include <common.h> #include <dm.h> #include <expo.h> #include <malloc.h> diff --git a/boot/scene_menu.c b/boot/scene_menu.c index 80bd7457cb1..63994165efb 100644 --- a/boot/scene_menu.c +++ b/boot/scene_menu.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY LOGC_EXPO +#include <common.h> #include <dm.h> #include <expo.h> #include <malloc.h> diff --git a/boot/scene_textline.c b/boot/scene_textline.c index bba8663b98d..6ea072a1c26 100644 --- a/boot/scene_textline.c +++ b/boot/scene_textline.c @@ -8,12 +8,10 @@ #define LOG_CATEGORY LOGC_EXPO +#include <common.h> #include <expo.h> #include <menu.h> -#include <log.h> #include <video_console.h> -#include <linux/errno.h> -#include <linux/string.h> #include "scene_internal.h" int scene_textline(struct scene *scn, const char *name, uint id, uint max_chars, diff --git a/boot/vbe.c b/boot/vbe.c index 00673de7ee2..52b32830037 100644 --- a/boot/vbe.c +++ b/boot/vbe.c @@ -6,6 +6,7 @@ * Written by Simon Glass <[email protected]> */ +#include <common.h> #include <bootmeth.h> #include <bootstd.h> #include <dm.h> diff --git a/boot/vbe_request.c b/boot/vbe_request.c index a1350c1a706..0293ac6c869 100644 --- a/boot/vbe_request.c +++ b/boot/vbe_request.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY LOGC_BOOT +#include <common.h> #include <dm.h> #include <event.h> #include <image.h> diff --git a/boot/vbe_simple.c b/boot/vbe_simple.c index 189e86d2a22..12682abd399 100644 --- a/boot/vbe_simple.c +++ b/boot/vbe_simple.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY LOGC_BOOT +#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/vbe_simple_fw.c b/boot/vbe_simple_fw.c index 4d6da9490a7..d59a704ddba 100644 --- a/boot/vbe_simple_fw.c +++ b/boot/vbe_simple_fw.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY LOGC_BOOT +#include <common.h> #include <bloblist.h> #include <bootdev.h> #include <bootflow.h> diff --git a/boot/vbe_simple_os.c b/boot/vbe_simple_os.c index b4126d8d2d0..84626cdeaf2 100644 --- a/boot/vbe_simple_os.c +++ b/boot/vbe_simple_os.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY LOGC_BOOT +#include <common.h> #include <dm.h> #include <bootflow.h> #include <vbe.h> |