diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-20 12:23:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-20 12:23:33 -0500 |
| commit | c7819d409ab7671991bf906482b7adcc21266f75 (patch) | |
| tree | eab7a9eba205f31dd1f4b606ec58d64ec5e933f1 /common/board_r.c | |
| parent | c8a1198665b81113535e89c791a7991abe481d62 (diff) | |
| parent | addc376318d765902027021d88f693e95d1e1bcd (diff) | |
Merge branch '2020-01-17-reduce-size-of-common-h-even-more'
- Bring in Simon Glass's series that reduces what we have in <common.h>
even more.
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/common/board_r.c b/common/board_r.c index e711de64b5..8a0c1114e7 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -12,7 +12,11 @@ #include <common.h> #include <api.h> #include <cpu_func.h> +#include <exports.h> +#include <hang.h> +#include <image.h> #include <irq_func.h> +#include <net.h> #include <u-boot/crc.h> /* TODO: can we just include all these headers whether needed or not? */ #if defined(CONFIG_CMD_BEDBUG) @@ -26,6 +30,7 @@ #include <env_internal.h> #include <fdtdec.h> #include <ide.h> +#include <init.h> #include <initcall.h> #if defined(CONFIG_CMD_KGDB) #include <kgdb.h> @@ -481,7 +486,7 @@ static int initr_env(void) #endif /* Initialize from environment */ - load_addr = env_get_ulong("loadaddr", 16, load_addr); + image_load_addr = env_get_ulong("loadaddr", 16, image_load_addr); return 0; } |