projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmd/gpt: avoid NULL check before free()
[oweals/u-boot.git]
/
cmd
/
bmp.c
diff --git
a/cmd/bmp.c
b/cmd/bmp.c
index 00f0256a30e257b7a50028642c9051e85b79de19..edf4f564266bf9eddbe068c6765ad12ede49fb22 100644
(file)
--- a/
cmd/bmp.c
+++ b/
cmd/bmp.c
@@
-9,16
+9,17
@@
*/
#include <common.h>
*/
#include <common.h>
-#include <dm.h>
-#include <lcd.h>
-#include <mapmem.h>
#include <bmp_layout.h>
#include <command.h>
#include <bmp_layout.h>
#include <command.h>
-#include <asm/byteorder.h>
+#include <dm.h>
+#include <gzip.h>
+#include <image.h>
+#include <lcd.h>
#include <malloc.h>
#include <mapmem.h>
#include <splash.h>
#include <video.h>
#include <malloc.h>
#include <mapmem.h>
#include <splash.h>
#include <video.h>
+#include <asm/byteorder.h>
static int bmp_info (ulong addr);
static int bmp_info (ulong addr);
@@
-95,8
+96,8
@@
static int do_bmp_info(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[
ulong addr;
switch (argc) {
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);
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) {
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);
break;
case 2: /* use argument */
addr = simple_strtoul(argv[1], NULL, 16);