diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-18 20:20:43 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-19 08:16:36 -0600 |
| commit | d678a59d2d719da9e807495b4b021501f2836ca5 (patch) | |
| tree | 313e5c32e3d02d3cf1904875b1655140973126e9 /boot | |
| parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
| download | u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.gz u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.bz2 u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.zip | |
Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.
This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'boot')
43 files changed, 43 insertions, 6 deletions
diff --git a/boot/android_ab.c b/boot/android_ab.c index 143f373aae..1e5aa81b75 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 4dcaf95c6a..9d39412656 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 7c7bba088c..46815ea2fd 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 9aa3179c38..68bf99329a 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 143ef84133..16f9cd8f8c 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 6fa8edab02..032f5a4a16 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 15297ddb53..ccde72d22c 100644 --- a/boot/bootm_os.c +++ b/boot/bootm_os.c @@ -4,6 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ +#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 c0abadef97..1d157d54db 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 645b8bed10..f015f2e1c7 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 c7035c0d0c..aebc5207fc 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 23ae1e610a..b7d429f2c3 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 9b55686948..ae0ad1d53e 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 03d2589c26..70f693aa23 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 dfaa944594..8ebbc3ebcd 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 0bc8f688e3..aabc57e635 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 0e05d28d4d..06340e43d2 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 587b2de7d6..8d850df9d4 100644 --- a/boot/bootretry.c +++ b/boot/bootretry.c @@ -4,13 +4,12 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#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 5de8efce19..81555d341e 100644 --- a/boot/bootstd-uclass.c +++ b/boot/bootstd-uclass.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <bootflow.h> #include <bootstd.h> #include <dm.h> diff --git a/boot/cedit.c b/boot/cedit.c index c29a2be14c..8c654dba6d 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 a2f9b8d83c..cde2dc45e9 100644 --- a/boot/common_fit.c +++ b/boot/common_fit.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <errno.h> #include <image.h> #include <log.h> diff --git a/boot/expo.c b/boot/expo.c index ed01483f1d..cadb6a0ad6 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 a4df798ade..04d88a2c30 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 5341554845..837920bd3a 100644 --- a/boot/fdt_simplefb.c +++ b/boot/fdt_simplefb.c @@ -6,6 +6,7 @@ * Stephen Warren <swarren@wwwdotorg.org> */ +#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 874ca4d6f5..2bd80a9dfb 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 3b25018c2e..fb014190d4 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 ddd8ffd5e5..88e40bc7ec 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -3,6 +3,7 @@ * Copyright (c) 2011 Sebastian Andrzej Siewior <bigeasy@linutronix.de> */ +#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 b7884b8c5d..09b6e4e0bd 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -8,7 +8,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#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 9d389f26ce..b906148939 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 56dd7687f5..f09716cba3 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -8,6 +8,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ +#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 fe328df4a8..12369896fe 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 fb03cab831..89e377563c 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 cc19017404..b504ab42a5 100644 --- a/boot/image-pre-load.c +++ b/boot/image-pre-load.c @@ -3,6 +3,7 @@ * Copyright (C) 2021 Philippe Reynes <philippe.reynes@softathome.com> */ +#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 6bc74866ea..0421a61b04 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 eb12e4be04..073931cd7a 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 4b22bb6f52..5c1c962ff4 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 ac976aa26b..d4dfb49ada 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 80bd7457cb..63994165ef 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 bba8663b98..6ea072a1c2 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 00673de7ee..52b3283003 100644 --- a/boot/vbe.c +++ b/boot/vbe.c @@ -6,6 +6,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#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 a1350c1a70..0293ac6c86 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 189e86d2a2..12682abd39 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 4d6da9490a..d59a704ddb 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 b4126d8d2d..84626cdeaf 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> |