Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-17 10:24:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd: Allow building ufetch without CONFIG_BLK

Browse source 
The ufetch command is still quite useful on systems without block
device support; remove the CONFIG_BLK dependency and make sure the code
compiles/works with and without CONFIG_BLK.

Reviewed-by: Caleb Connolly <caleb.connolly@linaro.org>
Signed-off-by: J. Neuschäfer <j.ne@posteo.net>
Link: https://lore.kernel.org/r/20241211-ufetch-v2-2-2b5432ffaeb1@posteo.net
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
This commit is contained in:
J. Neuschäfer 2024-12-11 23:25:26 +01:00 • committed by Caleb Connolly
parent e288366364
commit c38d5bad35
No known key found for this signature in database
GPG key ID: 7930459FB9303217
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/Kconfig
View file

@ -178,7 +178,6 @@ config CMD_CPU
config CMD_UFETCH config CMD_UFETCH
bool "U-Boot fetch" bool "U-Boot fetch"
depends on BLK
help help
Fetch utility for U-Boot (akin to neofetch). Prints information Fetch utility for U-Boot (akin to neofetch). Prints information
about U-Boot and the board it is running on in a pleasing format. about U-Boot and the board it is running on in a pleasing format.

13
cmd/ufetch.c
View file

@ -92,11 +92,9 @@ static int do_ufetch(struct cmd_tbl *cmdtp, int flag, int argc,
int num_lines = max((size_t)LAST_LINE + 1, ARRAY_SIZE(logo_lines)); int num_lines = max((size_t)LAST_LINE + 1, ARRAY_SIZE(logo_lines));
const char *model, *compatible; const char *model, *compatible;
char *ipaddr; char *ipaddr;
int n_cmds, n_cpus = 0, ret, compatlen; int n_cmds, n_cpus = 0, compatlen;
size_t size; size_t size;
ofnode np; ofnode np;
struct udevice *dev;
struct blk_desc *desc;
bool skip_ascii = false; bool skip_ascii = false;
if (argc > 1 && strcmp(argv[1], "-n") == 0) { if (argc > 1 && strcmp(argv[1], "-n") == 0) {
@ -199,7 +197,12 @@ static int do_ufetch(struct cmd_tbl *cmdtp, int flag, int argc,
print_size(size, "\n"); print_size(size, "\n");
break; break;
case STORAGE: case STORAGE:
default: default: {
#ifdef CONFIG_BLK
struct udevice *dev;
struct blk_desc *desc;
int ret;
ret = uclass_find_device_by_seq(UCLASS_BLK, line - STORAGE, &dev); ret = uclass_find_device_by_seq(UCLASS_BLK, line - STORAGE, &dev);
if (!ret && dev) { if (!ret && dev) {
desc = dev_get_uclass_plat(dev); desc = dev_get_uclass_plat(dev);
@ -213,8 +216,10 @@ static int do_ufetch(struct cmd_tbl *cmdtp, int flag, int argc,
} else if (ret == -ENODEV && (skip_ascii || line > ARRAY_SIZE(logo_lines))) { } else if (ret == -ENODEV && (skip_ascii || line > ARRAY_SIZE(logo_lines))) {
break; break;
} }
#endif
printf("\n"); printf("\n");
} }
}
} }
printf(RESET "\n\n"); printf(RESET "\n\n");