diff options
| author | Tom Rini <trini@konsulko.com> | 2024-06-24 13:34:52 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-06-24 13:34:52 -0600 |
| commit | a7eada24327a40f7ef6c55c220e119839c9d4227 (patch) | |
| tree | efbea0c3cb6845fe9b5841b100c2770a60cb3f68 /cmd | |
| parent | d3c610fa462a76880845920e7c535133a264448a (diff) | |
| parent | 9e9f78f7aa0124ef0e622532043acf87e84008dc (diff) | |
| download | u-boot-a7eada24327a40f7ef6c55c220e119839c9d4227.zip u-boot-a7eada24327a40f7ef6c55c220e119839c9d4227.tar.gz u-boot-a7eada24327a40f7ef6c55c220e119839c9d4227.tar.bz2 | |
Merge tag 'v2024.07-rc5' into next
Prepare v2024.07-rc5
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | cmd/sound.c | 2 | ||||
| -rw-r--r-- | cmd/usb.c | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index a2dee34..40ac5a8 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -622,7 +622,7 @@ config CMD_ZBOOT Consider using FIT in preference to this since it supports directly booting both 32- and 64-bit kernels, as well as secure boot. - Documentation is available in doc/uImage.FIT/x86-fit-boot.txt + Documentation is available in doc/usage/fit/x86-fit-boot.rst. endmenu diff --git a/cmd/sound.c b/cmd/sound.c index 08bf741..8f67cbd 100644 --- a/cmd/sound.c +++ b/cmd/sound.c @@ -98,7 +98,7 @@ U_BOOT_CMD( sound, INT_MAX, 1, do_sound, "sound sub-system", "init - initialise the sound driver\n" - "sound play [[[-q|-s] len [freq]] ...] - play sounds\n" + "sound play [len [freq [len [freq ...]]]] - play sounds\n" " len - duration in ms\n" " freq - frequency in Hz\n" ); @@ -25,9 +25,6 @@ #ifdef CONFIG_USB_STORAGE static int usb_stor_curr_dev = -1; /* current device */ #endif -#if defined(CONFIG_USB_HOST_ETHER) && !defined(CONFIG_DM_ETH) -static int __maybe_unused usb_ether_curr_dev = -1; /* current ethernet device */ -#endif /* some display routines (info command) */ static char *usb_get_class_desc(unsigned char dclass) |