diff options
| author | Tom Rini <[email protected]> | 2021-11-16 14:23:30 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-11-16 14:23:30 -0500 |
| commit | 3144ba23bf4649f699078259fdf2e5cb4eab8f53 (patch) | |
| tree | f19391a1e5401b638c072cb654b5f32858f17a67 /boot | |
| parent | 2ffa0e87df3a7595f71d05782924ee83146d9fe7 (diff) | |
| parent | 4b32531be236bbd9ca60f26447511f79e214f79e (diff) | |
Merge branch '2021-11-15-assorted-fixes'
- Rename "tqc" to "tq" and related updates
- Assorted minor ARM updates, build updates and documentation updates
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 ddf30c67302..bf8817165ca 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 992e72991da..f792f2aa69a 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 */ |