d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stand: uboot_fmtdev can be reduced to devformat

Browse Source 
devformat produces the same output as uboot_fmtdev, so just use it to
reduce on the dependencies.

Sponsored by:		Netflix
Differential Revision:	https://reviews.freebsd.org/D35926
This commit is contained in:
Warner Losh 2022-08-11 09:08:52 -06:00
parent 1e9b23448a
commit add8154e45
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
stand/uboot/devicename.c
View File

@ -160,29 +160,6 @@ fail:
}
char *
uboot_fmtdev(void *vdev)
{
struct uboot_devdesc *dev = (struct uboot_devdesc *)vdev;
static char buf[128];
switch(dev->dd.d_dev->dv_type) {
case DEVT_NONE:
strcpy(buf, "(no device)");
break;
case DEVT_DISK:
#ifdef LOADER_DISK_SUPPORT
return (disk_fmtdev(vdev));
#endif
case DEVT_NET:
sprintf(buf, "%s%d:", dev->dd.d_dev->dv_name, dev->dd.d_unit);
break;
}
return(buf);
}
/*
* Set currdev to suit the value being supplied in (value).
*/

1
stand/uboot/libuboot.h
View File

@ -50,7 +50,6 @@ struct uboot_devdesc {
#endif
int uboot_getdev(void **vdev, const char *devspec, const char **path);
char *uboot_fmtdev(void *vdev);
int uboot_setcurrdev(struct env_var *ev, int flags, const void *value);
extern int devs_no;

2
stand/uboot/main.c
View File

@ -533,7 +533,7 @@ main(int argc, char **argv)
return (0xbadef1ce);
}
ldev = uboot_fmtdev(&currdev);
ldev = devformat(&currdev.dd);
env_setenv("currdev", EV_VOLATILE, ldev, uboot_setcurrdev, env_nounset);
env_setenv("loaddev", EV_VOLATILE, ldev, env_noset, env_nounset);
printf("Booting from %s\n", ldev);