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 /cmd/bmp.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 'cmd/bmp.c')
| -rw-r--r-- | cmd/bmp.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -13,6 +13,7 @@ #include <command.h> #include <dm.h> #include <gzip.h> +#include <image.h> #include <lcd.h> #include <malloc.h> #include <mapmem.h> @@ -95,8 +96,8 @@ static int do_bmp_info(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[ ulong addr; switch (argc) { - case 1: /* use load_addr as default address */ - addr = load_addr; + case 1: /* use image_load_addr as default address */ + addr = image_load_addr; break; case 2: /* use argument */ addr = simple_strtoul(argv[1], NULL, 16); @@ -116,8 +117,8 @@ static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const ar splash_get_pos(&x, &y); switch (argc) { - case 1: /* use load_addr as default address */ - addr = load_addr; + case 1: /* use image_load_addr as default address */ + addr = image_load_addr; break; case 2: /* use argument */ addr = simple_strtoul(argv[1], NULL, 16); |