From bb872dd930ccc0fb7a91c1b8e34b39ce2e9fed06 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 28 Dec 2019 10:45:02 -0700 Subject: image: Rename load_addr, save_addr, save_size These global variables are quite short and generic. In fact the same name is more often used locally for struct members and function arguments. Add a image_ prefix to make them easier to distinguish. Signed-off-by: Simon Glass --- cmd/pxe_utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd/pxe_utils.c') diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index a636346bb51..ff8b0dcd7b8 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -1310,9 +1310,9 @@ void handle_pxe_menu(cmd_tbl_t *cmdtp, struct pxe_menu *cfg) #ifdef CONFIG_CMD_BMP /* display BMP if available */ if (cfg->bmp) { - if (get_relfile(cmdtp, cfg->bmp, load_addr)) { + if (get_relfile(cmdtp, cfg->bmp, image_load_addr)) { run_command("cls", 0); - bmp_display(load_addr, + bmp_display(image_load_addr, BMP_ALIGN_CENTER, BMP_ALIGN_CENTER); } else { printf("Skipping background bmp %s for failure\n", -- cgit v1.2.3 From 8e8ccfe1aa1a3ea0cb88b4438c7a687fcf8632a1 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 28 Dec 2019 10:45:03 -0700 Subject: common: Move the image globals into image.h These three globals relate to image handling. Move them to the image header file. Signed-off-by: Simon Glass --- cmd/pxe_utils.c | 1 + 1 file changed, 1 insertion(+) (limited to 'cmd/pxe_utils.c') diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index ff8b0dcd7b8..8b830212ce1 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include -- cgit v1.2.3