diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-29 20:00:57 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-29 20:00:57 +0300 |
| commit | 2402c93130c09b881f9cc1369459fb49d9fa0f74 (patch) | |
| tree | b98fcb4632c62e8693d8ee1acfa3af55c52f634a /boot | |
| parent | c087b5ad974441d1408c028eb7087d86b6d127e9 (diff) | |
| parent | ade37460a944aed36ae6ee634c4d4a9a22690461 (diff) | |
| download | u-boot-2402c93130c09b881f9cc1369459fb49d9fa0f74.tar.xz | |
Merge tag 'v2022.01-rc3' into next
Prepare v2022.01-rc3
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/image-board.c | 1 | ||||
| -rw-r--r-- | boot/image.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/boot/image-board.c b/boot/image-board.c index ddf30c6730..bf8817165c 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -14,6 +14,7 @@ #include <env.h> #include <fpga.h> #include <image.h> +#include <init.h> #include <mapmem.h> #include <rtc.h> #include <watchdog.h> diff --git a/boot/image.c b/boot/image.c index 992e72991d..f792f2aa69 100644 --- a/boot/image.c +++ b/boot/image.c @@ -9,6 +9,7 @@ #ifndef USE_HOSTCC #include <common.h> #include <env.h> +#include <init.h> #include <lmb.h> #include <log.h> #include <malloc.h> @@ -29,11 +30,6 @@ #include <linux/errno.h> #include <asm/io.h> -#ifdef CONFIG_CMD_BDI -extern int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, - char *const argv[]); -#endif - DECLARE_GLOBAL_DATA_PTR; /* Set this if we have less than 4 MB of malloc() space */ |