From e9c669867a8473116673a1e996ff74bbb1867f55 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Tue, 3 Dec 2019 09:38:35 +0100 Subject: cmd: pxe: execute the cls command only when supported Execute the command cls (for clear screen), when the "menu background" keyword is present in extlinux.conf file, only if the command is supported. This patch avoid the warning "Unknown command 'cls'" with "menu background" in extlinux.conf when CONFIG_CMD_BMP is activated and CONFIG_CMD_CLS not activated (default for CONFIG_DM_VIDEO). Signed-off-by: Patrick Delaunay Reviewed-by: Patrice Chotard --- cmd/pxe_utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmd') diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index 8b830212ce1..53af04d7dc7 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -1312,7 +1312,8 @@ void handle_pxe_menu(cmd_tbl_t *cmdtp, struct pxe_menu *cfg) /* display BMP if available */ if (cfg->bmp) { if (get_relfile(cmdtp, cfg->bmp, image_load_addr)) { - run_command("cls", 0); + if (CONFIG_IS_ENABLED(CMD_CLS)) + run_command("cls", 0); bmp_display(image_load_addr, BMP_ALIGN_CENTER, BMP_ALIGN_CENTER); } else { -- cgit v1.3.1 From 17f084fa8c64c97a68d854bd8611a55f69ac056d Mon Sep 17 00:00:00 2001 From: Joel Johnson Date: Sat, 11 Jan 2020 09:09:34 -0700 Subject: zfs: remove unused buf variable Remove unused variable to silence compiler warning Signed-off-by: Joel Johnson --- cmd/zfs.c | 1 - 1 file changed, 1 deletion(-) (limited to 'cmd') diff --git a/cmd/zfs.c b/cmd/zfs.c index 15331306356..9c237a5758d 100644 --- a/cmd/zfs.c +++ b/cmd/zfs.c @@ -40,7 +40,6 @@ static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] ulong addr = 0; disk_partition_t info; struct blk_desc *dev_desc; - char buf[12]; unsigned long count; const char *addr_str; struct zfs_file zfile; -- cgit v1.3.1