diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4a2ec41bb..d1c5caecf 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -239,7 +239,7 @@ config THUMB2_BAREBOX bool "Compile barebox in thumb-2 mode (read help)" help This enables compilation of barebox in thumb-2 mode which generates - ~25% smaller binaries. Arm Assembly code needs some fixups to be able + ~25% smaller binaries. ARM assembly code needs some fixups to be able to work correctly in thumb-2 mode. the barebox core should have these fixups since most assembly code is derived from the Kernel. However, your board lowlevel init code may break in thumb-2 mode. You have been @@ -254,22 +254,7 @@ config ARM_BOARD_APPEND_ATAG endmenu -menu "Arm specific settings" - -config CMD_ARM_CPUINFO - bool "cpuinfo command" - default y - help - Say yes here to get a cpuinfo command to show some - CPU information using the cp15 registers - -config CMD_ARM_MMUINFO - bool "mmuinfo command" - depends on CPU_V7 - default n - help - Say yes here to get a mmuinfo command to show some - MMU and cache information using the cp15 registers +menu "ARM specific settings" config CPU_V7_DCACHE_SKIP bool "Skip DCache Invalidate" diff --git a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c index 9df2d64e3..378f4e80e 100644 --- a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c +++ b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c @@ -352,13 +352,9 @@ static int do_cpufreq(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_cpufreq_help[] = -"Usage: cpufreq 399|532\n" -"\n" -"Set CPU frequency to MHz\n"; - BAREBOX_CMD_START(cpufreq) .cmd = do_cpufreq, - .usage = "adjust CPU frequency", - BAREBOX_CMD_HELP(cmd_cpufreq_help) + BAREBOX_CMD_DESC("adjust CPU frequency") + BAREBOX_CMD_OPTS("399|532") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_END diff --git a/arch/arm/boards/guf-cupid/board.c b/arch/arm/boards/guf-cupid/board.c index 356bf56a9..90f16272f 100644 --- a/arch/arm/boards/guf-cupid/board.c +++ b/arch/arm/boards/guf-cupid/board.c @@ -346,13 +346,9 @@ static int do_cpufreq(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_cpufreq_help[] = -"Usage: cpufreq 399|532\n" -"\n" -"Set CPU frequency to MHz\n"; - BAREBOX_CMD_START(cpufreq) .cmd = do_cpufreq, - .usage = "adjust CPU frequency", - BAREBOX_CMD_HELP(cmd_cpufreq_help) + BAREBOX_CMD_DESC("adjust CPU frequency") + BAREBOX_CMD_OPTS("399|532") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_END diff --git a/arch/arm/boards/highbank/init.c b/arch/arm/boards/highbank/init.c index d5d341a8b..7b4f9637d 100644 --- a/arch/arm/boards/highbank/init.c +++ b/arch/arm/boards/highbank/init.c @@ -76,7 +76,7 @@ static int highbank_mem_init(void) /* load by the firmware at 0x1000 */ fdt = IOMEM(FIRMWARE_DTB_BASE); - root = of_unflatten_dtb(NULL, fdt); + root = of_unflatten_dtb(fdt); if (!root) { pr_warn("no dtb found at 0x1000 use default configuration\n"); fdt = NULL; diff --git a/arch/arm/boards/phytec-phycore-imx35/pcm043.c b/arch/arm/boards/phytec-phycore-imx35/pcm043.c index 6abfc92c1..d1dd28fc6 100644 --- a/arch/arm/boards/phytec-phycore-imx35/pcm043.c +++ b/arch/arm/boards/phytec-phycore-imx35/pcm043.c @@ -324,14 +324,10 @@ static int do_cpufreq(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_cpufreq_help[] = -"Usage: cpufreq 399|532\n" -"\n" -"Set CPU frequency to MHz\n"; - BAREBOX_CMD_START(cpufreq) .cmd = do_cpufreq, - .usage = "adjust CPU frequency", - BAREBOX_CMD_HELP(cmd_cpufreq_help) + BAREBOX_CMD_DESC("adjust CPU frequency") + BAREBOX_CMD_OPTS("399|532") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_END diff --git a/arch/arm/configs/a9m2410_defconfig b/arch/arm/configs/a9m2410_defconfig index a69b0f947..d7b08f5cf 100644 --- a/arch/arm/configs/a9m2410_defconfig +++ b/arch/arm/configs/a9m2410_defconfig @@ -27,8 +27,8 @@ CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_NET_SMC91111=y diff --git a/arch/arm/configs/a9m2440_defconfig b/arch/arm/configs/a9m2440_defconfig index c4c4e1e8e..59b16a8f1 100644 --- a/arch/arm/configs/a9m2440_defconfig +++ b/arch/arm/configs/a9m2440_defconfig @@ -29,8 +29,8 @@ CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_NET_SMC91111=y diff --git a/arch/arm/configs/am335x_beaglebone_defconfig b/arch/arm/configs/am335x_beaglebone_defconfig index 857b89cdf..80c0ca54f 100644 --- a/arch/arm/configs/am335x_beaglebone_defconfig +++ b/arch/arm/configs/am335x_beaglebone_defconfig @@ -61,8 +61,8 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_DETECT=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y diff --git a/arch/arm/configs/animeo_ip_defconfig b/arch/arm/configs/animeo_ip_defconfig index e076162b4..ca8d2f1f9 100644 --- a/arch/arm/configs/animeo_ip_defconfig +++ b/arch/arm/configs/animeo_ip_defconfig @@ -50,9 +50,9 @@ CONFIG_CMD_MIITOOL=y CONFIG_CMD_WD=y CONFIG_CMD_WD_DEFAULT_TIMOUT=16 CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_MICREL_PHY=y CONFIG_DRIVER_NET_MACB=y CONFIG_NET_USB=y diff --git a/arch/arm/configs/archosg9_defconfig b/arch/arm/configs/archosg9_defconfig index 40e443357..0a6ad683a 100644 --- a/arch/arm/configs/archosg9_defconfig +++ b/arch/arm/configs/archosg9_defconfig @@ -65,8 +65,8 @@ CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_CMD_MIITOOL=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_SERIAL_NS16550=y diff --git a/arch/arm/configs/at91rm9200ek_defconfig b/arch/arm/configs/at91rm9200ek_defconfig index cc6344579..6197b97d5 100644 --- a/arch/arm/configs/at91rm9200ek_defconfig +++ b/arch/arm/configs/at91rm9200ek_defconfig @@ -48,9 +48,9 @@ CONFIG_CMD_SPI=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig index 9c5c7d520..6e67f1fb4 100644 --- a/arch/arm/configs/at91sam9260ek_defconfig +++ b/arch/arm/configs/at91sam9260ek_defconfig @@ -46,9 +46,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/at91sam9261ek_defconfig b/arch/arm/configs/at91sam9261ek_defconfig index ac5c6638b..591b5feff 100644 --- a/arch/arm/configs/at91sam9261ek_defconfig +++ b/arch/arm/configs/at91sam9261ek_defconfig @@ -45,9 +45,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_RESOLV=y diff --git a/arch/arm/configs/at91sam9261ek_first_stage_defconfig b/arch/arm/configs/at91sam9261ek_first_stage_defconfig index c4bc207ae..6071aea17 100644 --- a/arch/arm/configs/at91sam9261ek_first_stage_defconfig +++ b/arch/arm/configs/at91sam9261ek_first_stage_defconfig @@ -46,9 +46,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_DM9K=y CONFIG_DRIVER_SPI_ATMEL=y diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig index e78849a4a..d7d147a59 100644 --- a/arch/arm/configs/at91sam9263ek_defconfig +++ b/arch/arm/configs/at91sam9263ek_defconfig @@ -43,9 +43,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_NET_MACB=y diff --git a/arch/arm/configs/at91sam9g10ek_defconfig b/arch/arm/configs/at91sam9g10ek_defconfig index b22969c45..9c12ed4a4 100644 --- a/arch/arm/configs/at91sam9g10ek_defconfig +++ b/arch/arm/configs/at91sam9g10ek_defconfig @@ -44,9 +44,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_RESOLV=y diff --git a/arch/arm/configs/at91sam9g20ek_defconfig b/arch/arm/configs/at91sam9g20ek_defconfig index af10c6cd6..0faa485f2 100644 --- a/arch/arm/configs/at91sam9g20ek_defconfig +++ b/arch/arm/configs/at91sam9g20ek_defconfig @@ -46,9 +46,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/at91sam9m10g45ek_defconfig b/arch/arm/configs/at91sam9m10g45ek_defconfig index 7e05e9576..b088976ef 100644 --- a/arch/arm/configs/at91sam9m10g45ek_defconfig +++ b/arch/arm/configs/at91sam9m10g45ek_defconfig @@ -54,9 +54,9 @@ CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/at91sam9m10ihd_defconfig b/arch/arm/configs/at91sam9m10ihd_defconfig index 2faaa6857..c3df02378 100644 --- a/arch/arm/configs/at91sam9m10ihd_defconfig +++ b/arch/arm/configs/at91sam9m10ihd_defconfig @@ -56,9 +56,9 @@ CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_I2C=y CONFIG_CMD_SPI=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_MACB=y diff --git a/arch/arm/configs/at91sam9n12ek_defconfig b/arch/arm/configs/at91sam9n12ek_defconfig index 55cf5bc48..03fb063d3 100644 --- a/arch/arm/configs/at91sam9n12ek_defconfig +++ b/arch/arm/configs/at91sam9n12ek_defconfig @@ -51,9 +51,9 @@ CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_CMD_MIITOOL=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_DRIVER_NET_KS8851_MLL=y CONFIG_DRIVER_SPI_ATMEL=y diff --git a/arch/arm/configs/at91sam9x5ek_defconfig b/arch/arm/configs/at91sam9x5ek_defconfig index d2cdaf279..93975d43d 100644 --- a/arch/arm/configs/at91sam9x5ek_defconfig +++ b/arch/arm/configs/at91sam9x5ek_defconfig @@ -49,9 +49,9 @@ CONFIG_CMD_I2C=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_DRIVER_NET_MACB=y CONFIG_NET_USB=y diff --git a/arch/arm/configs/ccmx51_defconfig b/arch/arm/configs/ccmx51_defconfig index b40668661..cc2baa20c 100644 --- a/arch/arm/configs/ccmx51_defconfig +++ b/arch/arm/configs/ccmx51_defconfig @@ -41,8 +41,8 @@ CONFIG_CMD_I2C=y CONFIG_CMD_SPI=y CONFIG_CMD_CLK=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_DRIVER_NET_SMC911X=y CONFIG_DRIVER_NET_FEC_IMX=y CONFIG_I2C=y diff --git a/arch/arm/configs/chumbyone_defconfig b/arch/arm/configs/chumbyone_defconfig index 228a7b2eb..5eb59627f 100644 --- a/arch/arm/configs/chumbyone_defconfig +++ b/arch/arm/configs/chumbyone_defconfig @@ -9,7 +9,7 @@ CONFIG_PROMPT="chumby:" CONFIG_LONGHELP=y CONFIG_GLOB=y CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_HUSH_GETOPT=y +CONFIG_CMD_GETOPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_PARTITION=y @@ -33,9 +33,9 @@ CONFIG_CMD_PARTITION=y CONFIG_CMD_SPLASH=y CONFIG_CMD_GPIO=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/cupid_defconfig b/arch/arm/configs/cupid_defconfig index e2ad9c6d2..6d5e3f554 100644 --- a/arch/arm/configs/cupid_defconfig +++ b/arch/arm/configs/cupid_defconfig @@ -49,9 +49,9 @@ CONFIG_CMD_SPLASH=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/datamodul-edm-qmx6_defconfig b/arch/arm/configs/datamodul-edm-qmx6_defconfig index 5a4d7c44d..16d4f3de0 100644 --- a/arch/arm/configs/datamodul-edm-qmx6_defconfig +++ b/arch/arm/configs/datamodul-edm-qmx6_defconfig @@ -64,8 +64,8 @@ CONFIG_CMD_CLK=y CONFIG_CMD_DETECT=y CONFIG_CMD_WD=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y diff --git a/arch/arm/configs/dss11_defconfig b/arch/arm/configs/dss11_defconfig index b4fcf0187..0785b9a2f 100644 --- a/arch/arm/configs/dss11_defconfig +++ b/arch/arm/configs/dss11_defconfig @@ -17,9 +17,9 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_LED=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_NET_MACB=y diff --git a/arch/arm/configs/edb93xx_defconfig b/arch/arm/configs/edb93xx_defconfig index 86b104026..89b3ca869 100644 --- a/arch/arm/configs/edb93xx_defconfig +++ b/arch/arm/configs/edb93xx_defconfig @@ -24,8 +24,8 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_NET_EP93XX=y diff --git a/arch/arm/configs/efika-mx-smartbook_defconfig b/arch/arm/configs/efika-mx-smartbook_defconfig index f436d0db7..753e9b694 100644 --- a/arch/arm/configs/efika-mx-smartbook_defconfig +++ b/arch/arm/configs/efika-mx-smartbook_defconfig @@ -71,9 +71,9 @@ CONFIG_CMD_CLK=y CONFIG_CMD_DETECT=y CONFIG_CMD_WD=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y diff --git a/arch/arm/configs/eukrea_cpuimx25_defconfig b/arch/arm/configs/eukrea_cpuimx25_defconfig index 4f8a95ce7..e81fb7060 100644 --- a/arch/arm/configs/eukrea_cpuimx25_defconfig +++ b/arch/arm/configs/eukrea_cpuimx25_defconfig @@ -51,9 +51,9 @@ CONFIG_CMD_I2C=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/eukrea_cpuimx27_defconfig b/arch/arm/configs/eukrea_cpuimx27_defconfig index 97b4291e6..6580dcb0b 100644 --- a/arch/arm/configs/eukrea_cpuimx27_defconfig +++ b/arch/arm/configs/eukrea_cpuimx27_defconfig @@ -37,8 +37,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_I2C=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_SERIAL_NS16550=y diff --git a/arch/arm/configs/eukrea_cpuimx35_defconfig b/arch/arm/configs/eukrea_cpuimx35_defconfig index 88e1e3d51..bec73368a 100644 --- a/arch/arm/configs/eukrea_cpuimx35_defconfig +++ b/arch/arm/configs/eukrea_cpuimx35_defconfig @@ -52,9 +52,9 @@ CONFIG_CMD_I2C=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/eukrea_cpuimx51_defconfig b/arch/arm/configs/eukrea_cpuimx51_defconfig index 3f5d81762..66bee6381 100644 --- a/arch/arm/configs/eukrea_cpuimx51_defconfig +++ b/arch/arm/configs/eukrea_cpuimx51_defconfig @@ -46,9 +46,9 @@ CONFIG_CMD_I2C=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y diff --git a/arch/arm/configs/freescale-mx21-ads_defconfig b/arch/arm/configs/freescale-mx21-ads_defconfig index 05f21d317..73d99b9f2 100644 --- a/arch/arm/configs/freescale-mx21-ads_defconfig +++ b/arch/arm/configs/freescale-mx21-ads_defconfig @@ -25,9 +25,9 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_DRIVER_NET_CS8900=y # CONFIG_SPI is not set CONFIG_MTD=y diff --git a/arch/arm/configs/freescale-mx25-3ds_defconfig b/arch/arm/configs/freescale-mx25-3ds_defconfig index 57d346594..65d8f2042 100644 --- a/arch/arm/configs/freescale-mx25-3ds_defconfig +++ b/arch/arm/configs/freescale-mx25-3ds_defconfig @@ -47,8 +47,8 @@ CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_NET_FEC_IMX=y diff --git a/arch/arm/configs/freescale-mx27-ads_defconfig b/arch/arm/configs/freescale-mx27-ads_defconfig index d374582e4..a8995ee9b 100644 --- a/arch/arm/configs/freescale-mx27-ads_defconfig +++ b/arch/arm/configs/freescale-mx27-ads_defconfig @@ -28,8 +28,8 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_SPI_IMX=y diff --git a/arch/arm/configs/freescale-mx28-evk_defconfig b/arch/arm/configs/freescale-mx28-evk_defconfig index d06bac823..b6a63200c 100644 --- a/arch/arm/configs/freescale-mx28-evk_defconfig +++ b/arch/arm/configs/freescale-mx28-evk_defconfig @@ -31,8 +31,8 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_SERIAL_AUART=y CONFIG_DRIVER_NET_FEC_IMX=y diff --git a/arch/arm/configs/freescale-mx35-3ds_defconfig b/arch/arm/configs/freescale-mx35-3ds_defconfig index e3f32629d..66436b591 100644 --- a/arch/arm/configs/freescale-mx35-3ds_defconfig +++ b/arch/arm/configs/freescale-mx35-3ds_defconfig @@ -47,8 +47,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_I2C=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_NET_SMC911X=y diff --git a/arch/arm/configs/freescale-mx51-babbage_defconfig b/arch/arm/configs/freescale-mx51-babbage_defconfig index 3d1ad31c7..708b5647f 100644 --- a/arch/arm/configs/freescale-mx51-babbage_defconfig +++ b/arch/arm/configs/freescale-mx51-babbage_defconfig @@ -58,8 +58,8 @@ CONFIG_CMD_SPI=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_CLK=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y CONFIG_DRIVER_NET_FEC_IMX=y diff --git a/arch/arm/configs/freescale-mx53-qsb_defconfig b/arch/arm/configs/freescale-mx53-qsb_defconfig index 8365234ea..efcf2842f 100644 --- a/arch/arm/configs/freescale-mx53-qsb_defconfig +++ b/arch/arm/configs/freescale-mx53-qsb_defconfig @@ -77,9 +77,9 @@ CONFIG_CMD_CLK=y CONFIG_CMD_DETECT=y CONFIG_CMD_WD=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y diff --git a/arch/arm/configs/freescale-mx53-smd_defconfig b/arch/arm/configs/freescale-mx53-smd_defconfig index f18c436c5..5ba62f514 100644 --- a/arch/arm/configs/freescale-mx53-smd_defconfig +++ b/arch/arm/configs/freescale-mx53-smd_defconfig @@ -48,9 +48,9 @@ CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/freescale-mx6-arm2_defconfig b/arch/arm/configs/freescale-mx6-arm2_defconfig index e071d1be1..7489c4712 100644 --- a/arch/arm/configs/freescale-mx6-arm2_defconfig +++ b/arch/arm/configs/freescale-mx6-arm2_defconfig @@ -45,9 +45,9 @@ CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_DRIVER_NET_FEC_IMX=y CONFIG_NET_USB=y diff --git a/arch/arm/configs/freescale-mx6-sabrelite_defconfig b/arch/arm/configs/freescale-mx6-sabrelite_defconfig index 520c31a8d..48d1ed2a1 100644 --- a/arch/arm/configs/freescale-mx6-sabrelite_defconfig +++ b/arch/arm/configs/freescale-mx6-sabrelite_defconfig @@ -62,8 +62,8 @@ CONFIG_CMD_SPI=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_CLK=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y diff --git a/arch/arm/configs/freescale-mx6-sabresd_defconfig b/arch/arm/configs/freescale-mx6-sabresd_defconfig index 4f31cb7cd..0ad7cc9cd 100644 --- a/arch/arm/configs/freescale-mx6-sabresd_defconfig +++ b/arch/arm/configs/freescale-mx6-sabresd_defconfig @@ -52,8 +52,8 @@ CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_FEC_IMX=y diff --git a/arch/arm/configs/friendlyarm_mini2440_defconfig b/arch/arm/configs/friendlyarm_mini2440_defconfig index 955e71b36..ed110141c 100644 --- a/arch/arm/configs/friendlyarm_mini2440_defconfig +++ b/arch/arm/configs/friendlyarm_mini2440_defconfig @@ -30,8 +30,8 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_NET_DM9K=y diff --git a/arch/arm/configs/friendlyarm_mini6410_defconfig b/arch/arm/configs/friendlyarm_mini6410_defconfig index b80f8fb1b..0d3f3e39d 100644 --- a/arch/arm/configs/friendlyarm_mini6410_defconfig +++ b/arch/arm/configs/friendlyarm_mini6410_defconfig @@ -30,8 +30,8 @@ CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_TFTP=y CONFIG_DRIVER_NET_DM9K=y # CONFIG_SPI is not set diff --git a/arch/arm/configs/friendlyarm_tiny6410_defconfig b/arch/arm/configs/friendlyarm_tiny6410_defconfig index 524619651..1ab8c08dd 100644 --- a/arch/arm/configs/friendlyarm_tiny6410_defconfig +++ b/arch/arm/configs/friendlyarm_tiny6410_defconfig @@ -31,8 +31,8 @@ CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_TFTP=y CONFIG_DRIVER_NET_DM9K=y # CONFIG_SPI is not set diff --git a/arch/arm/configs/highbank_defconfig b/arch/arm/configs/highbank_defconfig index b034ed1eb..3e02c2e32 100644 --- a/arch/arm/configs/highbank_defconfig +++ b/arch/arm/configs/highbank_defconfig @@ -46,9 +46,9 @@ CONFIG_CMD_PARTITION=y CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_CLK=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_SERIAL_AMBA_PL011=y diff --git a/arch/arm/configs/imx233-olinuxino_defconfig b/arch/arm/configs/imx233-olinuxino_defconfig index 40b7e1df2..3f444f19d 100644 --- a/arch/arm/configs/imx233-olinuxino_defconfig +++ b/arch/arm/configs/imx233-olinuxino_defconfig @@ -37,9 +37,9 @@ CONFIG_CMD_OFTREE=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_TFTP=y CONFIG_NET_TFTP_PUSH=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index b3157e30e..0c32d7d97 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -95,8 +95,8 @@ CONFIG_CMD_CLK=y CONFIG_CMD_DETECT=y CONFIG_CMD_WD=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y diff --git a/arch/arm/configs/mioa701_defconfig b/arch/arm/configs/mioa701_defconfig index 841b9be54..2046880dd 100644 --- a/arch/arm/configs/mioa701_defconfig +++ b/arch/arm/configs/mioa701_defconfig @@ -15,7 +15,7 @@ CONFIG_KALLSYMS=y CONFIG_LONGHELP=y CONFIG_GLOB=y CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_HUSH_GETOPT=y +CONFIG_CMD_GETOPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y diff --git a/arch/arm/configs/mmccpu_defconfig b/arch/arm/configs/mmccpu_defconfig index 0e6914fd6..6390b56f1 100644 --- a/arch/arm/configs/mmccpu_defconfig +++ b/arch/arm/configs/mmccpu_defconfig @@ -27,8 +27,8 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_NET_MACB=y diff --git a/arch/arm/configs/neso_defconfig b/arch/arm/configs/neso_defconfig index 7e1cce8c4..846eca0fc 100644 --- a/arch/arm/configs/neso_defconfig +++ b/arch/arm/configs/neso_defconfig @@ -49,9 +49,9 @@ CONFIG_CMD_SPLASH=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/netx_nxdb500_defconfig b/arch/arm/configs/netx_nxdb500_defconfig index 8e7a0b3cc..745afc18e 100644 --- a/arch/arm/configs/netx_nxdb500_defconfig +++ b/arch/arm/configs/netx_nxdb500_defconfig @@ -21,8 +21,8 @@ CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_NET_NETX=y diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig index 015b576cd..f86b59c41 100644 --- a/arch/arm/configs/nhk8815_defconfig +++ b/arch/arm/configs/nhk8815_defconfig @@ -36,9 +36,9 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig index 013d00058..445866f66 100644 --- a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig +++ b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig @@ -1,7 +1,7 @@ CONFIG_ARCH_OMAP=y # CONFIG_OMAP3_COPY_CLOCK_SRAM is not set CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -# CONFIG_CMD_MEMORY is not set +# CONFIG_COMPILE_MEMORY is not set CONFIG_TEXT_BASE=0x40200000 CONFIG_MEMORY_LAYOUT_FIXED=y CONFIG_STACK_BASE=0x87BF7F10 diff --git a/arch/arm/configs/omap3530_beagle_defconfig b/arch/arm/configs/omap3530_beagle_defconfig index e3eee8dfc..1ef4825c6 100644 --- a/arch/arm/configs/omap3530_beagle_defconfig +++ b/arch/arm/configs/omap3530_beagle_defconfig @@ -57,9 +57,9 @@ CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_I2C=y CONFIG_CMD_MIITOOL=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_SERIAL_NS16550=y diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig index 3fe2647fd..90ace31e6 100644 --- a/arch/arm/configs/omap3_evm_defconfig +++ b/arch/arm/configs/omap3_evm_defconfig @@ -2,7 +2,7 @@ CONFIG_ARCH_OMAP=y # CONFIG_OMAP3_COPY_CLOCK_SRAM is not set CONFIG_MACH_OMAP3EVM=y CONFIG_AEABI=y -# CONFIG_CMD_MEMORY is not set +# CONFIG_COMPILE_MEMORY is not set CONFIG_TEXT_BASE=0x40200000 CONFIG_MEMORY_LAYOUT_FIXED=y CONFIG_STACK_BASE=0x87BF7F10 diff --git a/arch/arm/configs/panda_defconfig b/arch/arm/configs/panda_defconfig index c42140a44..dab407ca6 100644 --- a/arch/arm/configs/panda_defconfig +++ b/arch/arm/configs/panda_defconfig @@ -58,8 +58,8 @@ CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_CMD_MIITOOL=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_SERIAL_NS16550=y diff --git a/arch/arm/configs/phytec-phycard-imx27_defconfig b/arch/arm/configs/phytec-phycard-imx27_defconfig index 6e3a3ada2..0d815440f 100644 --- a/arch/arm/configs/phytec-phycard-imx27_defconfig +++ b/arch/arm/configs/phytec-phycard-imx27_defconfig @@ -60,8 +60,8 @@ CONFIG_CMD_MIITOOL=y CONFIG_CMD_CLK=y CONFIG_CMD_DETECT=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y diff --git a/arch/arm/configs/phytec-phycard-omap3_defconfig b/arch/arm/configs/phytec-phycard-omap3_defconfig index b0378b377..e4e441a9f 100644 --- a/arch/arm/configs/phytec-phycard-omap3_defconfig +++ b/arch/arm/configs/phytec-phycard-omap3_defconfig @@ -18,7 +18,7 @@ CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG" CONFIG_GREGORIAN_CALENDER=y CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y +CONFIG_COMPILE_MEMORY=y CONFIG_ENV_HANDLING=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y @@ -44,7 +44,7 @@ CONFIG_SHELL_HUSH=y CONFIG_GLOB=y CONFIG_PROMPT_HUSH_PS2="> " CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_HUSH_GETOPT=y +CONFIG_CMD_GETOPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y @@ -95,7 +95,7 @@ CONFIG_CMD_MEMINFO=y CONFIG_CMD_IOMEM=y CONFIG_CMD_CRC=y CONFIG_CMD_CRC_CMP=y -CONFIG_CMD_DIGEST=y +CONFIG_COMPILE_DIGEST=y CONFIG_CMD_MD5SUM=y CONFIG_CMD_SHA1SUM=y CONFIG_CMD_SHA256SUM=y @@ -121,9 +121,9 @@ CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_DEVINFO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/phytec-phycard-omap4_defconfig b/arch/arm/configs/phytec-phycard-omap4_defconfig index 2b7548bfe..cd9310ebd 100644 --- a/arch/arm/configs/phytec-phycard-omap4_defconfig +++ b/arch/arm/configs/phytec-phycard-omap4_defconfig @@ -11,7 +11,7 @@ CONFIG_PROMPT="barebox> " CONFIG_LONGHELP=y CONFIG_GLOB=y CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_HUSH_GETOPT=y +CONFIG_CMD_GETOPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y # CONFIG_TIMESTAMP is not set @@ -36,9 +36,9 @@ CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNLZO=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_SERIAL_NS16550=y diff --git a/arch/arm/configs/phytec-phycore-am335x_defconfig b/arch/arm/configs/phytec-phycore-am335x_defconfig index c74116bde..edf204f3f 100644 --- a/arch/arm/configs/phytec-phycore-am335x_defconfig +++ b/arch/arm/configs/phytec-phycore-am335x_defconfig @@ -61,9 +61,9 @@ CONFIG_CMD_LED_TRIGGER=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_DETECT=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_SERIAL_NS16550=y diff --git a/arch/arm/configs/phytec-phycore-imx27_defconfig b/arch/arm/configs/phytec-phycore-imx27_defconfig index 07751ea2d..5cb920270 100644 --- a/arch/arm/configs/phytec-phycore-imx27_defconfig +++ b/arch/arm/configs/phytec-phycore-imx27_defconfig @@ -49,8 +49,8 @@ CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_FEC_IMX=y diff --git a/arch/arm/configs/phytec-phycore-imx31_defconfig b/arch/arm/configs/phytec-phycore-imx31_defconfig index 2aa87fe2d..7f19b4a6e 100644 --- a/arch/arm/configs/phytec-phycore-imx31_defconfig +++ b/arch/arm/configs/phytec-phycore-imx31_defconfig @@ -63,8 +63,8 @@ CONFIG_CMD_SPI=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_CLK=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_SMC911X=y diff --git a/arch/arm/configs/phytec-phycore-imx35_defconfig b/arch/arm/configs/phytec-phycore-imx35_defconfig index 6674015a6..91fab09c1 100644 --- a/arch/arm/configs/phytec-phycore-imx35_defconfig +++ b/arch/arm/configs/phytec-phycore-imx35_defconfig @@ -68,9 +68,9 @@ CONFIG_CMD_CLK=y CONFIG_CMD_DETECT=y CONFIG_CMD_WD=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_DRIVER_NET_FEC_IMX=y # CONFIG_SPI is not set diff --git a/arch/arm/configs/phytec-phycore-omap4460_defconfig b/arch/arm/configs/phytec-phycore-omap4460_defconfig index 906dfea42..8d5543fb0 100644 --- a/arch/arm/configs/phytec-phycore-omap4460_defconfig +++ b/arch/arm/configs/phytec-phycore-omap4460_defconfig @@ -47,9 +47,9 @@ CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y CONFIG_SMSC_PHY=y diff --git a/arch/arm/configs/phytec-phycore-pxa270_defconfig b/arch/arm/configs/phytec-phycore-pxa270_defconfig index 0e8d1b394..b7bf190df 100644 --- a/arch/arm/configs/phytec-phycore-pxa270_defconfig +++ b/arch/arm/configs/phytec-phycore-pxa270_defconfig @@ -47,8 +47,8 @@ CONFIG_CMD_SPLASH=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_SERIAL_PXA=y diff --git a/arch/arm/configs/pm9261_defconfig b/arch/arm/configs/pm9261_defconfig index 0aea2c993..682c65f79 100644 --- a/arch/arm/configs/pm9261_defconfig +++ b/arch/arm/configs/pm9261_defconfig @@ -36,9 +36,9 @@ CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_RESOLV=y diff --git a/arch/arm/configs/pm9263_defconfig b/arch/arm/configs/pm9263_defconfig index c9a7141f9..53e4a62b6 100644 --- a/arch/arm/configs/pm9263_defconfig +++ b/arch/arm/configs/pm9263_defconfig @@ -27,8 +27,8 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_NET_MACB=y diff --git a/arch/arm/configs/pm9g45_defconfig b/arch/arm/configs/pm9g45_defconfig index d242bdc0f..2079bcf9e 100644 --- a/arch/arm/configs/pm9g45_defconfig +++ b/arch/arm/configs/pm9g45_defconfig @@ -35,9 +35,9 @@ CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_MACB=y # CONFIG_SPI is not set diff --git a/arch/arm/configs/qil_a9260_128mib_defconfig b/arch/arm/configs/qil_a9260_128mib_defconfig index a19e08362..c735badf6 100644 --- a/arch/arm/configs/qil_a9260_128mib_defconfig +++ b/arch/arm/configs/qil_a9260_128mib_defconfig @@ -51,9 +51,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_MACB=y diff --git a/arch/arm/configs/qil_a9260_defconfig b/arch/arm/configs/qil_a9260_defconfig index 67ca804ea..8aa7528f0 100644 --- a/arch/arm/configs/qil_a9260_defconfig +++ b/arch/arm/configs/qil_a9260_defconfig @@ -50,9 +50,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_MACB=y diff --git a/arch/arm/configs/qil_a9g20_128mib_defconfig b/arch/arm/configs/qil_a9g20_128mib_defconfig index 2c4a1602a..1892399b0 100644 --- a/arch/arm/configs/qil_a9g20_128mib_defconfig +++ b/arch/arm/configs/qil_a9g20_128mib_defconfig @@ -51,9 +51,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_MACB=y diff --git a/arch/arm/configs/qil_a9g20_defconfig b/arch/arm/configs/qil_a9g20_defconfig index 5b2e9ef6e..2ec9b6e80 100644 --- a/arch/arm/configs/qil_a9g20_defconfig +++ b/arch/arm/configs/qil_a9g20_defconfig @@ -50,9 +50,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_MACB=y diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig index 3bc4a80ac..40442accd 100644 --- a/arch/arm/configs/rockchip_defconfig +++ b/arch/arm/configs/rockchip_defconfig @@ -44,8 +44,8 @@ CONFIG_CMD_LED=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_CLK=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_SERIAL_NS16550=y diff --git a/arch/arm/configs/sama5d3xek_defconfig b/arch/arm/configs/sama5d3xek_defconfig index 970ded52c..c1cb0f6c0 100644 --- a/arch/arm/configs/sama5d3xek_defconfig +++ b/arch/arm/configs/sama5d3xek_defconfig @@ -53,9 +53,9 @@ CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_CMD_MIITOOL=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_MICREL_PHY=y CONFIG_DRIVER_NET_MACB=y diff --git a/arch/arm/configs/scb9328_defconfig b/arch/arm/configs/scb9328_defconfig index 21a2571d4..f037a002b 100644 --- a/arch/arm/configs/scb9328_defconfig +++ b/arch/arm/configs/scb9328_defconfig @@ -44,9 +44,9 @@ CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index 0c5a6a781..ca54a1a49 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -63,8 +63,8 @@ CONFIG_CMD_MIITOOL=y CONFIG_CMD_CLK=y CONFIG_CMD_DETECT=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y diff --git a/arch/arm/configs/solidrun_cubox_defconfig b/arch/arm/configs/solidrun_cubox_defconfig index eca7d7fa1..293794973 100644 --- a/arch/arm/configs/solidrun_cubox_defconfig +++ b/arch/arm/configs/solidrun_cubox_defconfig @@ -12,7 +12,7 @@ CONFIG_KALLSYMS=y CONFIG_RELOCATABLE=y CONFIG_LONGHELP=y CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_HUSH_GETOPT=y +CONFIG_CMD_GETOPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y diff --git a/arch/arm/configs/telit_evk_pro3_defconfig b/arch/arm/configs/telit_evk_pro3_defconfig index 050d1763b..5924449b6 100644 --- a/arch/arm/configs/telit_evk_pro3_defconfig +++ b/arch/arm/configs/telit_evk_pro3_defconfig @@ -45,9 +45,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_DRIVER_NET_MACB=y # CONFIG_SPI is not set diff --git a/arch/arm/configs/tny_a9260_defconfig b/arch/arm/configs/tny_a9260_defconfig index af22234bc..30b675f5e 100644 --- a/arch/arm/configs/tny_a9260_defconfig +++ b/arch/arm/configs/tny_a9260_defconfig @@ -52,9 +52,9 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/tny_a9263_defconfig b/arch/arm/configs/tny_a9263_defconfig index 652fd3d45..94d6c1072 100644 --- a/arch/arm/configs/tny_a9263_defconfig +++ b/arch/arm/configs/tny_a9263_defconfig @@ -52,9 +52,9 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/tny_a9g20_defconfig b/arch/arm/configs/tny_a9g20_defconfig index a84e90f8b..6e7ae236f 100644 --- a/arch/arm/configs/tny_a9g20_defconfig +++ b/arch/arm/configs/tny_a9g20_defconfig @@ -53,9 +53,9 @@ CONFIG_CMD_PARTITION=y CONFIG_CMD_GPIO=y CONFIG_CMD_SPI=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/tqma53_defconfig b/arch/arm/configs/tqma53_defconfig index 26e6b288b..f163b7c70 100644 --- a/arch/arm/configs/tqma53_defconfig +++ b/arch/arm/configs/tqma53_defconfig @@ -56,8 +56,8 @@ CONFIG_CMD_MIITOOL=y CONFIG_CMD_CLK=y CONFIG_CMD_DETECT=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y diff --git a/arch/arm/configs/tx25stk5_defconfig b/arch/arm/configs/tx25stk5_defconfig index b499b5d07..3bd896dfc 100644 --- a/arch/arm/configs/tx25stk5_defconfig +++ b/arch/arm/configs/tx25stk5_defconfig @@ -61,8 +61,8 @@ CONFIG_CMD_CLK=y CONFIG_CMD_DETECT=y CONFIG_CMD_WD=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y diff --git a/arch/arm/configs/tx28stk5_defconfig b/arch/arm/configs/tx28stk5_defconfig index 3cefa761a..fe80d98bb 100644 --- a/arch/arm/configs/tx28stk5_defconfig +++ b/arch/arm/configs/tx28stk5_defconfig @@ -45,7 +45,7 @@ CONFIG_CMD_SPLASH=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_RESOLV=y diff --git a/arch/arm/configs/tx51stk5_defconfig b/arch/arm/configs/tx51stk5_defconfig index 6578f4d69..1afe378bb 100644 --- a/arch/arm/configs/tx51stk5_defconfig +++ b/arch/arm/configs/tx51stk5_defconfig @@ -18,7 +18,7 @@ CONFIG_ARM_UNWIND=y CONFIG_GREGORIAN_CALENDER=y CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y -CONFIG_CMD_MEMORY=y +CONFIG_COMPILE_MEMORY=y CONFIG_ENV_HANDLING=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y @@ -37,7 +37,7 @@ CONFIG_LONGHELP=y CONFIG_SHELL_HUSH=y CONFIG_GLOB=y CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_HUSH_GETOPT=y +CONFIG_CMD_GETOPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_DYNAMIC_CRC_TABLE=y @@ -104,8 +104,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_LED=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_SERIAL_IMX=y diff --git a/arch/arm/configs/tx53stk5_defconfig b/arch/arm/configs/tx53stk5_defconfig index e0ab9c8cc..fc6a9a69f 100644 --- a/arch/arm/configs/tx53stk5_defconfig +++ b/arch/arm/configs/tx53stk5_defconfig @@ -57,8 +57,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_LED=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_DRIVER_NET_FEC_IMX=y CONFIG_MTD=y CONFIG_NAND=y diff --git a/arch/arm/configs/usb_a9260_defconfig b/arch/arm/configs/usb_a9260_defconfig index 5f78c56fd..b6cb61c9e 100644 --- a/arch/arm/configs/usb_a9260_defconfig +++ b/arch/arm/configs/usb_a9260_defconfig @@ -55,9 +55,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/usb_a9263_128mib_defconfig b/arch/arm/configs/usb_a9263_128mib_defconfig index 71774f9be..81c502d77 100644 --- a/arch/arm/configs/usb_a9263_128mib_defconfig +++ b/arch/arm/configs/usb_a9263_128mib_defconfig @@ -56,9 +56,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/usb_a9263_defconfig b/arch/arm/configs/usb_a9263_defconfig index 251c654af..78fb26c71 100644 --- a/arch/arm/configs/usb_a9263_defconfig +++ b/arch/arm/configs/usb_a9263_defconfig @@ -55,9 +55,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/usb_a9g20_128mib_defconfig b/arch/arm/configs/usb_a9g20_128mib_defconfig index f4d412c98..11ca9ee35 100644 --- a/arch/arm/configs/usb_a9g20_128mib_defconfig +++ b/arch/arm/configs/usb_a9g20_128mib_defconfig @@ -57,9 +57,9 @@ CONFIG_CMD_SPI=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/usb_a9g20_defconfig b/arch/arm/configs/usb_a9g20_defconfig index 3062fb4bf..2934b21b6 100644 --- a/arch/arm/configs/usb_a9g20_defconfig +++ b/arch/arm/configs/usb_a9g20_defconfig @@ -56,9 +56,9 @@ CONFIG_CMD_SPI=y CONFIG_CMD_LED=y CONFIG_CMD_LED_TRIGGER=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/versatilepb_defconfig b/arch/arm/configs/versatilepb_defconfig index 8daf9ae72..423e8cdfa 100644 --- a/arch/arm/configs/versatilepb_defconfig +++ b/arch/arm/configs/versatilepb_defconfig @@ -36,9 +36,9 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_I2C=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/arm/configs/vexpress_ca9_defconfig b/arch/arm/configs/vexpress_ca9_defconfig index f16a8ca5e..1da37793f 100644 --- a/arch/arm/configs/vexpress_ca9_defconfig +++ b/arch/arm/configs/vexpress_ca9_defconfig @@ -44,9 +44,9 @@ CONFIG_CMD_PARTITION=y CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_CLK=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_SERIAL_AMBA_PL011=y diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig index e1660783d..6ad2c8a16 100644 --- a/arch/arm/configs/vexpress_defconfig +++ b/arch/arm/configs/vexpress_defconfig @@ -43,9 +43,9 @@ CONFIG_CMD_PARTITION=y CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_CLK=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_SERIAL_AMBA_PL011=y diff --git a/arch/arm/configs/vincell_defconfig b/arch/arm/configs/vincell_defconfig index ac1f877b8..11f61ee9c 100644 --- a/arch/arm/configs/vincell_defconfig +++ b/arch/arm/configs/vincell_defconfig @@ -57,9 +57,9 @@ CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_CLK=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_FEC_IMX=y # CONFIG_SPI is not set diff --git a/arch/arm/configs/zedboard_defconfig b/arch/arm/configs/zedboard_defconfig index 773177c9e..736841833 100644 --- a/arch/arm/configs/zedboard_defconfig +++ b/arch/arm/configs/zedboard_defconfig @@ -42,7 +42,7 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_CLK=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y # CONFIG_SPI is not set CONFIG_FS_TFTP=y CONFIG_DIGEST=y diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c index 895e07ef3..badd676b0 100644 --- a/arch/arm/cpu/cpu.c +++ b/arch/arm/cpu/cpu.c @@ -124,7 +124,7 @@ coredevice_initcall(arm_request_stack); static void thumb2_execute(void *func, int argc, char *argv[]) { /* - * Switch back to arm mode before executing external + * Switch back to ARM mode before executing external * programs. */ __asm__ __volatile__ ( diff --git a/arch/arm/cpu/cpuinfo.c b/arch/arm/cpu/cpuinfo.c index 260d47b02..8b22e9bb5 100644 --- a/arch/arm/cpu/cpuinfo.c +++ b/arch/arm/cpu/cpuinfo.c @@ -210,7 +210,8 @@ static int do_cpuinfo(int argc, char *argv[]) BAREBOX_CMD_START(cpuinfo) .cmd = do_cpuinfo, - .usage = "Show info about CPU", + BAREBOX_CMD_DESC("show info about CPU") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/arch/arm/cpu/dtb.c b/arch/arm/cpu/dtb.c index a5881dd72..abc3ccb4c 100644 --- a/arch/arm/cpu/dtb.c +++ b/arch/arm/cpu/dtb.c @@ -47,7 +47,7 @@ static int of_arm_init(void) return 0; } - root = of_unflatten_dtb(NULL, fdt); + root = of_unflatten_dtb(fdt); if (root) { of_set_root_node(root); if (IS_ENABLED(CONFIG_OFDEVICE)) diff --git a/arch/arm/cpu/mmuinfo.c b/arch/arm/cpu/mmuinfo.c index 6bea34ed5..79f539f88 100644 --- a/arch/arm/cpu/mmuinfo.c +++ b/arch/arm/cpu/mmuinfo.c @@ -99,13 +99,9 @@ static int do_mmuinfo(int argc, char *argv[]) return 0; } -BAREBOX_CMD_HELP_START(mmuinfo) -BAREBOX_CMD_HELP_USAGE("mmuinfo
\n") -BAREBOX_CMD_HELP_SHORT("Show MMU/cache information for an address.\n") -BAREBOX_CMD_HELP_END - BAREBOX_CMD_START(mmuinfo) .cmd = do_mmuinfo, - .usage = "mmuinfo
", - BAREBOX_CMD_HELP(cmd_mmuinfo_help) + BAREBOX_CMD_DESC("show MMU/cache information of an address") + BAREBOX_CMD_OPTS("ADDRESS") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_END diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c index bc286200c..16879f8e5 100644 --- a/arch/arm/lib/armlinux.c +++ b/arch/arm/lib/armlinux.c @@ -261,7 +261,7 @@ void start_linux(void *adr, int swap, unsigned long initrd_address, int architecture; if (oftree) { - printf("booting kernel with devicetree\n"); + pr_debug("booting kernel with devicetree\n"); params = oftree; } else { setup_tags(initrd_address, initrd_size, swap); diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 803546827..4896d0197 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -135,7 +135,7 @@ static int do_bootm_linux(struct image_data *data) load_address = mem_start + PAGE_ALIGN( uimage_get_size(data->os, data->os_num) * 4); if (bootm_verbose(data)) - printf("no os load address, defaulting to 0x%08lx\n", + printf("no OS load address, defaulting to 0x%08lx\n", load_address); } @@ -215,7 +215,7 @@ static int do_bootz_linux_fdt(int fd, struct image_data *data) } if (IS_BUILTIN(CONFIG_OFTREE)) { - data->of_root_node = of_unflatten_dtb(NULL, oftree); + data->of_root_node = of_unflatten_dtb(oftree); if (!data->of_root_node) { pr_err("unable to unflatten devicetree\n"); ret = -EINVAL; @@ -294,7 +294,7 @@ static int do_bootz_linux(struct image_data *data) load_address = data->os_address; if (bootm_verbose(data)) - printf("no os load address, defaulting to 0x%08lx\n", + printf("no OS load address, defaulting to 0x%08lx\n", load_address); } diff --git a/arch/arm/lib/bootu.c b/arch/arm/lib/bootu.c index fdb03621b..19009c88b 100644 --- a/arch/arm/lib/bootu.c +++ b/arch/arm/lib/bootu.c @@ -36,7 +36,9 @@ static const __maybe_unused char cmd_bootu_help[] = BAREBOX_CMD_START(bootu) .cmd = do_bootu, - .usage = "start a raw linux image", + BAREBOX_CMD_DESC("boot into already loaded Linux kernel") + BAREBOX_CMD_OPTS("ADDRESS") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_HELP(cmd_bootu_help) BAREBOX_CMD_END diff --git a/arch/arm/lib/bootz.c b/arch/arm/lib/bootz.c index e32a77ba4..377f18a3a 100644 --- a/arch/arm/lib/bootz.c +++ b/arch/arm/lib/bootz.c @@ -127,13 +127,10 @@ err_out: return 1; } -static const __maybe_unused char cmd_bootz_help[] = -"Usage: bootz [FILE]\n" -"Boot a Linux zImage\n"; - BAREBOX_CMD_START(bootz) .cmd = do_bootz, - .usage = "start a zImage", - BAREBOX_CMD_HELP(cmd_bootz_help) + BAREBOX_CMD_DESC("boot Linux zImage") + BAREBOX_CMD_OPTS("FILE") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_END diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index e3eeb2cd9..298ee3f72 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -524,24 +524,6 @@ config CALAO_MB_QIL_A9260 bool "MB-QIL A9260 Motherboard Board support" depends on MACH_QIL_A9260 || MACH_QIL_A9G20 -if COMMAND_SUPPORT - -config CMD_AT91MUX - bool "at91mux dump command" - default y - -config CMD_AT91CLK - bool "at91clk dump command" - default y - -config CMD_AT91_BOOT_TEST - bool "at91_boot_test" - help - allow to upload a boot binary to sram and execute it - useful to test bootstrap or barebox lowlevel init - -endif - config AT91_BOOTSTRAP bool "at91 bootstrap" depends on HAVE_AT91_LOWLEVEL_INIT diff --git a/arch/arm/mach-at91/boot_test_cmd.c b/arch/arm/mach-at91/boot_test_cmd.c index aa5c02046..66c598b7c 100644 --- a/arch/arm/mach-at91/boot_test_cmd.c +++ b/arch/arm/mach-at91/boot_test_cmd.c @@ -84,12 +84,15 @@ err: } BAREBOX_CMD_HELP_START(at91_boot_test) -BAREBOX_CMD_HELP_USAGE("at91_boot_test [-j ] [-s ] file\n") -BAREBOX_CMD_HELP_SHORT("upload the binary to sram and jump as will do the romcode\n") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-j ADDR", "jump address") +BAREBOX_CMD_HELP_OPT ("-s SRAM", "SRAM device (default /dev/sram0)") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(at91_boot_test) .cmd = do_at91_boot_test, - .usage = "upload the binary to sram and jump as will do the romcode", + BAREBOX_CMD_DESC("load and execute from SRAM") + BAREBOX_CMD_OPTS("at91_boot_test [-js] FILE") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_HELP(cmd_at91_boot_test_help) BAREBOX_CMD_END diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index a10d7f640..59c4d1111 100644 --- a/arch/arm/mach-at91/clock.c +++ b/arch/arm/mach-at91/clock.c @@ -881,15 +881,10 @@ static int do_at91clk(int argc, char *argv[]) return 0; } -BAREBOX_CMD_HELP_START(at91clk) -BAREBOX_CMD_HELP_USAGE("at91clk\n") -BAREBOX_CMD_HELP_SHORT("dump current clock configuration\n"); -BAREBOX_CMD_HELP_END - BAREBOX_CMD_START(at91clk) .cmd = do_at91clk, - .usage = "dump current clock configuration", - BAREBOX_CMD_HELP(cmd_at91clk_help) + BAREBOX_CMD_DESC("list clock configuration") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END #endif diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c index 91de85d98..292e1975e 100644 --- a/arch/arm/mach-at91/gpio.c +++ b/arch/arm/mach-at91/gpio.c @@ -509,13 +509,19 @@ static int do_at91mux(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(at91mux) -BAREBOX_CMD_HELP_USAGE("at91mux [-p -b ]\n") -BAREBOX_CMD_HELP_SHORT("dump current mux configuration if bank/pin specified dump pin details\n"); +BAREBOX_CMD_HELP_TEXT("Dump current MIX configuration. If a BANK or PIN has been") +BAREBOX_CMD_HELP_TEXT("specified dump pin details.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-p PIN", "pin number") +BAREBOX_CMD_HELP_OPT ("-b BANK", "bank number") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(at91mux) .cmd = do_at91mux, - .usage = "dump current mux configuration", + BAREBOX_CMD_DESC("list MUX configuration") + BAREBOX_CMD_OPTS("[-pn]") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_HELP(cmd_at91mux_help) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/arch/arm/mach-mxs/bcb.c b/arch/arm/mach-mxs/bcb.c index a7f4ba9bd..c945726f5 100644 --- a/arch/arm/mach-mxs/bcb.c +++ b/arch/arm/mach-mxs/bcb.c @@ -387,13 +387,14 @@ int update_bcb(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(bcb) -BAREBOX_CMD_HELP_USAGE("bcb [second_bootstream]\n") -BAREBOX_CMD_HELP_SHORT("Write a BCB to NAND flash which an MX23/28 needs to boot.\n") -BAREBOX_CMD_HELP_TEXT ("Example: bcb nand0.bootstream\n") +BAREBOX_CMD_HELP_TEXT("Write a BCB to NAND flash which an MX23/28 needs to boot.") +BAREBOX_CMD_HELP_TEXT("Example: bcb nand0.bootstream") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(bcb) .cmd = update_bcb, - .usage = "Writes a MX23/28 BCB data structure to flash", + BAREBOX_CMD_DESC("writes a i.MX23/28 BCB data structure to flash") + BAREBOX_CMD_OPTS("BOOTSTREAM [BOOTSTREAM]") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_bcb_help) BAREBOX_CMD_END diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c index 866d6ae5b..6127dde86 100644 --- a/arch/arm/mach-netx/generic.c +++ b/arch/arm/mach-netx/generic.c @@ -145,6 +145,6 @@ void __noreturn reset_cpu(unsigned long addr) BAREBOX_CMD_START(loadxc) .cmd = do_loadxc, - .usage = "load xmac/xpec engine with ethernet firmware", + BAREBOX_CMD_DESC("load XMAC/XPEC engine with ethernet firmware") + BAREBOX_CMD_GROUP(CMD_GRP_NET) BAREBOX_CMD_END - diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig index 12b9c1fe4..201944ce2 100644 --- a/arch/arm/mach-omap/Kconfig +++ b/arch/arm/mach-omap/Kconfig @@ -107,13 +107,6 @@ config OMAP4_USBBOOT You need the utility program omap4_usbboot to boot from USB. Please read omap4_usb_booting.txt for more information. -config CMD_BOOT_ORDER - tristate - depends on ARCH_OMAP4 - prompt "boot_order" - help - A command to choose the next boot device on a warm reset. - config OMAP_MULTI_BOARDS bool "Allow multiple boards to be selected" select HAVE_DEFAULT_ENVIRONMENT_NEW diff --git a/arch/arm/mach-omap/boot_order.c b/arch/arm/mach-omap/boot_order.c index 2f2846d11..db22513bd 100644 --- a/arch/arm/mach-omap/boot_order.c +++ b/arch/arm/mach-omap/boot_order.c @@ -69,15 +69,16 @@ static int cmd_boot_order(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_boot_order_help[] = -"Usage: boot_order []\n" -"Set warm boot order of up to four devices.\n" -"Each device can be one of:\n" -"xip xipwait nand onenand mmc1 mmc2_1 mmc2_2 uart usb_1 usb_ulpi usb_2\n"; +BAREBOX_CMD_HELP_START(boot_order) +BAREBOX_CMD_HELP_TEXT("Set warm boot order of up to four devices. Each device can be one of:") +BAREBOX_CMD_HELP_TEXT("xip xipwait nand onenand mmc1 mmc2_1 mmc2_2 uart usb_1 usb_ulpi usb_2") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(boot_order) .cmd = cmd_boot_order, - .usage = "boot_order []", + BAREBOX_CMD_DESC("set warm boot order") + BAREBOX_CMD_OPTS("DEVICE...") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_HELP(cmd_boot_order_help) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/arch/blackfin/boards/ipe337/cmd_alternate.c b/arch/blackfin/boards/ipe337/cmd_alternate.c index 86eaa11e3..992d27484 100644 --- a/arch/blackfin/boards/ipe337/cmd_alternate.c +++ b/arch/blackfin/boards/ipe337/cmd_alternate.c @@ -44,13 +44,9 @@ static int do_alternate(int argc, char *argv[]) return (bitcount & 1) ? 3 : 2; } -static const __maybe_unused char cmd_alternate_help[] = -"Usage: alternate " -"\n"; - BAREBOX_CMD_START(alternate) .cmd = do_alternate, - .usage = "count zero bits in a file", - BAREBOX_CMD_HELP(cmd_alternate_help) + BAREBOX_CMD_DESC("count zero bits in a file") + BAREBOX_CMD_OPTS("FILE") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_END - diff --git a/arch/blackfin/configs/ipe337_defconfig b/arch/blackfin/configs/ipe337_defconfig index 086a9716d..501c59a67 100644 --- a/arch/blackfin/configs/ipe337_defconfig +++ b/arch/blackfin/configs/ipe337_defconfig @@ -20,8 +20,8 @@ CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_NET_SMC911X=y diff --git a/arch/mips/boot/dtb.c b/arch/mips/boot/dtb.c index c1962bfd0..23d8979ad 100644 --- a/arch/mips/boot/dtb.c +++ b/arch/mips/boot/dtb.c @@ -48,7 +48,7 @@ static int of_mips_init(void) if (root) return 0; - root = of_unflatten_dtb(NULL, __dtb_start); + root = of_unflatten_dtb(__dtb_start); if (root) { pr_debug("using internal DTB\n"); of_set_root_node(root); diff --git a/arch/mips/configs/dlink-dir-320_defconfig b/arch/mips/configs/dlink-dir-320_defconfig index 3cd16c930..52ab29508 100644 --- a/arch/mips/configs/dlink-dir-320_defconfig +++ b/arch/mips/configs/dlink-dir-320_defconfig @@ -4,7 +4,7 @@ CONFIG_BROKEN=y CONFIG_EXPERIMENTAL=y CONFIG_LONGHELP=y CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_HUSH_GETOPT=y +CONFIG_CMD_GETOPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y @@ -43,9 +43,9 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y diff --git a/arch/mips/configs/loongson-ls1b_defconfig b/arch/mips/configs/loongson-ls1b_defconfig index bc48abad7..8e04170f4 100644 --- a/arch/mips/configs/loongson-ls1b_defconfig +++ b/arch/mips/configs/loongson-ls1b_defconfig @@ -8,7 +8,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_MALLOC_TLSF=y CONFIG_LONGHELP=y CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_HUSH_GETOPT=y +CONFIG_CMD_GETOPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y diff --git a/arch/mips/configs/qemu-malta_defconfig b/arch/mips/configs/qemu-malta_defconfig index 1b9ee9ae7..ba5fa96df 100644 --- a/arch/mips/configs/qemu-malta_defconfig +++ b/arch/mips/configs/qemu-malta_defconfig @@ -6,7 +6,7 @@ CONFIG_BROKEN=y CONFIG_EXPERIMENTAL=y CONFIG_LONGHELP=y CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_HUSH_GETOPT=y +CONFIG_CMD_GETOPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y @@ -48,9 +48,9 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y +CONFIG_CMD_DHCP=y CONFIG_NET_NFS=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_NETCONSOLE=y CONFIG_NET_RESOLV=y CONFIG_OFDEVICE=y diff --git a/arch/mips/configs/ritmix-rzx50_defconfig b/arch/mips/configs/ritmix-rzx50_defconfig index 7691bae6e..62f23b291 100644 --- a/arch/mips/configs/ritmix-rzx50_defconfig +++ b/arch/mips/configs/ritmix-rzx50_defconfig @@ -6,7 +6,7 @@ CONFIG_PBL_IMAGE=y CONFIG_BAUDRATE=57600 CONFIG_GLOB=y CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_HUSH_GETOPT=y +CONFIG_CMD_GETOPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y # CONFIG_DEFAULT_ENVIRONMENT is not set diff --git a/arch/mips/lib/cpuinfo.c b/arch/mips/lib/cpuinfo.c index de2055e59..1b171697b 100644 --- a/arch/mips/lib/cpuinfo.c +++ b/arch/mips/lib/cpuinfo.c @@ -54,5 +54,6 @@ static int do_cpuinfo(int argc, char *argv[]) BAREBOX_CMD_START(cpuinfo) .cmd = do_cpuinfo, - .usage = "Show info about CPU", + BAREBOX_CMD_DESC("show CPU information") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_END diff --git a/arch/nios2/configs/generic_defconfig b/arch/nios2/configs/generic_defconfig index 41899904b..9f9c85ef8 100644 --- a/arch/nios2/configs/generic_defconfig +++ b/arch/nios2/configs/generic_defconfig @@ -25,7 +25,7 @@ CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_NET=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_DRIVER_NET_TSE=y CONFIG_MTD=y CONFIG_DRIVER_CFI=y diff --git a/arch/openrisc/configs/generic_defconfig b/arch/openrisc/configs/generic_defconfig index 53ff671b8..deaef2a3a 100644 --- a/arch/openrisc/configs/generic_defconfig +++ b/arch/openrisc/configs/generic_defconfig @@ -19,8 +19,8 @@ CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_DRIVER_NET_ETHOC=y diff --git a/arch/openrisc/lib/cpuinfo.c b/arch/openrisc/lib/cpuinfo.c index 1f137f0cd..32fb47dd4 100644 --- a/arch/openrisc/lib/cpuinfo.c +++ b/arch/openrisc/lib/cpuinfo.c @@ -148,5 +148,6 @@ static int do_cpuinfo(int argc, char *argv[]) BAREBOX_CMD_START(cpuinfo) .cmd = do_cpuinfo, - .usage = "Show info about CPU", + BAREBOX_CMD_DESC("show CPU information") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_END diff --git a/arch/ppc/configs/da923rc_defconfig b/arch/ppc/configs/da923rc_defconfig index 3b5292a88..a6d38fd6f 100644 --- a/arch/ppc/configs/da923rc_defconfig +++ b/arch/ppc/configs/da923rc_defconfig @@ -3,7 +3,7 @@ CONFIG_DA923RC=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x80000 CONFIG_BANNER=y CONFIG_CMD_READLINE=y -CONFIG_HUSH_GETOPT=y +CONFIG_CMD_GETOPT=y CONFIG_LONGHELP=y CONFIG_GLOB=y CONFIG_CMDLINE_EDITING=y @@ -28,7 +28,7 @@ CONFIG_CMD_SLEEP=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_NET_TFTP=y CONFIG_NET_TFTP_PUSH=y CONFIG_FS_TFTP=y diff --git a/arch/ppc/configs/p1022ds_defconfig b/arch/ppc/configs/p1022ds_defconfig index 878286b28..c517336e6 100644 --- a/arch/ppc/configs/p1022ds_defconfig +++ b/arch/ppc/configs/p1022ds_defconfig @@ -35,7 +35,7 @@ CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_RELOCATABLE=y CONFIG_DRIVER_NET_GIANFAR=y CONFIG_NET=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_FS_TFTP=y CONFIG_NET_TFTP=y CONFIG_CMD_TFTP=y diff --git a/arch/ppc/configs/p2020rdb_defconfig b/arch/ppc/configs/p2020rdb_defconfig index c34e48d97..817c9a0e6 100644 --- a/arch/ppc/configs/p2020rdb_defconfig +++ b/arch/ppc/configs/p2020rdb_defconfig @@ -38,7 +38,7 @@ CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_RELOCATABLE=y CONFIG_DRIVER_NET_GIANFAR=y CONFIG_NET=y -CONFIG_NET_PING=y +CONFIG_CMD_PING=y CONFIG_FS_TFTP=y CONFIG_NET_TFTP=y CONFIG_CMD_TFTP=y diff --git a/arch/ppc/configs/pcm030_defconfig b/arch/ppc/configs/pcm030_defconfig index 97438416c..204f946f1 100644 --- a/arch/ppc/configs/pcm030_defconfig +++ b/arch/ppc/configs/pcm030_defconfig @@ -29,8 +29,8 @@ CONFIG_CMD_MAGICVAR=y CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_UNCOMPRESS=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_FS_TFTP=y CONFIG_ARCH_MPC5XXX=y diff --git a/arch/sandbox/configs/sandbox_defconfig b/arch/sandbox/configs/sandbox_defconfig index 2ef8fa41e..7ce256950 100644 --- a/arch/sandbox/configs/sandbox_defconfig +++ b/arch/sandbox/configs/sandbox_defconfig @@ -21,8 +21,8 @@ CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y CONFIG_NET=y -CONFIG_NET_DHCP=y -CONFIG_NET_PING=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y CONFIG_DRIVER_NET_TAP=y # CONFIG_SPI is not set CONFIG_FS_CRAMFS=y diff --git a/commands/2048.c b/commands/2048.c index 5d6c76656..26c9e6ca4 100644 --- a/commands/2048.c +++ b/commands/2048.c @@ -378,12 +378,13 @@ static int do_2048(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(2048) -BAREBOX_CMD_HELP_USAGE("2048\n") -BAREBOX_CMD_HELP_SHORT("The 2048 game\n") +BAREBOX_CMD_HELP_TEXT("Use your arrow keys to move the tiles. When two tiles with") +BAREBOX_CMD_HELP_TEXT("the same number touch, they merge into one!") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(2048) .cmd = do_2048, - .usage = "Usage: 2048", + BAREBOX_CMD_DESC("the 2048 game") + BAREBOX_CMD_GROUP(CMD_GRP_MISC) BAREBOX_CMD_HELP(cmd_2048_help) BAREBOX_CMD_END diff --git a/commands/Kconfig b/commands/Kconfig index 676690aef..eed6fbdd3 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -12,83 +12,1302 @@ config HAS_POWEROFF if COMMAND_SUPPORT -menu "commands" - -menu "scripting" - -config CMD_EDIT +config COMPILE_DIGEST tristate - prompt "edit" + select DIGEST + help + Turns on compilation of digest.c + +config COMPILE_MEMORY + bool + help + Turns on compilation of mem.c + +menu "Commands" + + + + +menu "Information" + +config CMD_AT91CLK + bool "at91clk" + default y + depends on ARCH_AT91 + help + List clock configuration. + +config CMD_AT91MUX + bool "at91mux" + default y + depends on ARCH_AT91 + help + List MUX configuration + + Usage: at91mux [-pn] + + Dump current MUX configuration. If a BANK or PIN has been + specified dump pin details. + + Options: + -p PIN pin number + -b BANK bank number + +config CMD_ARM_CPUINFO + bool "cpuinfo command" + default y + depends on ARM + help + Show info about ARM CPU + + Example: + + implementer: ARM + architecture: v7 + core: Cortex-A9 r2p10 + I-cache: 512 bytes (linelen = 64) + D-cache: 8192 bytes (linelen = 8) + Control register: M C W P D L I V RR DT IT U XP + +config CMD_DEVINFO + tristate + default y + prompt "devinfo" + help + Show information about devices and drivers. + + devinfo [DEVICE] + + If called without arguments, devinfo shows a summary of the known + devices. + + If called with a device path being the argument, devinfo shows more + default information about this device and its parameters. + +config CMD_DRVINFO + tristate + default y + prompt "drvinfo" + help + List compiled-in device drivers and the devices they support. + +config CMD_HELP + tristate + default y + prompt "help" + help + Without arguments, lists all all commands. With an argument, print help + about the specified command. If the argument is 'all', then output help + for all commands. + + Options: + -a output help on all commands + -v verbose + +config LONGHELP + bool + depends on !SHELL_NONE && CMD_HELP + prompt "Long help texts" + help + This make the "help" command of barebox spit out much more information, + but (obviously) also makes barebox bigger. + + Example with CONFIG_LONGHELP: + + ----------------------------- + barebox:/ help ls + + ls - list a file or directory + + Usage: ls [-lCR] [FILEDIR...] + + List information about the specified files or directories. + + Options: + -l long format + -C column format (opposite of long format) + -R list subdirectories recursively + ----------------------------- + + And now without CONFIG_LONGHELP: + + ----------------------------- + barebox:/ help ls + + ls - list a file or directory + + Usage: ls [-lCR] [FILEDIR...] + ----------------------------- + + With my specific .config, the binary size increased from 461500 to 481980. + +config CMD_IOMEM + tristate + prompt "iomem and ioport" + help + Show information about iomem/ioport usage. Pendant to + 'cat /proc/iomem' and 'cat /proc/ioports' under Linux. + +config CMD_MEMINFO + tristate + prompt "meminfo" + help + Print info about barebox' memory allocation. Example: + + max system bytes = 282616 + system bytes = 282616 + in use bytes = 274752 + +config CMD_ARM_MMUINFO + bool "mmuinfo command" + depends on CPU_V7 + help + Say yes here to get a mmuinfo command to show some + MMU and cache information using the cp15 registers. + + Example: + + PAR result for 0x00110000: + privileged read: 0x00110090 + Physical Address [31:12]: 0x00110000 + Reserved [11]: 0x0 + Not Outer Shareable [10]: 0x0 + Non-Secure [9]: 0x0 + Impl. def. [8]: 0x0 + Shareable [7]: 0x1 + Inner mem. attr. [6:4]: 0x1 (0b001 Strongly-ordered) + Outer mem. attr. [3:2]: 0x0 (0b00 Non-cacheable) + SuperSection [1]: 0x0 + Failure [0]: 0x0 + privileged write: 0x00110090 + Physical Address [31:12]: 0x00110000 + Reserved [11]: 0x0 + Not Outer Shareable [10]: 0x0 + Non-Secure [9]: 0x0 + Impl. def. [8]: 0x0 + Shareable [7]: 0x1 + Inner mem. attr. [6:4]: 0x1 (0b001 Strongly-ordered) + Outer mem. attr. [3:2]: 0x0 (0b00 Non-cacheable) + SuperSection [1]: 0x0 + Failure [0]: 0x0 + +config CMD_REGINFO + depends on HAS_REGINFO + select REGINFO + tristate + prompt "reginfo" + help + Print register information. + +config CMD_REGULATOR + bool + depends on REGULATOR + prompt "regulator command" + help + the regulator command lists the currently registered regulators and + their current state. + +config CMD_VERSION + tristate + default y + depends on BANNER + prompt "version" + help + Pring barebox version. Example: + + barebox 2014.05.0-00142-gb289373 #177 Mon May 12 20:35:55 CEST 2014 + +# end Information commands +endmenu + + + + +menu "Boot" + +# TODO: isn't a command +config FLEXIBLE_BOOTARGS + bool + prompt "flexible Linux bootargs generation" + depends on CMD_GLOBAL + help + Select this to get a more flexible bootargs generation. With this + option the bootargs are concatenated together from global variables + beginning with 'global.linux.bootargs.' and 'global.linux.mtdparts.' + This allows for more flexible scripting since with it it's possible + to replace parts of the bootargs string without reconstructing it + completely. + +config CMD_AT91_BOOT_TEST + bool "at91_boot_test" + depends on ARCH_AT91 + help + allow to upload a boot binary to SRAM and execute it. + Useful to test bootstrap or barebox lowlevel init. + + Usage: at91_boot_test [-js] FILE + + Options: + -j ADDR jump address + -s SRAM SRAM device (default /dev/sram0) + +config CMD_BOOT_ORDER + tristate + depends on ARCH_OMAP4 + prompt "boot_order" + help + Set warm boot order (the next boot device on a warm reset). + + Usage: boot_order DEVICE... + + Each device can be one of: + xip xipwait nand onenand mmc1 mmc2_1 mmc2_2 uart usb_1 usb_ulpi usb_2 + +config CMD_BOOT + tristate + select BOOTM + prompt "boot" + help + Select this for booting based on scripts. Unlike the bootm command which + can boot a single image this command offers the possibility to boot with + scripts (by default placed under /env/boot/). This command iterates over + multiple scripts until one succeeds. + + Usage: boot [-vdlmt] [BOOTSRC...] + + BOOTSRC can be: + - a filename under /env/boot/ + - a full path to a boot script + - a device name + - a partition name under /dev/ + - a full path to a directory which + -- contains boot scripts, or + -- contains a loader/entries/ directory containing bootspec entries + + Multiple bootsources may be given which are probed in order until + one succeeds. + + Options: + -c crc check uImage data + -d dryrun: check data, but do not run + -f load images even if type is undetectable + -r INITRD specify an initrd image + -L ADDR specify initrd load address + -a ADDR specify os load address + -e OFFS entry point to the image relative to start (0) + -o DTS specify open firmware device tree + -v verbose + + +config CMD_BOOTM + tristate + default y + select BOOTM + select CRC32 + select UIMAGE + select UNCOMPRESS + select FILETYPE + select GLOBALVAR + prompt "bootm" + help + Boot an application image + + Usage: bootm [-cdaeo] IMAGE + + Options: + -c crc check uImage data + -d dryrun. Check data, but do not run + -a ADDR specify os load address + -e OFFS entry point to the image relative to start (0) + -o DTS specify device tree + + +config CMD_BOOTM_SHOW_TYPE + bool + depends on CMD_BOOTM + prompt "show image information" + help + Displays some tags from the uImage: + + - OS type + - architecture, + - type + - compression method. + +config CMD_BOOTM_VERBOSE + bool + prompt "verbose support" + depends on CMD_BOOTM + help + Adds the verbose (-v switch) command line option. + +config CMD_BOOTM_INITRD + bool + prompt "initial RAM disk (initrd) support" + depends on CMD_BOOTM + help + Adds support for initial RAM disk and this two command line options: + + -r INITRD specify an initrd image + -L ADDR specify initrd load address + +config CMD_BOOTM_OFTREE + bool + depends on CMD_BOOTM + select OFTREE + prompt "device tree (oftree) support" + help + Add support to pass a device tree (a.k.a Open Firmware Tree, oftree). Adds + this command line option: + + -o DTS specify device tre + +config CMD_BOOTM_OFTREE_UIMAGE + bool + prompt "support passing device tree (oftree) uImages" + depends on CMD_BOOTM_OFTREE + help + Support using oftree uImages. Without this only raw oftree + blobs can be used. + +config CMD_BOOTM_AIMAGE + bool + prompt "Android image support" + depends on CMD_BOOTM && ARM + help + Support using Android Images. + +config CMD_BOOTU + tristate + default y + depends on ARM + prompt "bootu" + help + Boot into already loaded Linux kernel, which must be raw (uncompressed). + + Usage: bootu ADDRESS + +config CMD_BOOTZ + tristate + depends on ARM + prompt "bootz" + help + Boot Linux zImage + + Usage: bootz FILE + +config CMD_LINUX16 + tristate + depends on X86 + default y if X86 + prompt "linux16" + help + Usage: linux16 [-v VESAMODE] FILE + + Load kernel from FILE and boot on x86 in real-mode. + + Only kernel images in bzImage format are supported by now. + + For the video mode refer the Linux kernel documentation + 'Documentation/fb/vesafb.txt' for correct VESA mode numbers. Use 'ask' + instead of a number to make Linux prompt for options. + + Options: + -v VESAMODE set VESAMODE + + +config CMD_GO + tristate + prompt "go" + help + Start application at address or file + + Usage: go ADDR [ARG...] + + Start application at ADDR passing ARG as arguments. + + If addr does not start with a digit it is interpreted as a filename + in which case the file is memmapped and executed + +config CMD_LOADB + depends on !CONSOLE_NONE + select CRC16 + tristate + prompt "loadb" + help + Load binary file over serial line (Kermit) + + Usage: loadb FILE + + Options: + -f FILE download to FILE (default image.bin) + -o OFFS destination file OFFSet (default 0) + -b BAUD baudrate for download (default: console baudrate + -c create file if not present + +config CMD_LOADS + depends on !CONSOLE_NONE + tristate + prompt "loads" + help + Loads - load binary file over serial line (S-Records) + + Usage: loads OFFS + + Load S-Record file over serial line with offset OFFS. + +config CMD_LOADY + select CRC16 + select XYMODEM + depends on !CONSOLE_NONE + tristate + prompt "loady" + help + Adds the loadx and loady commands: + + loadx - load binary file over serial line (X-Modem) + + Usage: loadx [-fptbc] + + Options: + -f FILE download to FILE (default image.bin) + -o OFFS destination file OFFSet (default 0) + -b BAUD baudrate for download (default: console baudrate + -t NAME console name to use (default: current) + -c create file if not present + + + loady - load binary file over serial line (Y-Modem) + + Usage: loady [-gtb] + + Options: + -g use Y-Modem/G (use on lossless tty such as USB) + -b BAUD baudrate for download (default: console baudrate + -t NAME console name to use (default: current) + + +config CMD_RESET + tristate + prompt "reset" + help + Perform RESET of the CPU + + Usage: reset [-f] + + Options: + -f force RESET, don't call shutdown + +config CMD_SAVES + tristate + depends on CMD_LOADS + prompt "saves" + help + Save file over serial line (S-Records) + + Usage: saves OFFS LEN + + Save S-Record file to serial line with offset OFFS and length LEN. + +config CMD_UIMAGE + select UIMAGE + tristate + prompt "uimage" + help + Show information about uImage and also extract and verify uImages. + + Usage: uimage [-vien] FILE + + Options: + -i show information about image + -v verify image + -e OUTFILE extract image to OUTFILE + -n NO use image number NO in multifile image + +# end Boot commands +endmenu + + + + +menu "Partition" + +config CMD_PARTITION + tristate + prompt "addpart and delpart" + help + addpart - add a partition description to a device + + Usage: addpart [-n] DEVICE PART + + The size and the offset can be given in decimal (without any prefix) and + in hex (prefixed with 0x). Both can have an optional suffix K, M or G. + The size of the last partition can be specified as '-' for the remaining + space on the device. This format is the same as used by the Linux + kernel or cmdline mtd partitions. + + Options: + -n do not use the device name as prefix of the partition name + DEVICE device being worked on + PART SIZE1[@OFFSET1](NAME1)[RO],SIZE2[@OFFSET2](NAME2)[RO],... + + + delpart - delete partition(s) + + Usage: delpart PART... + + Delete partitions previously added to a device with addpart. + +config CMD_AUTOMOUNT + tristate + select FS_AUTOMOUNT + prompt "automount" + help + Automount allows o automatically execute a script when a certain + directory is accessed for the first time. The script should then make + this directory available (discover USB devices, bring network interface + up and finally mount the filesystem). + + Usage: automount [-ldr] PATH [COMMAND] + + Options: + -l list registered automount-points + -d create the mount directory + -r remove an automountpoint + +config CMD_MOUNT + tristate + default y + prompt "mount" + help + Mount a filesystem or list mounted filesystems + + Usage: mount [[-atov] [DEVICE] [MOUNTPOINT]] + + If no argument is given, list mounted filesystems. + If no FSTYPE is specified, try to detect it automatically. + With -a the mount command mounts all block devices whose filesystem + can be detected automatically to /mnt/PARTNAME + If mountpoint is not given, a standard mountpoint of /mnt/DEVICE + is used. This directoy is created automatically if necessary. + + Options: + -a mount all blockdevices + -t FSTYPE specify filesystem type + -o OPTIONS set file system OPTIONS + -v verbose + +config CMD_UBI + tristate + default y if MTD_UBI + depends on MTD_UBI + prompt "ubiattach, ubimkvol and ubirmvol" + help + ubiattach - attach mtd device to UBI + + Usage: ubiattach [-O] MTDDEV + + Options: + -O OFFS VID header offset + + + ubimkvol - create an UBI volume + + Usage: ubimkvol UBIDEV NAME SIZE + + Create an UBI volume on UBIDEV with NAME and SIZE. + If SIZE is 0 all available space is used for the volume. + + + ubirmvol - delete an UBI volume + + Usage: ubirmvol UBIDEV NAME + + Delete UBI volume NAME from UBIDEV + + +config CMD_UBIFORMAT + tristate + depends on MTD_UBI + select LIBMTD + select LIBSCAN + select LIBUBIGEN + prompt "ubiformat" + +config CMD_UMOUNT + tristate + default y + prompt "umount" + help + Usage: umount MOUNTPOINT + + Unmount a filesystem mounted on a specific MOINTPOINT + +# end Partition commands +endmenu + + + +menu "Environment" + +config CMD_EXPORT + depends on ENVIRONMENT_VARIABLES + tristate + prompt "export" + help + Export environment variables + + Usage: export VAR[=VALUE] + + Export an environment variable to subsequently executed scripts. + +config CMD_GLOBAL + select GLOBALVAR + tristate + prompt "global" + help + Create or set global variables + + Usage: global [-r] VAR[=VALUE] + + Add a new global variable named VAR, optionally set to VALUE. + + Options: + -r set value of all global variables beginning with 'match' + +config CMD_LOADENV + tristate + select ENV_HANDLING + prompt "loadenv" + help + Load environment from ENVFS + + Usage: loadenv {-nsd] [ENVFS] [DIRECTORY] + + Load environment from files in ENVFS (default /dev/env0) in + DIRECTORY (default /env + + Options: + -n do not overwrite existing files + -s scrub old environment + -d load default environment + +config CMD_PRINTENV + tristate + depends on ENVIRONMENT_VARIABLES + prompt "printenv" + help + Print value of environment variables + + Usage: printenv [VARIABLE] + + If an argument is given, printenv prints the content of an environment + variable to the terminal. If no argument is specified, all variables are + printed. + +config CMD_MAGICVAR + tristate + prompt "magicvar" + help + Barebox has some shell variables with special meanings. This + command shows the available magic variables. + +config CMD_MAGICVAR_HELP + bool + prompt "display description" + depends on CMD_MAGICVAR + help + Also display a description to the magic variables + +config CMD_SAVEENV + tristate + select ENV_HANDLING + prompt "saveenv" + help + Save environment to persistent storage + + Usage: saveenv [ENVFS] [DIRECTORY] + + Save the files in DIRECTORY to the persistent storage device ENVFS. + + ENVFS is usually a block in flash but can be any other file. If + omitted, DIRECTORY defaults to /env and ENVFS defaults to + /dev/env0. Note that envfs can only handle files, directories are being + skipped silently. + +# end Environment commands +endmenu + + + + +menu "File" + +config CMD_BASENAME + tristate + prompt "basename" + help + Usage: basename PATH VAR + + Remove directory and suffix from the PATH and store result into variable VAR. + +config CMD_CAT + tristate + default y + prompt "cat" + help + Concatenate file(s) to stdout + + Usage: cat FILE... + + Currently only printable characters and NL, TAB are printed. + +config CMD_CD + tristate + default y + prompt "cd" + help + Change working directory + + Usage: cd DIRECTORY + + If called without an argument, change to the root directory '/'. + +config CMD_CP + tristate + default y + prompt "cp" + help + Copy files + + Usage: cp [-v] SRC DEST + + Copy file from SRC to DEST. + + Options: + -v verbose + +config CMD_DIRNAME + tristate + prompt "dirname" + help + Strip last component of file name and store the result in a + environment variable + +config CMD_FILETYPE + tristate + select FILETYPE + prompt "filetype" + help +Detect file type + + Usage: filetype [-vsl] FILE + + Detect type of a file and export result to a variable. + + Options: + -v verbose + -s VAR set variable VAR to shortname + -l list known filetypes + + Detected file types are registered at runtime, depending on + what you have compiled into barebox. Example of "filetype -l": + + known filetypes: + arm-zimage : ARM Linux zImage + lzo : LZO compressed + lz4 : LZ4 compressed + arm-barebox : ARM barebox image + u-boot : U-Boot uImage + ubi : UBI image + jffs2 : JFFS2 image + gzip : GZIP compressed + bzip2 : BZIP2 compressed + dtb : open firmware Device Tree flattened Binary + android : android boot image + sh : bourne SHell + mips-barebox : MIPS barebox image + fat : FAT filesytem + mbr : MBR sector + bmp : BMP image + png : PNG image + ext : EXT filesystem + gpt : GUID Partition Table + bpk : Binary PacKage + bbenv : barebox environment file + +config CMD_LN + tristate + prompt "ln" + help + Create symlink (make a new name for a file) + + Usage: ln SRC DEST + +config CMD_LS + tristate + default y + prompt "ls" + help + List a file or directory + + Usage: ls [-lCR] [FILEDIR...] + + List information about the specified files or directories. + + Options: + -l long format + -C column format (opposite of long format) + -R list subdirectories recursively + +config CMD_MD5SUM + tristate + select COMPILE_DIGEST + select MD5 + prompt "md5sum" + help + Usage: md5sum FILE|AREA... + + Calculate a MD5 digest over a FILE or a memory area. + +config CMD_MKDIR + tristate + default y + prompt "mkdir" + help + Usage: mkdir [DIRECTORY ...] + + Create new directories + + Options: + -p make parent directories as needed + +config CMD_PWD + tristate + default y + prompt "pwd" + help + Print working directory. + +config CMD_READLINK + tristate + prompt "readlink" + help + Read value of a symbolic link + + Usage: readlink [-f] FILE VARIABLE + + Read value of a symbolic link and store it into VARIABLE. + + Options: + -f canonicalize by following first symlink + +config CMD_RM + tristate + default y + prompt "rm" + help + Remove files + + Usage: rm [-r] FILES... + + Options: + -r remove directories and their contents recursively + +config CMD_RMDIR + tristate + default y + prompt "rmdir" + help + Remove empty directory(s) + + Usage: rmdir DIRECTORY... + + Remove directories. The directories have to be empty. + +config CMD_SHA1SUM + tristate + select COMPILE_DIGEST + select SHA1 + prompt "sha1sum" + help + Calculate SHA1 digest + + Usage: sha1sum FILE|AREA + + Calculate a SHA1 digest over a FILE or a memory area. + +config CMD_SHA224SUM + tristate + select COMPILE_DIGEST + select SHA224 + prompt "sha224sum" + help + Calculate SHA224 digest + + Usage: sha224sum FILE|AREA + + Calculate a SHA224 digest over a FILE or a memory area. + +config CMD_SHA256SUM + tristate + select COMPILE_DIGEST + select SHA256 + prompt "sha256sum" + help + sha256sum - calculate SHA256 digest + + Usage: sha256sum FILE|AREA + + Calculate a SHA256 digest over a FILE or a memory area. + +config CMD_UNCOMPRESS + bool + select UNCOMPRESS + prompt "uncompress" + help + Uncompress handles lzo, gzip and bzip2 compressed files + depending on the compiled in compression libraries. + + Usage: uncompress INFILE OUTFILE + +# end File commands +endmenu + + + + +menu "Shell scripting" config CMD_EXEC depends on !SHELL_HUSH tristate prompt "exec" -config CMD_SLEEP +config CMD_FALSE tristate - prompt "sleep" - -config CMD_MSLEEP - tristate - prompt "msleep" - -config CMD_SAVEENV - tristate - select ENV_HANDLING - prompt "saveenv" - -config CMD_LOADENV - tristate - select ENV_HANDLING - prompt "loadenv" - -config CMD_EXPORT - depends on ENVIRONMENT_VARIABLES - tristate - prompt "export" - -config CMD_PRINTENV - tristate - depends on ENVIRONMENT_VARIABLES - prompt "printenv" - -config CMD_READLINE - tristate - prompt "readline" - -config CMD_READF - tristate - prompt "readf" + default y + prompt "false" help - The readf command is used to read a files content into a shell variable. + Do nothing, unsuccessfully + +config CMD_GETOPT + bool + depends on SHELL_HUSH + prompt "getopt" + help + Parse option arguments + + Usage: getopt OPTSTRING VAR + + OPTSTRING contains the option letters. Add a colon to an + options if this Option has a required argument or two colons + for an optional argument. The Current option is saved in + VAR, arguments are saved in $OPTARG. Any n-option arguments + can be accessed starting from $1. config CMD_LET tristate prompt "let" help - the 'let' command is used for arithmetics. It works like the corresponding - Unix shell command. + Evaluate arithmetic expressions + + Usage: let EXPR [EXPR ...] + + Supported operations are in order of decreasing precedence: + X++, X-- + ++X, --X + +X, -X + !X, ~X + X**Y + X*Y, X/Y, X%Y + X+Y, X-Y + X<>Y + X=Y, X>Y + X==Y, X!=Y + X&Y + X^Y + X|Y + X&&Y + X||Y + X?Y:Z + X*=Y, X/=Y, X%=Y + X=Y, X&=Y, X|=Y, X^=Y, X+=Y, X-=Y, X<<=Y, X>>=Y + +config CMD_MSLEEP + tristate + prompt "msleep" + help + Delay execution for n milli-seconds + + Usage: msleep MILLISECONDS + +config CMD_READF + tristate + prompt "readf" + help + Read file into variable + + Usage: readf FILE VAR + + Read a single line from FILE into a VARiable. Leading and trailing + whitespaces are removed, nonvisible characters are stripped. Input is + limited to 1024 characters. + +config CMD_SLEEP + tristate + prompt "sleep" + help + Delay execution for n seconds + + Usage: sleep SECONDS + +config CMD_TEST + tristate + depends on SHELL_HUSH + default y + prompt "test" + help + Minimal test command like in /bin/sh + + Usage: test [EXPR] + + Options: + !, =, !=, -eq, -ne, -ge, -gt, -le, -lt, -o, -a, -z, -n, -d, -e, + -f, -L; see 'man test' on your PC for more information. config CMD_TRUE tristate default y prompt "true" + help + Do nothing, successfully. -config CMD_FALSE +# end Scripting commands +endmenu + + + +if NET + +menu "Network" + +config CMD_DHCP + bool + prompt "dhcp" + help + DHCP client to obtain IP or boot params + + Usage: dhcp [-HvcuUr] + + Options: + -H HOSTNAME hostname to send to the DHCP server + -v ID DHCP Vendor ID (code 60) submitted in DHCP requests + -c ID DHCP Client ID (code 61) submitted in DHCP requests + -u UUID DHCP Client UUID (code 97) submitted in DHCP requests + -U CLASS DHCP User class (code 77) submitted in DHCP requests + -r RETRY retry limit (default 20)# + +config CMD_HOST + tristate + select NET_RESOLV + prompt "host" + help + Resolv a hostname. + + Usage: host DESTINATION + +config NET_CMD_IFUP + bool + prompt "ifup" + help + Bring up network interfaces based on config files. + + Usage: ifup [-af] [INTF] + + Each INTF must have a script /env/network/INTF that set the variables + ip (to 'static' or 'dynamic'), ipaddr, netmask, gateway, serverip + and/or ethaddr. A script /env/network/INTF-discover can contains for + discovering the ethernet device, e.g. 'usb'. + + Options: + -a bring up all interfaces + -f Force. Configure even if ip already set + +config CMD_MIITOOL + tristate + depends on PHYLIB + prompt "miitool" + help + The miitool command allows to view media-independent interface status. + The default short output reports the negotiated link speed and + link status for selected MII. The '-v' option displays more + detailed MII status information, such as MII capabilities, + current advertising mode, and link partner capabilities. + +config CMD_PING + tristate + prompt "ping" + help + Send ICMP echo requests. + + Usage: ping DESTINATION + +config CMD_TFTP + depends on FS_TFTP + tristate + prompt "tftp" + help + Load (or save) a file using TFTP + + Note that barebox can mount tftp as a filesystem. Therefore + this 'tftp' command is only needed to preserve backward + compatibility. + + Usage: tftp [-p] SOURCE [DEST] + + Load (or save) a file via TFTP. + + Options: + -p push to TFTP server + +# end Network commands +endmenu + +# end if NET +endif + + + + +menu "Console and Framebuffer interaction" + +config CMD_CLEAR tristate default y - prompt "false" + prompt "clear" + help + Clear screen + + Send ANSI ESC sequence to clear the screen. + +config CMD_ECHO + tristate + default y + prompt "echo" + help + Echo args to console + + Usage: echo [-neao] STRING + + Display a line of TEXT on the console. + + Options: + -n do not output the trailing newline + -a FILE append to FILE instead of using stdout + -o FILE overwrite FILE instead of using stdout + +config CMD_ECHO_E + bool + depends on CMD_ECHO + select PROCESS_ESCAPE_SEQUENCE + prompt "support -e option to echo" + help + Adds this command line option: + -e recognize escape sequences + +config CMD_EDIT + tristate + prompt "edit" + help + A small fill-screen editor. + + Usage: edit FILE + + Use cursor keys, Ctrl-C to exit and Ctrl-D to exit-with-save. + +config CMD_LOGIN + tristate + select PASSWORD + prompt "login" + help + Ask for a password + + Usage: login [-t TIMEOUT] COMMAND + + Asks for a password from the console before script execution continues. + The password can be set with the 'passwd' command. Instead of specifying + a TIMEOUT the magic variable 'global.login.timeout' could be set. + + Options: + -t TIMEOUT Execute COMMAND if no login withing TIMEOUT seconds config CMD_MENU tristate depends on MENU prompt "menu" + help + Create and display menus + + Manage Menu: + -m menu + -l list + -s show + + Show menu: + (-A auto select delay) + (-d auto select description) + menu -s -m MENU [-A delay] [-d auto_display] + + List menu: + menu -l + + Menu example: + menu -s -m boot config CMD_MENU_MANAGEMENT bool depends on CMD_MENU prompt "menu scripts management" + help + Adds this options: + -e menu entry + -a add + -r remove + -S select + + Add a menu: + menu -a -m NAME -d DESC + + Remove a menu: + menu -r -m NAME + + Add an entry: + (-R for do no exit the menu after executing the command) + (-b for box style 1 for selected) + (and optional -c for the command to run when we change the state) + menu -e -a -m MENU -c COMMAND [-R] [-b 0|1] -d DESC + + Add a submenu entry: + (-R is not needed) + (-b for box style 1 for selected) + (and -c is not needed) + menu -e -a -m MENU -u submenu -d [-b 0|1] DESC + + Remove an entry: + menu -e -r -m NAME -n ENTRY + + Select an entry: + menu -m -S -n ENTRY + + List menu: + menu -e -l [menu] + + Menu examples: + menu -a -m boot -d "Boot Menu" + menu -e -a -m boot -c boot -d "Boot" + menu -e -a -m boot -c reset -d "Reset" + config CMD_MENUTREE bool @@ -96,17 +1315,37 @@ config CMD_MENUTREE select MENUTREE prompt "menutree" help - The menutree command allows to create a menu from a directory structure + Create menu from directory structure -config CMD_LOGIN - tristate - select PASSWORD - prompt "login" + Usage: menutree [-m] DIR + + Each menu entry is described by a subdirectory. Each subdirectory + can contain the following files which further describe the entry: + + title A file containing the title of the entry as shown in the menu + box If present, the entry is a 'bool' entry. The file contains a + name from which the current state of the bool is taken from and saved + to. + action if present this file contains a shell script which is executed when + when the entry is selected. + + If neither 'box' or 'action' are present, this entry is considered a submenu + containing more entries. + + Options: + -m DIR directory where the menu starts (Default: /env/menu) config CMD_PASSWD tristate select CMD_LOGIN prompt "passwd" + help + Set password + + 'Interactively asks for a password. The digest of this password will be + stored in /env/etc//passwd. This is then used by the 'login' command. + + Entering an empty string will disable the password function. if CMD_LOGIN || CMD_PASSWD @@ -125,466 +1364,162 @@ config PASSWD_MODE_CLEAR endchoice endif - -config CMD_TIME - bool "time" - help - Just like the unix time command this command allows to measure the - execution time of a command. Note: barebox does not use interrupts, - so the system timer can overrun during the execution of the command - resulting in incorrect results. The timer gets updated in the function - checking for ctrl-c, so the time command can be used with commands - which are interruptible with ctrl-c. - -config CMD_LINUX_EXEC - bool "linux exec" - depends on LINUX - help - This command executes a command on the Linux host. - -config CMD_GLOBAL - select GLOBALVAR - tristate - prompt "global" - help - The global command allows to create global variables - -endmenu - -menu "file commands" - -config CMD_LS - tristate - default y - prompt "ls" - -config CMD_RM - tristate - default y - prompt "rm" - -config CMD_CAT - tristate - default y - prompt "cat" - -config CMD_MKDIR - tristate - default y - prompt "mkdir" - -config CMD_RMDIR - tristate - default y - prompt "rmdir" - -config CMD_CP - tristate - default y - prompt "cp" - -config CMD_PWD - tristate - default y - prompt "pwd" - -config CMD_CD - tristate - default y - prompt "cd" - -config CMD_MOUNT - tristate - default y - prompt "mount" - -config CMD_UMOUNT - tristate - default y - prompt "umount" - -config CMD_NAND - tristate - default y - depends on NAND - prompt "nand" - -config CMD_AUTOMOUNT - tristate - select FS_AUTOMOUNT - prompt "automount" - help - automount allows it to automatically execute a script when a certain - directory is accessed for the first time. The script should then make - this directory available (discover USB devices, bring network interface - up and finally mount the filesystem). - -config CMD_BASENAME - tristate - prompt "basename" - help - Strip directory and suffix from filenames and store the result in a - environment variable - -config CMD_DIRNAME - tristate - prompt "dirname" - help - Strip last component of file name and store the result in a - environment variable - -config CMD_LN - tristate - prompt "ln" - -config CMD_READLINK - tristate - prompt "readlink" - help - read value of a symbolic link - -config CMD_TFTP - depends on FS_TFTP - tristate - prompt "tftp" - help - barebox can mount tftp as a filesystem. This command is only needed to - preserve backward compatibility to the old tftp command. - -config CMD_FILETYPE - tristate - select FILETYPE - prompt "filetype" - -endmenu - -menu "console" - -config CMD_CLEAR - tristate - default y - prompt "clear" - -config CMD_ECHO - tristate - default y - prompt "echo" - -config CMD_ECHO_E +config CMD_SPLASH bool - depends on CMD_ECHO - select PROCESS_ESCAPE_SEQUENCE - prompt "support -e option to echo" + select IMAGE_RENDERER + prompt "splash" + help + Display a BMP image on a framebuffer device + Usage: splash [-fxyno] FILE + + This command displays a graphics in the bitmap (.bmp) format on the + framebuffer. Currently images with 8 and 24 bit color depth are supported. + + Options: + -f FB framebuffer device (default /dev/fb0) + -x XOFFS x offset (default center) + -y YOFFS y offset (default center) + -b COLOR background color in 0xttrrggbb + -o render offscreen + +config CMD_READLINE + tristate + prompt "Readline" + help + rompt for user input + + Usage: readline PROMPT VAR + + First it displays the PROMPT, then it reads a line of user input into + variable VAR. + +config CMD_TIMEOUT + tristate + prompt "timeout" + help + Usage: timeout [-acrs] SECONDS + + Wait SECONDS for a timeout. Return 1 if the user intervented. + + Options: + -a interrupt on any key + -c interrupt on Ctrl-C + -r interrupt on RETURN + -s silent mode + +# end Console interaction commands endmenu -menu "memory" -config CMD_LOADB - depends on !CONSOLE_NONE - select CRC16 - tristate - prompt "loadb" -config CMD_LOADY - select CRC16 - select XYMODEM - depends on !CONSOLE_NONE - tristate - prompt "loady" -config CMD_LOADS - depends on !CONSOLE_NONE - tristate - prompt "loads" - -config CMD_SAVES - tristate - depends on CMD_LOADS - prompt "saves" - -config CMD_MEMINFO - tristate - prompt "meminfo" - -config CMD_IOMEM - tristate - prompt "iomem/ioport" - help - Show information about iomem/ioport usage. Pendant to - 'cat /proc/iomem' and 'cat /proc/ioports' under Linux. - -config CMD_MEMORY - bool - default y - -config CMD_MD - tristate - default y - select CMD_MEMORY - prompt "md" - help - the md command allows to display (hexdump) memory locations and files. - -config CMD_MW - tristate - default y - select CMD_MEMORY - prompt "mw" - help - the mw command allows to write to memory locations and files. - -config CMD_MM - tristate - select CMD_MEMORY - prompt "memory modify (mm)" - help - the mm command allows to read-modify-write registers by doing: - reg = (reg & ~mask) | (val & mask) - -config CMD_MEMCMP - tristate - default y - select CMD_MEMORY - prompt "memcmp" - help - the memcmp command allows to compare memory and file regions. - -config CMD_MEMCPY - tristate - default y - select CMD_MEMORY - prompt "memcpy" - help - the memcpy command allows to copy memory and file regions. - -config CMD_MEMSET - tristate - default y - select CMD_MEMORY - prompt "memset" - help - the memset command allows to set regions of memory and files to - a specific value. +menu "Memory" config CMD_CRC tristate select CRC32 prompt "crc32" + help + Usage: crc32 [-fFvV] AREA + + Calculate a CRC32 checksum of a memory area. + Options: + -f FILE Use file instead of memory. + -F FILE Use file to compare. + -v CRC Verify config CMD_CRC_CMP tristate depends on CMD_CRC prompt "compare 2 files using crc32" + help + Adds this option: -config CMD_DIGEST - tristate - select DIGEST + -V FILE Verify with CRC read from FILE -config CMD_MD5SUM - tristate - select CMD_DIGEST - select MD5 - prompt "md5sum" - -config CMD_SHA1SUM - tristate - select CMD_DIGEST - select SHA1 - prompt "sha1sum" - -config CMD_SHA256SUM - tristate - select CMD_DIGEST - select SHA256 - prompt "sha256sum" - -config CMD_SHA224SUM - tristate - select CMD_DIGEST - select SHA224 - prompt "sha224sum" - -endmenu - -menu "flash" - -config CMD_FLASH - tristate - prompt "protect/erase" - -config CMD_UBI - tristate - default y if MTD_UBI - depends on MTD_UBI - prompt "ubimkvol, ubirmvol, ubiattach" - -config CMD_UBIFORMAT - tristate - depends on MTD_UBI - select LIBMTD - select LIBSCAN - select LIBUBIGEN - prompt "ubiformat" - -endmenu - -menu "booting" - -config CMD_BOOTM +config CMD_MD tristate default y - select BOOTM - select CRC32 - select UIMAGE - select UNCOMPRESS - select FILETYPE - select GLOBALVAR - prompt "bootm" - -config CMD_BOOTM_SHOW_TYPE - bool - depends on CMD_BOOTM - prompt "show image information" - -config CMD_BOOTM_VERBOSE - bool - prompt "bootm verbose support" - depends on CMD_BOOTM + select COMPILE_MEMORY + prompt "md" help - support verbose bootm (-v switch) + Memory display -config CMD_BOOTM_INITRD - bool - prompt "bootm initrd support" - depends on CMD_BOOTM - help - support initrds in bootm + Usage: md [-bwlsx] REGION -config CMD_BOOTM_OFTREE - bool - depends on CMD_BOOTM - select OFTREE - prompt "bootm oftree support" - help - say yes here to support passing a flat device tree to the kernel + Display (hex dump) a memory region. -config CMD_BOOTM_OFTREE_UIMAGE - bool - prompt "support passing oftree uImages" - depends on CMD_BOOTM_OFTREE - help - Support using oftree uImages. Without this only raw oftree - blobs can be used. + Options: + -b byte access + -w word access (16 bit) + -l long access (32 bit) + -s FILE display file (default /dev/mem) + -x swap bytes at output -config CMD_BOOTM_AIMAGE - bool - prompt "bootm Android image support" - depends on CMD_BOOTM && ARM - help - Support using Android Images. + Memory regions can be specified in two different forms: START+SIZE + or START-END, If START is omitted it defaults to 0x100 + Sizes can be specified as decimal, or if prefixed with 0x as hexadecimal. + An optional suffix of k, M or G is for kbytes, Megabytes or Gigabytes. -config CMD_UIMAGE - select UIMAGE - tristate - prompt "uimage" - help - Show information about uImage and also extract and verify uImages. - -config CMD_BOOTZ - tristate - depends on ARM - prompt "bootz" - help - compile in the 'bootz' command to start zImages - -config CMD_BOOTU +config CMD_MEMCMP tristate default y - depends on ARM - prompt "bootu" + select COMPILE_MEMORY + prompt "memcmp" help - compile in the 'bootu' command to start raw (uncompressed) - Linux images + Memory compare -config FLEXIBLE_BOOTARGS - bool - prompt "flexible Linux bootargs generation" - depends on CMD_GLOBAL + Usage: memcmp [-bwlsd] ADDR1 ADDR2 COUNT + + Compare memory regions specified with ADDR and ADDR2 + of size COUNT bytes. If source is a file COUNT can + be left unspecified, in which case the whole file is + compared. + + Options: + -b byte access + -w word access (16 bit) + -l long access (32 bit) + -s FILE source file (default /dev/mem) + -d FILE destination file (default /dev/mem) + +config CMD_MEMCPY + tristate + default y + select COMPILE_MEMORY + prompt "memcpy" help - Select this to get a more flexible bootargs generation. With this - option the bootargs are concatenated together from global variables - beginning with 'global.linux.bootargs.' and 'global.linux.mtdparts.' - This allows for more flexible scripting since with it it's possible - to replace parts of the bootargs string without reconstructing it - completely + Memory copy -config CMD_LINUX16 + Usage: memcpy [-bwlsd] SRC DEST COUNT + + Copy memory at SRC of COUNT bytes to DEST + + Options: + -b byte access + -w word access (16 bit) + -l long access (32 bit) + -s FILE source file (default /dev/mem) + -d FILE write file (default /dev/mem) + +config CMD_MEMSET tristate - depends on X86 - default y if X86 - prompt "linux16" + default y + select COMPILE_MEMORY + prompt "memset" help - Compile the linux16 command to be able to boot bzImages - via real mode. + Memory fill -config CMD_BOOT - tristate - select BOOTM - prompt "boot" - help - Select this for booting based on scripts. unlike the bootm command which - can boot a single image this command offers the possibility to boot with - scripts (by default placed under /env/boot/). This command iterates over - multiple scripts until one succeeds. It supersedes the previous 'boot' - script. + Usage: memset [-bwld] ADDR COUNT DATA -config CMD_RESET - tristate - prompt "reset" + Fills the first COUNT bytes at offset ADDR with byte DATA, -config CMD_POWEROFF - tristate - depends on HAS_POWEROFF - prompt "poweroff" - -config CMD_GO - tristate - prompt "go" - -config CMD_OFTREE - tristate - select OFTREE - prompt "oftree" - help - The oftree command has support for dumping devicetrees and, if - enabled, to probe devices from the devicetree - -config CMD_OF_PROPERTY - tristate - select OFTREE - prompt "of_property" - help - The of_property command allows setting and deleting of properties in - the currently loaded devicetree. - -config CMD_OF_NODE - tristate - select OFTREE - prompt "of_node" - help - The of_node command allows adding and removing devicetree nodes. - -endmenu - -menu "testing" - -config CMD_NANDTEST - tristate - depends on NAND - depends on PARTITION - depends on NAND_ECC_HW || NAND_ECC_SOFT - prompt "nandtest" + Options: + -b byte access + -w word access (16 bit) + -l long access (32 bit) + -d FILE write file (default /dev/mem) config CMD_MEMTEST tristate @@ -596,150 +1531,282 @@ config CMD_MEMTEST flags support, the memtest is running twice with cache enabled and with cache disabled -config CMD_2048 - tristate - prompt "2048" - help - Console version of the game "2048" for GNU/Linux + Usage: memtest [-ib] + Options: + -i ITERATIONS perform number of iterations (default 1, 0 is endless) + -b perform only a test on bus lines + +config CMD_MM + tristate + select COMPILE_MEMORY + prompt "memory modify (mm)" + help + Memory modify with mask + + Usage: mm [-bwld] ADDR VAL MASK + + Set/clear bits specified with MASK in ADDR to VALUE + + Options: + -b byte access + -w word access (16 bit) + -l long access (32 bit) + -d FILE write file (default /dev/mem) + +config CMD_MW + tristate + default y + select COMPILE_MEMORY + prompt "mw" + help + Memory write + + Usage: mw [-bwld] REGION DATA... + + Write DATA value(s) to the specified REGION. + + Options: + -b byte access + -w word access (16 bit) + -l long access (32 bit) + -d FILE destination file (default /dev/mem) + +#end Memory commands endmenu -menu "video command" -if VIDEO -config CMD_SPLASH - bool - select IMAGE_RENDERER - prompt "splash" + +menu "Hardware manipulation" + +config CMD_CLK + tristate + depends on COMMON_CLK + prompt "clk_dump, clk_set_parent, clk_set_rate" help - show bmp files on framebuffer devices + clk_dump - show information about registered clocks -endif + Usage: clk_dump [-v] -endmenu + Options: + -v verbose -config CMD_BAREBOX_UPDATE + + clk_set_parent - set parent of a clock + + Usage: clk_set_parent CLK PARENT + + + clk_set_rate - set a clocks rate + + Usage: clk_set_rate CLK HZ + + Set clock CLK to RATE Hz. + +config CMD_DETECT tristate - select BAREBOX_UPDATE - prompt "barebox-update" - -config CMD_TIMEOUT - tristate - prompt "timeout" - -config CMD_PARTITION - tristate - prompt "addpart/delpart" - -config CMD_TEST - tristate - depends on SHELL_HUSH - default y - prompt "test" + prompt "detect" help - shell like test function + Some devices take longer time to probe, like slow disks or + SD/MMC cards. These can defer the actual probe of the client + devices until they are needed. Use the 'detect' command on + the physical device to trigger probing. -config CMD_REGINFO - depends on HAS_REGINFO - select REGINFO - tristate - prompt "reginfo" + Usage: detect [-lea] [devices] -config CMD_VERSION - tristate - default y - depends on BANNER - prompt "version" + Options: + -l list detectable devices + -e bail out if one device fails to detect + -a detect all devices -config CMD_HELP +config CMD_FLASH tristate - default y - prompt "help" - -config CMD_MAGICVAR - tristate - prompt "magicvar" + prompt "erase, protect and unprotect" help - barebox has some shell variables with special meanings. This - command shows the available magic variables. + erase - erase flash memory -config CMD_MAGICVAR_HELP - bool - prompt "display description" - depends on CMD_MAGICVAR - help - Also display a description to the magic variables + Usage: erase DEVICE [AREA] -config CMD_DEVINFO - tristate - default y - prompt "devinfo" + Erase the flash memory handled by DEVICE. Which AREA will be erased + depends on the device: If the device represents the whole flash + memory, the whole memory will be erased. If the device represents a + partition on a main flash memory, only this partition part will be + erased. -config CMD_INSMOD - bool - depends on MODULES - default y - prompt "insmod" + Use 'addpart' and 'delpart' to manage partitions -config CMD_LSMOD - bool - depends on MODULES - prompt "lsmod" + protect - enable flash write protection + + Usage: protect DEVICE [AREA] + + Protect the flash memory behind the device. It depends on the device + given, what area will be protected. If the device represents the whole + flash memory, the whole memory will be protected. If the device + represents a partition on a main flash memory, only this partition part + will be protected. + + Use 'addpart' and 'delpart' to manage partitions. + + + unprotect - disable flash write protection + + Usage: unprotect DEVICE [AREA] + + Unprotect the flash memory behind the device. It depends on the device + given, what area will be unprotected. If the device represents the whole + flash memory, the whole memory will be unprotected. If the device + represents a partition on a main flash memory, only this partition part + will be unprotected. config CMD_GPIO bool depends on GENERIC_GPIO - prompt "gpio commands" + prompt "gpio_direction_input, gpio_direction_output, gpio_get_value and gpio_set_value" help - include gpio_set_value, gpio_get_value, gpio_direction_input and - gpio_direction_output commands to control gpios. + gpio_direction_input - set direction of a GPIO pin to input -config CMD_REGULATOR - bool - depends on REGULATOR - prompt "regulator command" - help - the regulator command lists the currently registered regulators and - their current state. + Usage: gpio_direction_input GPIO -config CMD_UNCOMPRESS - bool - select UNCOMPRESS - prompt "uncompress" - help - Say yes here to get the uncompress command. uncompress handles - lzo, gzip and bzip2 compressed files depending on the compiled - in compression libraries + + gpio_direction_output - set direction of a GPIO pin to output + + Usage: gpio_direction_output GPIO + + + gpio_get_value - return value of a GPIO pin + + Usage: gpio_get_value GPIO + + + gpio_set_value - set a GPIO's output value + + Usage: gpio_set_value GPIO VALUE config CMD_I2C bool depends on I2C - prompt "i2c commands" + prompt "i2c_probe, i2c_read and i2c_write" help - include i2c_probe, i2c_read and i2c_write commands to communicate - on i2c bus. + i2c_probe - probe for an i2c device -config CMD_SPI - bool - depends on SPI - prompt "spi command" - help + Usage: i2c_probe BUS START END + + Probe the i2c bus BUS, address range from START to END for devices. + + + i2c_read - read from an i2c device + + Usage: i2c_read [-bacrwv] DATA... + + Options: + -b BUS i2c bus number (default 0) + -a ADDR i2c device address + -r START start register + -w use word (16 bit) wide access + -c COUNT byte count + -v verbose + + + i2c_write - write to an i2c device + + Usage: i2c_write [-barwv] DATA... + + Options: + -b BUS i2c bus number (default 0) + -a ADDR i2c device address + -r START start register + -w use word (16 bit) wide access + -v verbose config CMD_LED bool depends on LED prompt "led command" help - include led command to control LEDs + Control LEDs + + Usage: led LED VALUE + + Control the value of a LED. The exact meaning of VALUE is unspecified, + it can be a brightness, or a color. Most often a value of '1' means on + and '0' means off. + + Without arguments the available LEDs are listed. + +config CMD_NAND + tristate + default y + depends on NAND + prompt "nand" + help + NAND flash handling + + Usage: nand [-adb] NANDDEV + + Options: + -a register a bad block aware device ontop of a normal NAND device + -d deregister a bad block aware device + -b OFFS mark block at OFFSet as bad + +config CMD_NANDTEST + tristate + depends on NAND + depends on PARTITION + depends on NAND_ECC_HW || NAND_ECC_SOFT + prompt "nandtest" + help + NAND flash memory test + + Usage: nandtest [-tmsiol] NANDDEVICE + + Options: + -t Really do a nandtest on device + -m Mark blocks bad if they appear so + -s SEED supply random seed + -i ITERATIONS nNumber of iterations + -o OFFS start offset on flash + -l LEN length of flash to test + +config CMD_POWEROFF + tristate + depends on HAS_POWEROFF + prompt "poweroff" + help + Turn the power off. + +config CMD_SPI + bool + depends on SPI + prompt "spi command" + help + Write/read from SPI device + + Usage: spi [-brcmfwv] DATA... + + Options: + -b BUS SPI bus number (default 0) + -r COUNT bytes to read + -c chip select (default 0) + -m MODE SPI mode (default 0) + -f HZ max speed frequency, in Hz (default 1 MHz) + -w BIT bits per word (default 8) + -v verbose config CMD_LED_TRIGGER bool depends on LED_TRIGGERS prompt "trigger command" help - The trigger command allows to control LED triggers from the command - line. + Handle LED triggers + + Usage: trigger [-td] TRIGGER [LED] + + Control a LED trigger. Without options assigned triggers are shown. + + Options: + -t set a trigger (needs LED argument) + -d disable a trigger config CMD_USB bool @@ -747,56 +1814,166 @@ config CMD_USB prompt "usb command" default y help - The usb command allows to rescan for USB devices. + (re-)detect USB devices -config CMD_MIITOOL - tristate - depends on PHYLIB - prompt "miitool" - help - The miitool command allows to view media-independent interface status. - The default short output reports the negotiated link speed and - link status for selected MII. The '-v' option displays more - detailed MII status information, such as MII capabilities, - current advertising mode, and link partner capabilities. + Usage: usb [-f] -config CMD_CLK - tristate - depends on COMMON_CLK - prompt "clock manipulation commands" - help - Say yes here to get clk_set_rate, clk_set_parent and clk_dump - commands to manipulate clocks on your system. + Scan for USB devices. -config CMD_DETECT - tristate - prompt "detect" - help - say yes here to get the 'detect' command. Some devices take longer - time to probe, like slow disks or SD/MMC cards. These can defer the - actual probe of the client devices until they are needed. Use the - 'detect' command on the physical device to trigger probing. + Options: + -f force rescan -menuconfig CMD_WD +config CMD_WD bool depends on WATCHDOG prompt "wd command" help - The 'wd' command which allows to start, stop and trigger the onboard - watchdog. + Enable/disable/trigger the watchdog -if CMD_WD + Usage: wd [TIME] + + Enable the watchdog to bark in TIME seconds. + When TIME is 0, the watchdog gets disabled, + Without a parameter the watchdog will be re-triggered. config CMD_WD_DEFAULT_TIMOUT int default 0 + depends on CMD_WD prompt "default timeout" help Define the default timeout value in [seconds] if the first call of 'wd' is done without a timeout value (which means the watchdog gets enabled and re-triggered with the default timeout value). -endif +# end Hardware manipulation commands +endmenu + + + +menu "Miscelleanous" + +config CMD_2048 + tristate + prompt "2048" + help + Console version of the game "2048" for GNU/Linux + +config CMD_BAREBOX_UPDATE + tristate + select BAREBOX_UPDATE + prompt "barebox-update" + help + Update barebox to persistent media. + + Usage: barebox_update [-ltdyf] [IMAGE] + + Options: + -l list registered targets + -t TARGET specify data target handler name + -d DEVICE write image to DEVICE + -y autom. use 'yes' when asking confirmations + -f LEVEL set force level + +config CMD_LINUX_EXEC + bool "linux exec" + depends on LINUX + help + Execute a command on the host + + Usage: linux_exec COMMAND + +config CMD_INSMOD + bool + depends on MODULES + default y + prompt "insmod" + help + Load a barebox module. + +config CMD_LSMOD + bool + depends on MODULES + prompt "lsmod" + help + List loaded barebox modules. + +config CMD_OF_DUMP + tristate + select OFTREE + prompt "of_dump" + default y if CMD_OFTREE + help + dump devicetree nodes to the console + + Usage: of_dump [-f] [NODE] + + Options: + -f work on instead of internal devicetree + +config CMD_OF_NODE + tristate + select OFTREE + prompt "of_node" + help + Create/delete nodes in the device tree + + Usage: of_node [-cd] NODE NAME + + Options: + -c create a new node + -d delete a node + +config CMD_OF_PROPERTY + tristate + select OFTREE + prompt "of_property" + help + Handle device tree properties + + Usage: of_property [-sd] NODE [PROPERTY] [VALUES] + + Options: + -s set property to value + -d delete property + + Valid formats for values: + <0x00112233 4 05> - an array of cells. cells not beginning with a digit are + interpreted as node pathes and converted to phandles + [00 11 22 .. nn] - byte stream + If the value does not start with '<' or '[' it is interpreted as string + +config CMD_OFTREE + tristate + select OFTREE + prompt "oftree" + help + oftree - handle device trees + + Usage: oftree [-lpfdn] [DTB] + + Options: + -l Load DTB to internal device tree + -p probe devices from stored device tree + -f free stored device tree + +config CMD_TIME + bool "time" + help + time - measure execution duration of a command + + Usage: time COMMAND + + Note: This command depends on COMMAND being interruptible, + otherwise the timer may overrun resulting in incorrect results + +# end Miscelleanous commands +endmenu + + + + +# end Commands endmenu endif diff --git a/commands/Makefile b/commands/Makefile index f927d2173..a84d3339e 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -1,4 +1,6 @@ obj-$(CONFIG_STDDEV) += stddev.o +obj-$(CONFIG_COMPILE_DIGEST) += digest.o +obj-$(CONFIG_COMPILE_MEMORY) += mem.o obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-$(CONFIG_CMD_UIMAGE) += uimage.o obj-$(CONFIG_CMD_LINUX16) += linux16.o @@ -6,7 +8,6 @@ obj-$(CONFIG_CMD_LOADB) += loadb.o obj-$(CONFIG_CMD_LOADY) += loadxy.o obj-$(CONFIG_CMD_LOADS) += loads.o obj-$(CONFIG_CMD_ECHO) += echo.o -obj-$(CONFIG_CMD_MEMORY) += mem.o obj-$(CONFIG_CMD_MD) += md.o obj-$(CONFIG_CMD_MM) += mm.o obj-$(CONFIG_CMD_MW) += mw.o @@ -34,7 +35,6 @@ obj-$(CONFIG_CMD_MOUNT) += mount.o obj-$(CONFIG_CMD_UMOUNT) += umount.o obj-$(CONFIG_CMD_REGINFO) += reginfo.o obj-$(CONFIG_CMD_CRC) += crc.o -obj-$(CONFIG_CMD_DIGEST) += digest.o obj-$(CONFIG_CMD_CLEAR) += clear.o obj-$(CONFIG_CMD_TEST) += test.o obj-$(CONFIG_CMD_FLASH) += flash.o @@ -75,6 +75,7 @@ obj-$(CONFIG_CMD_TIME) += time.o obj-$(CONFIG_CMD_OFTREE) += oftree.o obj-$(CONFIG_CMD_OF_PROPERTY) += of_property.o obj-$(CONFIG_CMD_OF_NODE) += of_node.o +obj-$(CONFIG_CMD_OF_DUMP) += of_dump.o obj-$(CONFIG_CMD_MAGICVAR) += magicvar.o obj-$(CONFIG_CMD_IOMEM) += iomemport.o obj-$(CONFIG_CMD_LINUX_EXEC) += linux_exec.o @@ -93,6 +94,7 @@ obj-$(CONFIG_CMD_MIITOOL) += miitool.o obj-$(CONFIG_CMD_DETECT) += detect.o obj-$(CONFIG_CMD_BOOT) += boot.o obj-$(CONFIG_CMD_DEVINFO) += devinfo.o +obj-$(CONFIG_CMD_DRVINFO) += drvinfo.o obj-$(CONFIG_CMD_READF) += readf.o obj-$(CONFIG_CMD_MENUTREE) += menutree.o obj-$(CONFIG_CMD_2048) += 2048.o diff --git a/commands/automount.c b/commands/automount.c index 511d18b69..0afe4d22f 100644 --- a/commands/automount.c +++ b/commands/automount.c @@ -57,16 +57,17 @@ static int do_automount(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(automount) -BAREBOX_CMD_HELP_USAGE("automount [OPTIONS] \n") -BAREBOX_CMD_HELP_SHORT("execute when is first accessed\n") -BAREBOX_CMD_HELP_OPT("-l", "List currently registered automountpoints\n") -BAREBOX_CMD_HELP_OPT("-d", "Create the mount path\n") -BAREBOX_CMD_HELP_OPT("-r ", "remove an automountpoint\n") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-l", "list registered automount-points") +BAREBOX_CMD_HELP_OPT("-d", "create the mount directory") +BAREBOX_CMD_HELP_OPT("-r", "remove an automountpoint") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(automount) .cmd = do_automount, - .usage = "automount [OPTIONS] ", + BAREBOX_CMD_DESC("execute (mount) COMMAND when PATH ist first accessed") + BAREBOX_CMD_OPTS("[-ldr] PATH [COMMAND]") + BAREBOX_CMD_GROUP(CMD_GRP_PART) BAREBOX_CMD_HELP(cmd_automount_help) BAREBOX_CMD_END diff --git a/commands/barebox-update.c b/commands/barebox-update.c index f550572c9..a24dc3ef4 100644 --- a/commands/barebox-update.c +++ b/commands/barebox-update.c @@ -69,18 +69,18 @@ static int do_barebox_update(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(barebox_update) -BAREBOX_CMD_HELP_USAGE("barebox_update [OPTIONS] \n") -BAREBOX_CMD_HELP_SHORT("Update barebox to persistent media\n") -BAREBOX_CMD_HELP_OPT("-t ", "\n") -BAREBOX_CMD_HELP_OPT("-d ", "write image to instead of handler default\n") -BAREBOX_CMD_HELP_OPT(" ", "Can be used for debugging purposes (-d /tmpfile)\n") -BAREBOX_CMD_HELP_OPT("-y\t", "yes. Do not ask for confirmation\n") -BAREBOX_CMD_HELP_OPT("-f ", "Set force level\n") -BAREBOX_CMD_HELP_OPT("-l\t", "list registered targets\n") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-l\t", "list registered targets") +BAREBOX_CMD_HELP_OPT("-t TARGET", "specify data target handler name") +BAREBOX_CMD_HELP_OPT("-d DEVICE", "write image to DEVICE") +BAREBOX_CMD_HELP_OPT("-y\t", "autom. use 'yes' when asking confirmations") +BAREBOX_CMD_HELP_OPT("-f LEVEL", "set force level") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(barebox_update) .cmd = do_barebox_update, - .usage = "update barebox", + BAREBOX_CMD_DESC("update barebox to persistent media") + BAREBOX_CMD_OPTS("[-ltdyf] [IMAGE]") + BAREBOX_CMD_GROUP(CMD_GRP_MISC) BAREBOX_CMD_HELP(cmd_barebox_update_help) BAREBOX_CMD_END diff --git a/commands/basename.c b/commands/basename.c index b47ff8ca9..00daa5f9b 100644 --- a/commands/basename.c +++ b/commands/basename.c @@ -36,12 +36,13 @@ static int do_basename(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(basename) -BAREBOX_CMD_HELP_USAGE("basename NAME BASENAME\n") -BAREBOX_CMD_HELP_SHORT("strip NAME and store into $BASENAME\n") +BAREBOX_CMD_HELP_TEXT("Remove directory part from the PATH and store result into variable VAR.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(basename) .cmd = do_basename, - .usage = "strip directory and suffix from filenames", + BAREBOX_CMD_DESC("strip directory and suffix from filenames") + BAREBOX_CMD_OPTS("PATH VAR") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_basename_help) BAREBOX_CMD_END diff --git a/commands/boot.c b/commands/boot.c index a23ffb152..a4dc6d76f 100644 --- a/commands/boot.c +++ b/commands/boot.c @@ -456,30 +456,35 @@ out: } BAREBOX_CMD_HELP_START(boot) -BAREBOX_CMD_HELP_USAGE("boot [OPTIONS] [BOOTSRC...]\n") -BAREBOX_CMD_HELP_SHORT("Boot an operating system.\n") -BAREBOX_CMD_HELP_SHORT("[BOOTSRC...] can be:\n") -BAREBOX_CMD_HELP_SHORT("- a filename under /env/boot/\n") -BAREBOX_CMD_HELP_SHORT("- a full path to a boot script\n") -BAREBOX_CMD_HELP_SHORT("- a device name\n") -BAREBOX_CMD_HELP_SHORT("- a partition name under /dev/\n") -BAREBOX_CMD_HELP_SHORT("- a full path to a directory which\n") -BAREBOX_CMD_HELP_SHORT(" - contains boot scripts, or\n") -BAREBOX_CMD_HELP_SHORT(" - contains a loader/entries/ directory containing bootspec entries\n") -BAREBOX_CMD_HELP_SHORT("\n") -BAREBOX_CMD_HELP_SHORT("Multiple bootsources may be given which are probed in order until\n") -BAREBOX_CMD_HELP_SHORT("one succeeds.\n") -BAREBOX_CMD_HELP_SHORT("\nOptions:\n") -BAREBOX_CMD_HELP_OPT ("-v","Increase verbosity\n") -BAREBOX_CMD_HELP_OPT ("-d","Dryrun. See what happens but do no actually boot\n") -BAREBOX_CMD_HELP_OPT ("-l","List available boot sources\n") -BAREBOX_CMD_HELP_OPT ("-m","Show a menu with boot options\n") -BAREBOX_CMD_HELP_OPT ("-t ","specify timeout for the menu\n") +BAREBOX_CMD_HELP_TEXT("This is for booting based on scripts. Unlike the bootm command which") +BAREBOX_CMD_HELP_TEXT("can boot a single image this command offers the possibility to boot with") +BAREBOX_CMD_HELP_TEXT("scripts (by default placed under /env/boot/).") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("BOOTSRC can be:") +BAREBOX_CMD_HELP_TEXT("- a filename under /env/boot/") +BAREBOX_CMD_HELP_TEXT("- a full path to a boot script") +BAREBOX_CMD_HELP_TEXT("- a device name") +BAREBOX_CMD_HELP_TEXT("- a partition name under /dev/") +BAREBOX_CMD_HELP_TEXT("- a full path to a directory which") +BAREBOX_CMD_HELP_TEXT(" - contains boot scripts, or") +BAREBOX_CMD_HELP_TEXT(" - contains a loader/entries/ directory containing bootspec entries") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Multiple bootsources may be given which are probed in order until") +BAREBOX_CMD_HELP_TEXT("one succeeds.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-v","Increase verbosity") +BAREBOX_CMD_HELP_OPT ("-d","Dryrun. See what happens but do no actually boot") +BAREBOX_CMD_HELP_OPT ("-l","List available boot sources") +BAREBOX_CMD_HELP_OPT ("-m","Show a menu with boot options") +BAREBOX_CMD_HELP_OPT ("-t SECS","specify timeout in SECS") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(boot) .cmd = do_boot, - .usage = "boot the machine", + BAREBOX_CMD_DESC("boot from script, device, ...") + BAREBOX_CMD_OPTS("[-vdlmt] [BOOTSRC...]") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_HELP(cmd_boot_help) BAREBOX_CMD_END diff --git a/commands/bootm.c b/commands/bootm.c index 5dff7dd67..d6625df46 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -141,27 +141,40 @@ err_out: } BAREBOX_CMD_HELP_START(bootm) -BAREBOX_CMD_HELP_USAGE("bootm [OPTIONS] image\n") -BAREBOX_CMD_HELP_SHORT("Boot an application image.\n") -BAREBOX_CMD_HELP_OPT ("-c", "crc check uImage data\n") -BAREBOX_CMD_HELP_OPT ("-d", "dryrun. Check data, but do not run\n") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-c\t", "crc check uImage data") +BAREBOX_CMD_HELP_OPT ("-d\t", "dryrun: check data, but do not run") +BAREBOX_CMD_HELP_OPT ("-f\t", "load images even if type is undetectable") #ifdef CONFIG_CMD_BOOTM_INITRD -BAREBOX_CMD_HELP_OPT ("-r ","specify an initrd image\n") -BAREBOX_CMD_HELP_OPT ("-L ","specify initrd load address\n") +BAREBOX_CMD_HELP_OPT ("-r INITRD","specify an initrd image") +BAREBOX_CMD_HELP_OPT ("-L ADDR\t","specify initrd load address") #endif -BAREBOX_CMD_HELP_OPT ("-a ","specify os load address\n") -BAREBOX_CMD_HELP_OPT ("-e ","entry point to the image relative to start (0)\n") +BAREBOX_CMD_HELP_OPT ("-a ADDR\t","specify os load address") +BAREBOX_CMD_HELP_OPT ("-e OFFS\t","entry point to the image relative to start (0)") #ifdef CONFIG_OFTREE -BAREBOX_CMD_HELP_OPT ("-o ","specify oftree\n") +BAREBOX_CMD_HELP_OPT ("-o DTS\t","specify open firmware device tree") #endif #ifdef CONFIG_CMD_BOOTM_VERBOSE -BAREBOX_CMD_HELP_OPT ("-v","verbose\n") +BAREBOX_CMD_HELP_OPT ("-v\t","verbose") #endif BAREBOX_CMD_HELP_END BAREBOX_CMD_START(bootm) .cmd = do_bootm, - .usage = "boot an application image", + BAREBOX_CMD_DESC("boot an application image") + BAREBOX_CMD_OPTS("[-cdf" +#ifdef CONFIG_CMD_BOOTM_INITRD + "rL" +#endif + "ae" +#ifdef CONFIG_OFTREE + "o" +#endif +#ifdef CONFIG_CMD_BOOTM_VERBOSE + "v" +#endif + "] IMAGE") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_HELP(cmd_bootm_help) BAREBOX_CMD_END diff --git a/commands/cat.c b/commands/cat.c index 1c112fc46..c01710cfa 100644 --- a/commands/cat.c +++ b/commands/cat.c @@ -82,14 +82,13 @@ out: } BAREBOX_CMD_HELP_START(cat) -BAREBOX_CMD_HELP_USAGE("cat [FILES]\n") -BAREBOX_CMD_HELP_SHORT("Concatenate files on stdout.\n") -BAREBOX_CMD_HELP_TEXT ("Currently only printable characters and \\ n and \\ t are printed,\n") -BAREBOX_CMD_HELP_TEXT ("but this should be optional.\n") +BAREBOX_CMD_HELP_TEXT("Currently only printable characters and NL, TAB are printed.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(cat) .cmd = do_cat, - .usage = "concatenate file(s)", + BAREBOX_CMD_DESC("concatenate file(s) to stdout") + BAREBOX_CMD_OPTS("FILE...") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_cat_help) BAREBOX_CMD_END diff --git a/commands/cd.c b/commands/cd.c index 936fec84f..5611e9a59 100644 --- a/commands/cd.c +++ b/commands/cd.c @@ -45,13 +45,13 @@ static int do_cd(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(cd) -BAREBOX_CMD_HELP_USAGE("cd [directory]\n") -BAREBOX_CMD_HELP_SHORT("Change to directory.\n") -BAREBOX_CMD_HELP_TEXT ("If called without an argument, change to the root directory /.\n") +BAREBOX_CMD_HELP_TEXT("If called without an argument, change to the root directory '/'.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(cd) .cmd = do_cd, - .usage = "change working directory", + BAREBOX_CMD_DESC("change working directory") + BAREBOX_CMD_OPTS("DIRECTORY") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_cd_help) BAREBOX_CMD_END diff --git a/commands/clear.c b/commands/clear.c index e6d553d9d..3be2119da 100644 --- a/commands/clear.c +++ b/commands/clear.c @@ -30,12 +30,13 @@ static int do_clear(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(clear) -BAREBOX_CMD_HELP_USAGE("clear\n") -BAREBOX_CMD_HELP_SHORT("Clear the screen.\n") +BAREBOX_CMD_HELP_TEXT("Send ANSI ESC sequence to clear the screen.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(clear) .cmd = do_clear, - .usage = "clear screen", + BAREBOX_CMD_DESC("clear screen") + BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE) BAREBOX_CMD_COMPLETE(empty_complete) + BAREBOX_CMD_HELP(cmd_clear_help) BAREBOX_CMD_END diff --git a/commands/clk.c b/commands/clk.c index 241dc79c3..4e7ca60a2 100644 --- a/commands/clk.c +++ b/commands/clk.c @@ -18,15 +18,11 @@ static int do_clk_enable(int argc, char *argv[]) return clk_enable(clk); } -BAREBOX_CMD_HELP_START(clk_enable) -BAREBOX_CMD_HELP_USAGE("clk_enable \n") -BAREBOX_CMD_HELP_SHORT("enable \n") -BAREBOX_CMD_HELP_END - BAREBOX_CMD_START(clk_enable) .cmd = do_clk_enable, - .usage = "enable a clock", - BAREBOX_CMD_HELP(cmd_clk_enable_help) + BAREBOX_CMD_DESC("enable a clock") + BAREBOX_CMD_OPTS("CLK") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_END static int do_clk_disable(int argc, char *argv[]) @@ -45,15 +41,11 @@ static int do_clk_disable(int argc, char *argv[]) return 0; } -BAREBOX_CMD_HELP_START(clk_disable) -BAREBOX_CMD_HELP_USAGE("clk_disable \n") -BAREBOX_CMD_HELP_SHORT("disable \n") -BAREBOX_CMD_HELP_END - BAREBOX_CMD_START(clk_disable) .cmd = do_clk_disable, - .usage = "disable a clock", - BAREBOX_CMD_HELP(cmd_clk_disable_help) + BAREBOX_CMD_DESC("disable a clock") + BAREBOX_CMD_OPTS("CLK") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_END static int do_clk_set_rate(int argc, char *argv[]) @@ -74,13 +66,14 @@ static int do_clk_set_rate(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(clk_set_rate) -BAREBOX_CMD_HELP_USAGE("clk_set_rate \n") -BAREBOX_CMD_HELP_SHORT("Set clock to \n") +BAREBOX_CMD_HELP_TEXT("Set clock CLK to RATE") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(clk_set_rate) .cmd = do_clk_set_rate, - .usage = "set a clocks rate", + BAREBOX_CMD_DESC("set a clocks rate") + BAREBOX_CMD_OPTS("CLK HZ") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_clk_set_rate_help) BAREBOX_CMD_END @@ -105,13 +98,15 @@ static int do_clk_dump(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(clk_dump) -BAREBOX_CMD_HELP_USAGE("clk_dump [-v]\n") -BAREBOX_CMD_HELP_OPT ("-v", "verbose\n") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-v", "verbose") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(clk_dump) .cmd = do_clk_dump, - .usage = "show information about registered clocks", + BAREBOX_CMD_DESC("show information about registered clocks") + BAREBOX_CMD_OPTS("[-v]") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_HELP(cmd_clk_dump_help) BAREBOX_CMD_END @@ -132,13 +127,9 @@ static int do_clk_set_parent(int argc, char *argv[]) return clk_set_parent(clk, parent); } -BAREBOX_CMD_HELP_START(clk_set_parent) -BAREBOX_CMD_HELP_USAGE("clk_set_parent \n") -BAREBOX_CMD_HELP_SHORT("Set parent of to \n") -BAREBOX_CMD_HELP_END - BAREBOX_CMD_START(clk_set_parent) .cmd = do_clk_set_parent, - .usage = "set a parent of a clock", - BAREBOX_CMD_HELP(cmd_clk_set_parent_help) + BAREBOX_CMD_DESC("set parent of a clock") + BAREBOX_CMD_OPTS("CLK PARENT") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_END diff --git a/commands/cp.c b/commands/cp.c index 45f08d8c3..8ecde9101 100644 --- a/commands/cp.c +++ b/commands/cp.c @@ -89,8 +89,10 @@ out: } BAREBOX_CMD_HELP_START(cp) -BAREBOX_CMD_HELP_USAGE("cp [-v] \n") -BAREBOX_CMD_HELP_SHORT("copy file from to .\n") +BAREBOX_CMD_HELP_TEXT("Copy file from SRC to DEST.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-v", "verbose") BAREBOX_CMD_HELP_END /** @@ -104,7 +106,9 @@ If you want to copy between memory blocks, use 'memcpy'. BAREBOX_CMD_START(cp) .cmd = do_cp, - .usage = "copy files", + BAREBOX_CMD_DESC("copy files") + BAREBOX_CMD_OPTS("[-v] SRC DEST") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_cp_help) BAREBOX_CMD_END diff --git a/commands/crc.c b/commands/crc.c index 824dda4c7..36121623d 100644 --- a/commands/crc.c +++ b/commands/crc.c @@ -108,18 +108,25 @@ static int do_crc(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(crc) -BAREBOX_CMD_HELP_USAGE("crc32 [OPTION] [AREA]\n") -BAREBOX_CMD_HELP_SHORT("Calculate a crc32 checksum of a memory area.\n") -BAREBOX_CMD_HELP_OPT ("-f ", "Use file instead of memory.\n") +BAREBOX_CMD_HELP_TEXT("Calculate a CRC32 checksum of a memory area.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-f FILE", "Use file instead of memory.") #ifdef CONFIG_CMD_CRC_CMP -BAREBOX_CMD_HELP_OPT ("-F ", "Use file to compare.\n") +BAREBOX_CMD_HELP_OPT ("-F FILE", "Use file to compare.") #endif -BAREBOX_CMD_HELP_OPT ("-v ", "Verify\n") -BAREBOX_CMD_HELP_OPT ("-V ", "Verify with crc read from \n") +BAREBOX_CMD_HELP_OPT ("-v CRC", "Verify") +BAREBOX_CMD_HELP_OPT ("-V FILE", "Verify with CRC read from FILE") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(crc32) .cmd = do_crc, - .usage = "crc32 checksum calculation", + BAREBOX_CMD_DESC("CRC32 checksum calculation") + BAREBOX_CMD_OPTS("[-f" +#ifdef CONFIG_CMD_CRC_CMP + "F" +#endif + "vV] AREA") + BAREBOX_CMD_GROUP(CMD_GRP_MEM) BAREBOX_CMD_HELP(cmd_crc_help) BAREBOX_CMD_END diff --git a/commands/detect.c b/commands/detect.c index 499994ba7..d8e0afc31 100644 --- a/commands/detect.c +++ b/commands/detect.c @@ -80,15 +80,17 @@ static int do_detect(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(detect) -BAREBOX_CMD_HELP_USAGE("detect [OPTIONS] [devices]\n") -BAREBOX_CMD_HELP_OPT ("-l", "list detectable devices\n") -BAREBOX_CMD_HELP_OPT ("-e", "bail out if one device fails to detect\n") -BAREBOX_CMD_HELP_OPT ("-a", "detect all devices\n") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-l", "list detectable devices") +BAREBOX_CMD_HELP_OPT ("-e", "bail out if one device fails to detect") +BAREBOX_CMD_HELP_OPT ("-a", "detect all devices") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(detect) .cmd = do_detect, - .usage = "detect devices", + BAREBOX_CMD_DESC("detect devices") + BAREBOX_CMD_OPTS("[-lea] [devices]") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_COMPLETE(device_complete) BAREBOX_CMD_HELP(cmd_detect_help) BAREBOX_CMD_END diff --git a/commands/devinfo.c b/commands/devinfo.c index 806e45c9b..eb36f33ba 100644 --- a/commands/devinfo.c +++ b/commands/devinfo.c @@ -25,15 +25,15 @@ static int do_devinfo_subtree(struct device_d *dev, int depth) int i; for (i = 0; i < depth; i++) - printf(" "); + printf(" "); - printf("`---- %s", dev_name(dev)); + printf("`-- %s", dev_name(dev)); if (!list_empty(&dev->cdevs)) { printf("\n"); list_for_each_entry(cdev, &dev->cdevs, devices_list) { for (i = 0; i < depth + 1; i++) - printf(" "); - printf("`---- 0x%08llx-0x%08llx: /dev/%s\n", + printf(" "); + printf("`-- 0x%08llx-0x%08llx: /dev/%s\n", cdev->offset, cdev->offset + cdev->size - 1, cdev->name); @@ -51,25 +51,20 @@ static int do_devinfo_subtree(struct device_d *dev, int depth) return 0; } + static int do_devinfo(int argc, char *argv[]) { struct device_d *dev; - struct driver_d *drv; struct param_d *param; int i; + int first; struct resource *res; if (argc == 1) { - printf("devices:\n"); - for_each_device(dev) { if (!dev->parent) do_devinfo_subtree(dev, 0); } - - printf("\ndrivers:\n"); - for_each_driver(drv) - printf("%s\n",drv->name); } else { dev = get_device_by_name(argv[1]); @@ -78,38 +73,42 @@ static int do_devinfo(int argc, char *argv[]) return -1; } - printf("resources:\n"); + if (dev->num_resources) + printf("Resources:\n"); for (i = 0; i < dev->num_resources; i++) { res = &dev->resource[i]; - printf("num : %d\n", i); + printf(" num: %d\n", i); if (res->name) - printf("name : %s\n", res->name); - printf("start : " PRINTF_CONVERSION_RESOURCE "\nsize : " - PRINTF_CONVERSION_RESOURCE "\n", + printf(" name: %s\n", res->name); + printf(" start: " PRINTF_CONVERSION_RESOURCE "\n" + " size: " PRINTF_CONVERSION_RESOURCE "\n", res->start, resource_size(res)); } - printf("driver: %s\n", dev->driver ? - dev->driver->name : "none"); + if (dev->driver) + printf("Driver: %s\n", dev->driver->name); - printf("bus: %s\n\n", dev->bus ? - dev->bus->name : "none"); + if (dev->bus) + printf("Bus: %s\n", dev->bus->name); if (dev->info) dev->info(dev); - printf("%s\n", list_empty(&dev->parameters) ? - "no parameters available" : "Parameters:"); - + first = true; list_for_each_entry(param, &dev->parameters, list) { - printf("%16s = %s", param->name, dev_get_param(dev, param->name)); - if (param->info) + if (first) { + printf("Parameters:\n"); + first = false; + } + printf(" %s: %s", param->name, dev_get_param(dev, param->name)); + if (param->info) { param->info(param); + } printf("\n"); } #ifdef CONFIG_OFDEVICE if (dev->device_node) { - printf("\ndevice node: %s\n", dev->device_node->full_name); + printf("Device node: %s\n", dev->device_node->full_name); of_print_nodes(dev->device_node, 0); } #endif @@ -118,10 +117,6 @@ static int do_devinfo(int argc, char *argv[]) return 0; } -BAREBOX_CMD_HELP_START(devinfo) -BAREBOX_CMD_HELP_USAGE("devinfo [DEVICE]\n") -BAREBOX_CMD_HELP_SHORT("Output device information.\n") -BAREBOX_CMD_HELP_END /** * @page devinfo_command @@ -150,9 +145,20 @@ Example from an MPC5200 based system: @endverbatim */ +BAREBOX_CMD_HELP_START(devinfo) +BAREBOX_CMD_HELP_TEXT("If called without arguments, devinfo shows a summary of the known") +BAREBOX_CMD_HELP_TEXT("devices.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("If called with a device path being the argument, devinfo shows more") +BAREBOX_CMD_HELP_TEXT("default information about this device and its parameters.") +BAREBOX_CMD_HELP_END + + BAREBOX_CMD_START(devinfo) .cmd = do_devinfo, - .usage = "Show information about devices and drivers.", + BAREBOX_CMD_DESC("show information about devices") + BAREBOX_CMD_OPTS("[DEVICE]") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_HELP(cmd_devinfo_help) BAREBOX_CMD_COMPLETE(device_complete) BAREBOX_CMD_END diff --git a/commands/dfu.c b/commands/dfu.c index 2513ed883..b71cc16d2 100644 --- a/commands/dfu.c +++ b/commands/dfu.c @@ -171,17 +171,19 @@ out: } BAREBOX_CMD_HELP_START(dfu) -BAREBOX_CMD_HELP_USAGE("dfu [OPTIONS] \n") -BAREBOX_CMD_HELP_SHORT("Start firmware update with the Device Firmware Update (DFU) protocol.\n") -BAREBOX_CMD_HELP_OPT ("-m ", "Manufacturer string (barebox)\n") -BAREBOX_CMD_HELP_OPT ("-p ", "product string\n") -BAREBOX_CMD_HELP_OPT ("-V ", "vendor id\n") -BAREBOX_CMD_HELP_OPT ("-P ", "product id\n") -BAREBOX_CMD_HELP_OPT ("", - "device1(name1)[sr],device2(name2)[src]\n" - "'s' means 'safe mode' (download the complete image before flashing) and\n" - "'r' that readback of the firmware is allowed.\n" - "'c' if given, the file will be created (for use with regular files)\n") +BAREBOX_CMD_HELP_TEXT("Turn's the USB host into DFU mode (Device Firmware Mode) and accepts") +BAREBOX_CMD_HELP_TEXT("a new firmware. The destination is described by DESC in the this format:") +BAREBOX_CMD_HELP_TEXT(" DEVICE(NAME)[src]...") +BAREBOX_CMD_HELP_TEXT("Specify the '(') and ')' literal, the [] however denote this optional modes:") +BAREBOX_CMD_HELP_TEXT("- 's' safe mode (download the complete image before flashing)") +BAREBOX_CMD_HELP_TEXT("- 'r' readback of the firmware is allowed") +BAREBOX_CMD_HELP_TEXT("- 'c' the file will be created (for use with regular files)") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-m STR", "Manufacturer string (barebox)") +BAREBOX_CMD_HELP_OPT ("-p STR", "product string") +BAREBOX_CMD_HELP_OPT ("-V ID", "vendor id") +BAREBOX_CMD_HELP_OPT ("-P ID", "product id") BAREBOX_CMD_HELP_END /** @@ -196,6 +198,8 @@ device1(name1)[sr],device2(name2)[sr] BAREBOX_CMD_START(dfu) .cmd = do_dfu, - .usage = "Device firmware update", + BAREBOX_CMD_DESC("device firmware update") + BAREBOX_CMD_OPTS("[-mpVP] DESC") + BAREBOX_CMD_GROUP(CMD_GRP_MISC) BAREBOX_CMD_HELP(cmd_dfu_help) BAREBOX_CMD_END diff --git a/commands/digest.c b/commands/digest.c index c9bb1320b..092fda21a 100644 --- a/commands/digest.c +++ b/commands/digest.c @@ -83,13 +83,14 @@ static int do_md5(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(md5sum) -BAREBOX_CMD_HELP_USAGE("md5sum [[FILE] [AREA]]...\n") -BAREBOX_CMD_HELP_SHORT("Calculate a md5 checksum of a memory area.\n") +BAREBOX_CMD_HELP_TEXT("Calculate a MD5 digest over a FILE or a memory area.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(md5sum) .cmd = do_md5, - .usage = "md5 checksum calculation", + BAREBOX_CMD_DESC("calculate MD5 checksum") + BAREBOX_CMD_OPTS("FILE|AREA...") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_md5sum_help) BAREBOX_CMD_END @@ -103,13 +104,14 @@ static int do_sha1(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(sha1sum) -BAREBOX_CMD_HELP_USAGE("sha1sum [[FILE] [AREA]]...\n") -BAREBOX_CMD_HELP_SHORT("Calculate a sha1 checksum of a memory area.\n") +BAREBOX_CMD_HELP_TEXT("Calculate a SHA1 digest over a FILE or a memory area.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(sha1sum) .cmd = do_sha1, - .usage = "sha1 checksum calculation", + BAREBOX_CMD_DESC("calculate SHA1 digest") + BAREBOX_CMD_OPTS("FILE|AREA") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_sha1sum_help) BAREBOX_CMD_END @@ -123,13 +125,14 @@ static int do_sha224(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(sha224sum) -BAREBOX_CMD_HELP_USAGE("sha224sum [[FILE] [AREA]]...\n") -BAREBOX_CMD_HELP_SHORT("Calculate a sha224 checksum of a memory area.\n") +BAREBOX_CMD_HELP_TEXT("Calculate a SHA224 digest over a FILE or a memory area.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(sha224sum) .cmd = do_sha224, - .usage = "sha224 checksum calculation", + BAREBOX_CMD_DESC("calculate SHA224 digest") + BAREBOX_CMD_OPTS("FILE|AREA") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_sha224sum_help) BAREBOX_CMD_END @@ -143,13 +146,14 @@ static int do_sha256(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(sha256sum) -BAREBOX_CMD_HELP_USAGE("sha256sum [[FILE] [AREA]]...\n") -BAREBOX_CMD_HELP_SHORT("Calculate a sha256 checksum of a memory area.\n") +BAREBOX_CMD_HELP_TEXT("Calculate a SHA256 digest over a FILE or a memory area.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(sha256sum) .cmd = do_sha256, - .usage = "sha256 checksum calculation", + BAREBOX_CMD_DESC("calculate SHA256 digest") + BAREBOX_CMD_OPTS("FILE|AREA") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_sha256sum_help) BAREBOX_CMD_END diff --git a/commands/dirname.c b/commands/dirname.c index f34d88d0f..527f16754 100644 --- a/commands/dirname.c +++ b/commands/dirname.c @@ -53,13 +53,16 @@ static int do_dirname(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(dirname) -BAREBOX_CMD_HELP_USAGE("dirname [-V] NAME DIRNAME\n") -BAREBOX_CMD_HELP_SHORT("strip last componext of NAME and store into $DIRNAME\n") -BAREBOX_CMD_HELP_SHORT("-V return the path relative to the mountpoint.\n") +BAREBOX_CMD_HELP_TEXT("Strip last componext of NAME and store into $DIRNAME") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-V", "return the path relative to the mountpoint.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(dirname) .cmd = do_dirname, - .usage = "strip last component from file name", + BAREBOX_CMD_DESC("strip last component from a path") + BAREBOX_CMD_OPTS("[-V] NAME DIRNAME") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_dirname_help) BAREBOX_CMD_END diff --git a/commands/drvinfo.c b/commands/drvinfo.c new file mode 100644 index 000000000..161118a63 --- /dev/null +++ b/commands/drvinfo.c @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2013 Sascha Hauer, Pengutronix + * Copyright (C) 2014 Holger Schurig + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include +#include +#include + +int do_drvinfo(int argc, char *argv[]) +{ + struct driver_d *drv; + struct device_d *dev; + + printf("Driver\tDevice(s)\n"); + printf("--------------------\n"); + for_each_driver(drv) { + printf("%s\n",drv->name); + for_each_device(dev) { + if (dev->driver == drv) + printf("\t%s\n", dev_name(dev)); + } + } + + if (IS_ENABLED(CONFIG_CMD_DEVINFO)) + printf("\nUse 'devinfo DEVICE' for more information\n"); + + return 0; +} + + +BAREBOX_CMD_START(drvinfo) + .cmd = do_drvinfo, + BAREBOX_CMD_DESC("list compiled-in device drivers") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) +BAREBOX_CMD_END diff --git a/commands/echo.c b/commands/echo.c index 4dfd8709e..9b3e21e4b 100644 --- a/commands/echo.c +++ b/commands/echo.c @@ -104,12 +104,13 @@ no_optarg_out: } BAREBOX_CMD_HELP_START(echo) -BAREBOX_CMD_HELP_USAGE("echo [OPTIONS] [STRING]\n") -BAREBOX_CMD_HELP_SHORT("Display a line of text.\n") -BAREBOX_CMD_HELP_OPT ("-n", "do not output the trailing newline\n") -BAREBOX_CMD_HELP_OPT ("-a ", "instead of outputting to stdout append to \n") -BAREBOX_CMD_HELP_OPT ("-o ", "instead of outputting to stdout overwrite \n") -BAREBOX_CMD_HELP_OPT ("-e", "recognize escape sequences\n") +BAREBOX_CMD_HELP_TEXT("Display a line of TEXT on the console.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-n", "do not output the trailing newline") +BAREBOX_CMD_HELP_OPT ("-e", "recognize escape sequences") +BAREBOX_CMD_HELP_OPT ("-a FILE", "append to FILE instead of using stdout") +BAREBOX_CMD_HELP_OPT ("-o FILE", "overwrite FILE instead of using stdout") BAREBOX_CMD_HELP_END /** @@ -121,7 +122,9 @@ BAREBOX_CMD_HELP_END BAREBOX_CMD_START(echo) .cmd = do_echo, - .usage = "echo args to console", + BAREBOX_CMD_DESC("echo args to console") + BAREBOX_CMD_OPTS("[-neao] STRING") + BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE) BAREBOX_CMD_HELP(cmd_echo_help) BAREBOX_CMD_END diff --git a/commands/edit.c b/commands/edit.c index b0fcf69fd..f6b9d406e 100644 --- a/commands/edit.c +++ b/commands/edit.c @@ -547,8 +547,7 @@ out: static const char *edit_aliases[] = { "sedit", NULL}; BAREBOX_CMD_HELP_START(edit) -BAREBOX_CMD_HELP_USAGE("(s)edit \n") -BAREBOX_CMD_HELP_SHORT("A small editor. is exit, exit-with-save.\n") +BAREBOX_CMD_HELP_TEXT("Use cursor keys, Ctrl-C to exit and Ctrl-D to exit-with-save.") BAREBOX_CMD_HELP_END /** @@ -564,7 +563,9 @@ If called as sedit, the editor uses ansi codes to scroll the screen. BAREBOX_CMD_START(edit) .cmd = do_edit, .aliases = edit_aliases, - .usage = "Usage: (s)edit ", + BAREBOX_CMD_DESC("a small full-screen editor") + BAREBOX_CMD_OPTS("FILE") + BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE) BAREBOX_CMD_HELP(cmd_edit_help) BAREBOX_CMD_END diff --git a/commands/exec.c b/commands/exec.c index 8d12b30ec..635f65eeb 100644 --- a/commands/exec.c +++ b/commands/exec.c @@ -52,5 +52,6 @@ out: BAREBOX_CMD_START(exec) .cmd = do_exec, - .usage = "execute a script", + BAREBOX_CMD_DESC("execute a script") + BAREBOX_CMD_GROUP(CMD_GRP_SCRIPT) BAREBOX_CMD_END diff --git a/commands/export.c b/commands/export.c index c6196e0c4..2e8bb4967 100644 --- a/commands/export.c +++ b/commands/export.c @@ -49,13 +49,14 @@ static int do_export(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(export) -BAREBOX_CMD_HELP_USAGE("export [=value]\n") -BAREBOX_CMD_HELP_SHORT("export an environment variable to subsequently executed scripts\n") +BAREBOX_CMD_HELP_TEXT("Export an environment variable to subsequently executed scripts.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(export) .cmd = do_export, - .usage = "export environment variables", + BAREBOX_CMD_DESC("export environment variables") + BAREBOX_CMD_OPTS("VAR[=VALUE]") + BAREBOX_CMD_GROUP(CMD_GRP_ENV) BAREBOX_CMD_HELP(cmd_export_help) BAREBOX_CMD_END diff --git a/commands/false.c b/commands/false.c index 60d6989c4..6ef9af315 100644 --- a/commands/false.c +++ b/commands/false.c @@ -28,7 +28,8 @@ static int do_false(int argc, char *argv[]) BAREBOX_CMD_START(false) .cmd = do_false, - .usage = "do nothing, unsuccessfully", + BAREBOX_CMD_DESC("do nothing, unsuccessfully") + BAREBOX_CMD_GROUP(CMD_GRP_SCRIPT) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/commands/filetype.c b/commands/filetype.c index f82a4616b..4e016dd4d 100644 --- a/commands/filetype.c +++ b/commands/filetype.c @@ -83,15 +83,18 @@ static int do_filetype(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(filetype) -BAREBOX_CMD_HELP_USAGE("filetype [OPTIONS] \n") -BAREBOX_CMD_HELP_SHORT("detect type of a file and export result to a variable\n") -BAREBOX_CMD_HELP_OPT("-v", "verbose\n") -BAREBOX_CMD_HELP_OPT("-s ", "set to shortname\n") -BAREBOX_CMD_HELP_OPT("-l", "list known filetypes\n") +BAREBOX_CMD_HELP_TEXT("Detect type of a file and export result to a variable.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-v", "verbose") +BAREBOX_CMD_HELP_OPT("-s VAR", "set variable VAR to shortname") +BAREBOX_CMD_HELP_OPT("-l", "list known filetypes") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(filetype) .cmd = do_filetype, - .usage = "detect file type", + BAREBOX_CMD_DESC("detect file type") + BAREBOX_CMD_OPTS("[-vsl] FILE") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_filetype_help) BAREBOX_CMD_END diff --git a/commands/flash.c b/commands/flash.c index d22d6a087..b50a32702 100644 --- a/commands/flash.c +++ b/commands/flash.c @@ -75,13 +75,20 @@ out: } BAREBOX_CMD_HELP_START(erase) -BAREBOX_CMD_HELP_USAGE("erase [area]\n") -BAREBOX_CMD_HELP_SHORT("Erase a flash device or parts of a device if an area specification is given.\n") +BAREBOX_CMD_HELP_TEXT("Erase the flash memory handled by DEVICE. Which AREA will be erased") +BAREBOX_CMD_HELP_TEXT("depends on the device: If the device represents the whole flash") +BAREBOX_CMD_HELP_TEXT("memory, the whole memory will be erased. If the device represents a") +BAREBOX_CMD_HELP_TEXT("partition on a main flash memory, only this partition part will be") +BAREBOX_CMD_HELP_TEXT("erased.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Use 'addpart' and 'delpart' to manage partitions.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(erase) .cmd = do_flerase, - .usage = "erase FLASH memory", + BAREBOX_CMD_DESC("erase flash memory") + BAREBOX_CMD_OPTS("DEVICE [AREA]") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_erase_help) BAREBOX_CMD_END @@ -149,21 +156,28 @@ out: } BAREBOX_CMD_HELP_START(protect) -BAREBOX_CMD_HELP_USAGE("protect [area]\n") -BAREBOX_CMD_HELP_SHORT("protect a flash device (or parts of a device, if an area is specified)\n") +BAREBOX_CMD_HELP_TEXT("Protect the flash memory behind the device. It depends on the device") +BAREBOX_CMD_HELP_TEXT("given, what area will be protected. If the device represents the whole") +BAREBOX_CMD_HELP_TEXT("flash memory, the whole memory will be protected. If the device") +BAREBOX_CMD_HELP_TEXT("represents a partition on a main flash memory, only this partition part") +BAREBOX_CMD_HELP_TEXT("will be protected.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Use 'addpart' and 'delpart' to manage partitions.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(protect) .cmd = do_protect, - .usage = "enable flash write protection", + BAREBOX_CMD_DESC("enable flash write protection") + BAREBOX_CMD_OPTS("DEVICE [AREA]") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_protect_help) BAREBOX_CMD_END /** * @page protect_command -Protect the flash memory behind the device. It depends on the device -given, what area will be protected. If the device represents the whole + +If the device represents the whole flash memory the whole memory will be protected. If the device represents a partition on a main flash memory, only this partition part will be protected. @@ -177,20 +191,25 @@ flashes here. */ BAREBOX_CMD_HELP_START(unprotect) -BAREBOX_CMD_HELP_USAGE("unprotect [area]\n") -BAREBOX_CMD_HELP_SHORT("unprotect a flash device (or parts of a device, if an area is specified)\n") +BAREBOX_CMD_HELP_TEXT("Unprotect the flash memory behind the device. It depends on the device") +BAREBOX_CMD_HELP_TEXT("given, what area will be unprotected. If the device represents the whole") +BAREBOX_CMD_HELP_TEXT("flash memory, the whole memory will be unprotected. If the device") +BAREBOX_CMD_HELP_TEXT("represents a partition on a main flash memory, only this partition part") +BAREBOX_CMD_HELP_TEXT("will be unprotected.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(unprotect) .cmd = do_protect, - .usage = "disable flash write protection", + BAREBOX_CMD_DESC("disable flash write protection") + BAREBOX_CMD_OPTS("DEVICE [AREA]") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_unprotect_help) BAREBOX_CMD_END /** * @page unprotect_command -Unprotect the flash memory behind the device. It depends on the device given, +It depends on the device given, what area will be unprotected. If the device represents the whole flash memory the whole memory will be unprotected. If the device represents a partition on a main flash memory, only this partition part will be unprotected. diff --git a/commands/global.c b/commands/global.c index c526e6571..f14df3821 100644 --- a/commands/global.c +++ b/commands/global.c @@ -61,13 +61,16 @@ static int do_global(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(global) -BAREBOX_CMD_HELP_USAGE("global [-r] [=, optionally set to \n") -BAREBOX_CMD_HELP_SHORT("-r to set a value to of all globalvars beginning with 'match'") +BAREBOX_CMD_HELP_TEXT("Add a new global variable named VAR, optionally set to VALUE.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-r", "set value of all global variables beginning with 'match'") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(global) .cmd = do_global, - .usage = "create or set global variables", + BAREBOX_CMD_DESC("create or set global variables") + BAREBOX_CMD_OPTS("[-r] VAR[=VALUE]") + BAREBOX_CMD_GROUP(CMD_GRP_ENV) BAREBOX_CMD_HELP(cmd_global_help) BAREBOX_CMD_END diff --git a/commands/go.c b/commands/go.c index 2e7bc1e7b..f25db48ca 100644 --- a/commands/go.c +++ b/commands/go.c @@ -78,15 +78,18 @@ out: return rcode; } -static const __maybe_unused char cmd_go_help[] = -"Usage: go addr [arg ...]\n" -"Start application at address 'addr' passing 'arg' as arguments.\n" -"If addr does not start with a digit it is interpreted as a filename\n" -"in which case the file is memmapped and executed\n"; +BAREBOX_CMD_HELP_START(go) +BAREBOX_CMD_HELP_TEXT("Start application at ADDR passing ARG as arguments.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("If addr does not start with a digit it is interpreted as a filename") +BAREBOX_CMD_HELP_TEXT("in which case the file is memmapped and executed") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(go) .cmd = do_go, - .usage = "start application at address or file", + BAREBOX_CMD_DESC("start application at address or file") + BAREBOX_CMD_OPTS("ADDR [ARG...]") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_HELP(cmd_go_help) BAREBOX_CMD_COMPLETE(command_var_complete) BAREBOX_CMD_END diff --git a/commands/gpio.c b/commands/gpio.c index a91e6e029..9d9d169cf 100644 --- a/commands/gpio.c +++ b/commands/gpio.c @@ -32,15 +32,11 @@ static int do_gpio_get_value(int argc, char *argv[]) return value; } -BAREBOX_CMD_HELP_START(gpio_get_value) -BAREBOX_CMD_HELP_USAGE("gpio_get_value \n") -BAREBOX_CMD_HELP_SHORT("get the value of an gpio input pin\n") -BAREBOX_CMD_HELP_END - BAREBOX_CMD_START(gpio_get_value) .cmd = do_gpio_get_value, - .usage = "return value of a gpio pin", - BAREBOX_CMD_HELP(cmd_gpio_get_value_help) + BAREBOX_CMD_DESC("return value of a GPIO pin") + BAREBOX_CMD_OPTS("GPIO") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_END static int do_gpio_set_value(int argc, char *argv[]) @@ -58,15 +54,11 @@ static int do_gpio_set_value(int argc, char *argv[]) return 0; } -BAREBOX_CMD_HELP_START(gpio_set_value) -BAREBOX_CMD_HELP_USAGE("gpio_set_value \n") -BAREBOX_CMD_HELP_SHORT("set the value of an gpio output pin\n") -BAREBOX_CMD_HELP_END - BAREBOX_CMD_START(gpio_set_value) .cmd = do_gpio_set_value, - .usage = "set a gpio's output value", - BAREBOX_CMD_HELP(cmd_gpio_set_value_help) + BAREBOX_CMD_DESC("set a GPIO's output value") + BAREBOX_CMD_OPTS("GPIO VALUE") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_END static int do_gpio_direction_input(int argc, char *argv[]) @@ -85,15 +77,11 @@ static int do_gpio_direction_input(int argc, char *argv[]) return 0; } -BAREBOX_CMD_HELP_START(gpio_direction_input) -BAREBOX_CMD_HELP_USAGE("gpio_direction_input \n") -BAREBOX_CMD_HELP_SHORT("set direction of a gpio pin to input\n") -BAREBOX_CMD_HELP_END - BAREBOX_CMD_START(gpio_direction_input) .cmd = do_gpio_direction_input, - .usage = "set direction of a gpio pin to input", - BAREBOX_CMD_HELP(cmd_gpio_direction_input_help) + BAREBOX_CMD_DESC("set direction of a GPIO pin to input") + BAREBOX_CMD_OPTS("GPIO") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_END static int do_gpio_direction_output(int argc, char *argv[]) @@ -113,15 +101,11 @@ static int do_gpio_direction_output(int argc, char *argv[]) return 0; } -BAREBOX_CMD_HELP_START(gpio_direction_output) -BAREBOX_CMD_HELP_USAGE("gpio_direction_output \n") -BAREBOX_CMD_HELP_SHORT("set direction of a gpio pin to output\n") -BAREBOX_CMD_HELP_END - BAREBOX_CMD_START(gpio_direction_output) .cmd = do_gpio_direction_output, - .usage = "set direction of a gpio pin to output", - BAREBOX_CMD_HELP(cmd_gpio_direction_output_help) + BAREBOX_CMD_DESC("set direction of a GPIO pin to output") + BAREBOX_CMD_OPTS("GPIO") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_END /** diff --git a/commands/help.c b/commands/help.c index a12d9c354..9c33807fa 100644 --- a/commands/help.c +++ b/commands/help.c @@ -19,8 +19,68 @@ #include #include +#include #include + +static void list_group(int verbose, const char *grpname, uint32_t group) +{ + struct command *cmdtp; + bool first = true; + int pos = 0; + int len; + + for_each_command(cmdtp) { + if (cmdtp->group != group) + continue; + if (first) { + first = false; + printf("%s commands:\n", grpname); + if (!verbose) { + printf(" "); + pos = 2; + } + } + if (verbose) { + printf(" %-21s %s\n", cmdtp->name, cmdtp->desc); + continue; + } + len = strlen(cmdtp->name); + if (pos + len + 2 > 77) { + printf("\n %s", cmdtp->name); + pos = len + 2; + } else { + if (pos != 2) { + printf(", "); + pos += 2; + } + printf(cmdtp->name); + pos += len; + } + } + if (!first) + printf("\n"); +} + +static void list_commands(int verbose) +{ + putchar('\n'); + list_group(verbose, "Information", CMD_GRP_INFO); + list_group(verbose, "Boot", CMD_GRP_BOOT); + list_group(verbose, "Partition", CMD_GRP_PART); + list_group(verbose, "Environment", CMD_GRP_ENV); + list_group(verbose, "File", CMD_GRP_FILE); + list_group(verbose, "Scripting", CMD_GRP_SCRIPT); + list_group(verbose, "Network", CMD_GRP_NET); + list_group(verbose, "Console", CMD_GRP_CONSOLE); + list_group(verbose, "Memory", CMD_GRP_MEM); + list_group(verbose, "Hardware manipulation", CMD_GRP_HWMANIP); + list_group(verbose, "Miscellaneous", CMD_GRP_MISC); + list_group(verbose, "Ungrouped", 0); + printf("Use 'help COMMAND' for more details.\n\n"); +} + + /* * Use puts() instead of printf() to avoid printf buffer overflow * for long help messages @@ -28,47 +88,63 @@ static int do_help(int argc, char *argv[]) { struct command *cmdtp; - int max_length = 0; + int opt, verbose = 0, all = 0; - if (argc == 1) { /* show list of commands */ - for_each_command(cmdtp) - if(strlen(cmdtp->name) > max_length) - max_length = strlen(cmdtp->name); - - for_each_command(cmdtp) { - if (!cmdtp->usage) - continue; - printf("%*s - %s\n", max_length, cmdtp->name, cmdtp->usage); + while ((opt = getopt(argc, argv, "va")) > 0) { + switch (opt) { + case 'v': + verbose = 1; + break; + case 'a': + all = 1; + break; } + } + + if (all) { + for_each_command(cmdtp) + barebox_cmd_usage(cmdtp); return 0; } + if (optind == argc) { /* show list of commands */ + list_commands(verbose); + return 0; + } + + /* command help (long version) */ - if ((cmdtp = find_cmd(argv[1])) != NULL) { + if ((cmdtp = find_cmd(argv[optind])) != NULL) { barebox_cmd_usage(cmdtp); return 0; } else { printf ("Unknown command '%s' - try 'help'" " without arguments for list of all" - " known commands\n\n", argv[1] + " known commands\n\n", argv[optind] ); return 1; } } -static const __maybe_unused char cmd_help_help[] = -"Show help information (for 'command')\n" -"'help' prints online help for the monitor commands.\n\n" -"Without arguments, it prints a short usage message for all commands.\n\n" -"To get detailed help information for specific commands you can type\n" -"'help' with one or more command names as arguments.\n"; + +BAREBOX_CMD_HELP_START(help) +BAREBOX_CMD_HELP_TEXT("Without arguments, lists all all commands. With an argument, print help") +BAREBOX_CMD_HELP_TEXT("about the specified command. If the argument is 'all', then output help") +BAREBOX_CMD_HELP_TEXT("for all commands.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-a", "output help on all commands") +BAREBOX_CMD_HELP_OPT ("-v", "verbose") +BAREBOX_CMD_HELP_END static const char *help_aliases[] = { "?", NULL}; BAREBOX_CMD_START(help) .cmd = do_help, .aliases = help_aliases, - .usage = "print online help", + BAREBOX_CMD_DESC("print online help") + BAREBOX_CMD_OPTS("[-v] [COMMAND]") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_HELP(cmd_help_help) BAREBOX_CMD_COMPLETE(command_complete) BAREBOX_CMD_END diff --git a/commands/i2c.c b/commands/i2c.c index 626255d61..2811f6abe 100644 --- a/commands/i2c.c +++ b/commands/i2c.c @@ -56,13 +56,15 @@ static int do_i2c_probe(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_i2c_probe_help[] = -"Usage: i2c_probe bus 0xstartaddr 0xstopaddr\n" -"probe a range of i2c addresses.\n"; +BAREBOX_CMD_HELP_START(i2c_probe) +BAREBOX_CMD_HELP_TEXT("Probe the i2c bus BUS, address range from START to END for devices.") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(i2c_probe) .cmd = do_i2c_probe, - .usage = "probe for an i2c device", + BAREBOX_CMD_DESC("probe for an i2c device") + BAREBOX_CMD_OPTS("BUS START END") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_i2c_probe_help) BAREBOX_CMD_END @@ -129,17 +131,20 @@ out: return ret; } -static const __maybe_unused char cmd_i2c_write_help[] = -"Usage: i2c_write [OPTION] ... hexdatas\n" -"write to i2c device.\n" -" -a 0x i2c device address\n" -" -b i2c bus number (default = 0)\n" -" -r 0x start register\n" -" -w use 16bit-wide address access\n"; +BAREBOX_CMD_HELP_START(i2c_write) +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-b BUS\t", "i2c bus number (default 0)") +BAREBOX_CMD_HELP_OPT ("-a ADDR\t", "i2c device address") +BAREBOX_CMD_HELP_OPT ("-r START", "start register") +BAREBOX_CMD_HELP_OPT ("-w\t", "use word (16 bit) wide access") +BAREBOX_CMD_HELP_OPT ("-v\t", "verbose") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(i2c_write) .cmd = do_i2c_write, - .usage = "write to an i2c device", + BAREBOX_CMD_DESC("write to an i2c device") + BAREBOX_CMD_OPTS("[-barwv] DATA...") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_i2c_write_help) BAREBOX_CMD_END @@ -202,17 +207,21 @@ static int do_i2c_read(int argc, char *argv[]) return ret; } -static const __maybe_unused char cmd_i2c_read_help[] = -"Usage: i2c_read [OPTION]\n" -"read i2c device.\n" -" -a 0x i2c device address\n" -" -b i2c bus number (default = 0)\n" -" -r 0x start register\n" -" -w use 16bit-wide address access\n" -" -c byte count\n"; +BAREBOX_CMD_HELP_START(i2c_read) +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-b BUS\t", "i2c bus number (default 0)") +BAREBOX_CMD_HELP_OPT("-a ADDR\t", "i2c device address") +BAREBOX_CMD_HELP_OPT("-r START", "start register") +BAREBOX_CMD_HELP_OPT("-w\t", "use word (16 bit) wide access") +BAREBOX_CMD_HELP_OPT("-c COUNT", "byte count") +BAREBOX_CMD_HELP_OPT("-v\t", "verbose") +BAREBOX_CMD_HELP_END + BAREBOX_CMD_START(i2c_read) .cmd = do_i2c_read, - .usage = "read from an i2c device", + BAREBOX_CMD_DESC("read from an i2c device") + BAREBOX_CMD_OPTS("[-bacrwv] DATA...") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_i2c_read_help) BAREBOX_CMD_END diff --git a/commands/insmod.c b/commands/insmod.c index f547e9dd6..176437ee7 100644 --- a/commands/insmod.c +++ b/commands/insmod.c @@ -32,11 +32,9 @@ static int do_insmod(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_insmod_help[] = -"Usage: insmod \n"; - BAREBOX_CMD_START(insmod) .cmd = do_insmod, - .usage = "insert a module", - BAREBOX_CMD_HELP(cmd_insmod_help) + BAREBOX_CMD_DESC("load a barebox module") + BAREBOX_CMD_OPTS("[MODULE]") + BAREBOX_CMD_GROUP(CMD_GRP_MISC) BAREBOX_CMD_END diff --git a/commands/iomemport.c b/commands/iomemport.c index 652708c9c..5294c13b8 100644 --- a/commands/iomemport.c +++ b/commands/iomemport.c @@ -49,7 +49,8 @@ static int do_iomem(int argc, char *argv[]) BAREBOX_CMD_START(iomem) .cmd = do_iomem, - .usage = "show iomem usage", + BAREBOX_CMD_DESC("show IO memory usage") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_END #if IO_SPACE_LIMIT > 0 @@ -62,6 +63,7 @@ static int do_ioport(int argc, char *argv[]) BAREBOX_CMD_START(ioport) .cmd = do_ioport, - .usage = "show ioport usage", + BAREBOX_CMD_DESC("show IO port usage") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_END #endif diff --git a/commands/led.c b/commands/led.c index a4f117bff..62c72a331 100644 --- a/commands/led.c +++ b/commands/led.c @@ -80,13 +80,17 @@ is allowed. */ BAREBOX_CMD_HELP_START(led) -BAREBOX_CMD_HELP_USAGE("led \n") -BAREBOX_CMD_HELP_SHORT("control the value of a LED. a value of 0 means disabled\n") -BAREBOX_CMD_HELP_SHORT("without arguments the available LEDs are listed\n") +BAREBOX_CMD_HELP_TEXT("Control the value of a LED. The exact meaning of VALUE is unspecified,") +BAREBOX_CMD_HELP_TEXT("it can be a brightness, or a color. Most often a value of '1' means on") +BAREBOX_CMD_HELP_TEXT("and '0' means off.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Without arguments the available LEDs are listed.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(led) .cmd = do_led, - .usage = "led ", + BAREBOX_CMD_DESC("control LEDs") + BAREBOX_CMD_OPTS("LED VALUE") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_led_help) BAREBOX_CMD_END diff --git a/commands/let.c b/commands/let.c index 644ede5e2..3c84d276c 100644 --- a/commands/let.c +++ b/commands/let.c @@ -63,31 +63,31 @@ static int do_let(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(let) -BAREBOX_CMD_HELP_USAGE("let expr [expr ...]\n") -BAREBOX_CMD_HELP_SHORT("evaluate arithmetic expressions\n") -BAREBOX_CMD_HELP_TEXT ("supported operations are in order of decreasing precedence:\n") -BAREBOX_CMD_HELP_TEXT (" X++, X--\n") -BAREBOX_CMD_HELP_TEXT (" ++X, --X\n") -BAREBOX_CMD_HELP_TEXT (" +X, -X\n") -BAREBOX_CMD_HELP_TEXT (" !X, ~X\n") -BAREBOX_CMD_HELP_TEXT (" X**Y\n") -BAREBOX_CMD_HELP_TEXT (" X*Y, X/Y, X%Y\n") -BAREBOX_CMD_HELP_TEXT (" X+Y, X-Y\n") -BAREBOX_CMD_HELP_TEXT (" X<>Y\n") -BAREBOX_CMD_HELP_TEXT (" X=Y, X>Y\n") -BAREBOX_CMD_HELP_TEXT (" X==Y, X!=Y\n") -BAREBOX_CMD_HELP_TEXT (" X&Y\n") -BAREBOX_CMD_HELP_TEXT (" X^Y\n") -BAREBOX_CMD_HELP_TEXT (" X|Y\n") -BAREBOX_CMD_HELP_TEXT (" X&&Y\n") -BAREBOX_CMD_HELP_TEXT (" X||Y\n") -BAREBOX_CMD_HELP_TEXT (" X?Y:Z\n") -BAREBOX_CMD_HELP_TEXT (" X*=Y, X/=Y, X%=Y\n") -BAREBOX_CMD_HELP_TEXT (" X=Y, X&=Y, X|=Y, X^=Y, X+=Y, X-=Y, X<<=Y, X>>=Y\n") +BAREBOX_CMD_HELP_TEXT ("Supported operations are in order of decreasing precedence:") +BAREBOX_CMD_HELP_TEXT (" X++, X--") +BAREBOX_CMD_HELP_TEXT (" ++X, --X") +BAREBOX_CMD_HELP_TEXT (" +X, -X") +BAREBOX_CMD_HELP_TEXT (" !X, ~X") +BAREBOX_CMD_HELP_TEXT (" X**Y") +BAREBOX_CMD_HELP_TEXT (" X*Y, X/Y, X%Y") +BAREBOX_CMD_HELP_TEXT (" X+Y, X-Y") +BAREBOX_CMD_HELP_TEXT (" X<>Y") +BAREBOX_CMD_HELP_TEXT (" X=Y, X>Y") +BAREBOX_CMD_HELP_TEXT (" X==Y, X!=Y") +BAREBOX_CMD_HELP_TEXT (" X&Y") +BAREBOX_CMD_HELP_TEXT (" X^Y") +BAREBOX_CMD_HELP_TEXT (" X|Y") +BAREBOX_CMD_HELP_TEXT (" X&&Y") +BAREBOX_CMD_HELP_TEXT (" X||Y") +BAREBOX_CMD_HELP_TEXT (" X?Y:Z") +BAREBOX_CMD_HELP_TEXT (" X*=Y, X/=Y, X%=Y") +BAREBOX_CMD_HELP_TEXT (" X=Y, X&=Y, X|=Y, X^=Y, X+=Y, X-=Y, X<<=Y, X>>=Y") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(let) .cmd = do_let, - .usage = "evaluate arithmetic expressions", + BAREBOX_CMD_DESC("evaluate arithmetic expressions") + BAREBOX_CMD_OPTS("EXPR [EXPR ...]") + BAREBOX_CMD_GROUP(CMD_GRP_SCRIPT) BAREBOX_CMD_HELP(cmd_let_help) BAREBOX_CMD_END diff --git a/commands/linux16.c b/commands/linux16.c index 30fa2de7d..65814f4ce 100644 --- a/commands/linux16.c +++ b/commands/linux16.c @@ -318,9 +318,16 @@ on_error: } BAREBOX_CMD_HELP_START(linux16) -BAREBOX_CMD_HELP_USAGE("linux16 [-v ]\n") -BAREBOX_CMD_HELP_SHORT("Boot a kernel on x86 via real mode code.\n") -BAREBOX_CMD_HELP_OPT ("-v ", "VESA video mode number or 'ask'\n") +BAREBOX_CMD_HELP_TEXT("Load kernel from FILE and boot on x86 in real-mode.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Only kernel images in bzImage format are supported by now.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("For the video mode refer the Linux kernel documentation") +BAREBOX_CMD_HELP_TEXT("'Documentation/fb/vesafb.txt' for correct VESA mode numbers. Use 'ask'") +BAREBOX_CMD_HELP_TEXT("instead of a number to make Linux for options..") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-v VESAMODE", "set VESAMODE") BAREBOX_CMD_HELP_END /** @@ -337,7 +344,9 @@ x86_boot_preparation for more info about how to use this command.

BAREBOX_CMD_START(linux16) .cmd = do_linux16, - .usage = "boot a linux kernel", + BAREBOX_CMD_DESC("boot a linux kernel on x86 via real-mode code") + BAREBOX_CMD_OPTS("[-v VESAMODE] FILE") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_HELP(cmd_linux16_help) BAREBOX_CMD_END diff --git a/commands/linux_exec.c b/commands/linux_exec.c index ef00ee780..741168a82 100644 --- a/commands/linux_exec.c +++ b/commands/linux_exec.c @@ -45,13 +45,9 @@ static int do_linux_exec(int argc, char *argv[]) return 0; } -BAREBOX_CMD_HELP_START(linux_exec) -BAREBOX_CMD_HELP_USAGE("linux_exec ...\n") -BAREBOX_CMD_HELP_SHORT("Execute a command on the host\n") -BAREBOX_CMD_HELP_END - BAREBOX_CMD_START(linux_exec) .cmd = do_linux_exec, - .usage = "Execute a command on the host", - BAREBOX_CMD_HELP(cmd_linux_exec_help) + BAREBOX_CMD_DESC("execute a command on the host") + BAREBOX_CMD_OPTS("COMMAND") + BAREBOX_CMD_GROUP(CMD_GRP_MISC) BAREBOX_CMD_END diff --git a/commands/ln.c b/commands/ln.c index 0237447ae..28e524e91 100644 --- a/commands/ln.c +++ b/commands/ln.c @@ -39,13 +39,9 @@ static int do_ln(int argc, char *argv[]) return 0; } -BAREBOX_CMD_HELP_START(ln) -BAREBOX_CMD_HELP_USAGE("ln SRC DEST\n") -BAREBOX_CMD_HELP_SHORT("symlink - make a new name for a file\n") -BAREBOX_CMD_HELP_END - BAREBOX_CMD_START(ln) .cmd = do_ln, - .usage = "symlink - make a new name for a file", - BAREBOX_CMD_HELP(cmd_ln_help) + BAREBOX_CMD_DESC("create symlink (make a new name for a file)") + BAREBOX_CMD_OPTS("SRC DEST") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_END diff --git a/commands/loadb.c b/commands/loadb.c index b527e0095..28eebf45c 100644 --- a/commands/loadb.c +++ b/commands/loadb.c @@ -698,15 +698,19 @@ static int do_load_serial_bin(int argc, char *argv[]) return rcode; } -static const __maybe_unused char cmd_loadb_help[] = - "[OPTIONS]\n" - " -f file - where to download to - defaults to " DEF_FILE "\n" - " -o offset - what offset to download - defaults to 0\n" - " -b baud - baudrate at which to download - defaults to " - "console baudrate\n" - " -c - Create file if it is not present - default disabled"; +BAREBOX_CMD_HELP_START(loadb) +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-f FILE", "download to FILE (default " DEF_FILE ")") +BAREBOX_CMD_HELP_OPT("-o OFFS", "destination file OFFSet (default 0)") +BAREBOX_CMD_HELP_OPT("-b BAUD", "baudrate for download (default: console baudrate") +BAREBOX_CMD_HELP_OPT("-c", "create file if not present") +BAREBOX_CMD_HELP_END + BAREBOX_CMD_START(loadb) .cmd = do_load_serial_bin, - .usage = "Load binary file over serial line (kermit mode)", + BAREBOX_CMD_DESC("load binary file over serial line (Kermit)") + BAREBOX_CMD_OPTS(" FILE") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_HELP(cmd_loadb_help) BAREBOX_CMD_END diff --git a/commands/loadenv.c b/commands/loadenv.c index a39ca8cf6..ba9261339 100644 --- a/commands/loadenv.c +++ b/commands/loadenv.c @@ -103,11 +103,13 @@ static int do_loadenv(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(loadenv) -BAREBOX_CMD_HELP_USAGE("loadenv OPTIONS [ENVFS] [DIRECTORY]\n") -BAREBOX_CMD_HELP_OPT("-n", "do not overwrite existing files\n") -BAREBOX_CMD_HELP_OPT("-s", "scrub old environment\n") -BAREBOX_CMD_HELP_OPT("-d", "load default environment\n") -BAREBOX_CMD_HELP_SHORT("Load environment from ENVFS into DIRECTORY (default: /dev/env0 -> /env).\n") +BAREBOX_CMD_HELP_TEXT("Load environment from files in ENVFS (default /dev/env0) in") +BAREBOX_CMD_HELP_TEXT("DIRECTORY (default /env") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-n", "do not overwrite existing files") +BAREBOX_CMD_HELP_OPT("-s", "scrub old environment") +BAREBOX_CMD_HELP_OPT("-d", "load default environment") BAREBOX_CMD_HELP_END /** @@ -121,6 +123,8 @@ ENVFS can only handle files, directories are skipped silently. BAREBOX_CMD_START(loadenv) .cmd = do_loadenv, - .usage = "Load environment from ENVFS into DIRECTORY (default: /dev/env0 -> /env).", + BAREBOX_CMD_DESC("load environment from ENVFS") + BAREBOX_CMD_OPTS("{-nsd] [ENVFS] [DIRECTORY]") + BAREBOX_CMD_GROUP(CMD_GRP_ENV) BAREBOX_CMD_HELP(cmd_loadenv_help) BAREBOX_CMD_END diff --git a/commands/loads.c b/commands/loads.c index 58cd24b57..24093e191 100644 --- a/commands/loads.c +++ b/commands/loads.c @@ -270,13 +270,15 @@ static int write_record(char *buf) } #endif /* CONFIG_CMD_SAVES */ -static const __maybe_unused char cmd_loads_help[] = - "[ off ]\n" - " - load S-Record file over serial line with offset 'off'\n"; +BAREBOX_CMD_HELP_START(loads) +BAREBOX_CMD_HELP_TEXT("Load S-Record file over serial line with offset OFFS.") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(loads) .cmd = do_load_serial, - .usage = "load S-Record file over serial line", + BAREBOX_CMD_DESC("load binary file over serial line (S-Records)") + BAREBOX_CMD_OPTS("OFFS") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_HELP(cmd_loads_help) BAREBOX_CMD_END @@ -285,14 +287,15 @@ BAREBOX_CMD_END */ #ifdef CONFIG_CMD_SAVES -static const __maybe_unused char cmd_saves_help[] = - "[ off ] [size]\n" - " - save S-Record file over serial line with offset 'off' " - "and size 'size'\n"; +BAREBOX_CMD_HELP_START(saves) +BAREBOX_CMD_HELP_TEXT("Save S-Record file to serial line with offset OFFS and length LEN.") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(saves) .cmd = do_save_serial, - .usage = "save S-Record file over serial line", + BAREBOX_CMD_DESC("save file over serial line (S-Records)") + BAREBOX_CMD_OPTS("OFFS LEN") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_HELP(cmd_saves_help) BAREBOX_CMD_END #endif /* CONFIG_CMD_SAVES */ diff --git a/commands/loadxy.c b/commands/loadxy.c index 694f0f02b..3044f3711 100644 --- a/commands/loadxy.c +++ b/commands/loadxy.c @@ -140,6 +140,22 @@ static int do_loady(int argc, char *argv[]) return rcode; } +BAREBOX_CMD_HELP_START(loady) +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-g", "use Y-Modem/G (use on lossless tty such as USB)") +BAREBOX_CMD_HELP_OPT("-b BAUD", "baudrate for download (default: console baudrate") +BAREBOX_CMD_HELP_OPT("-t NAME", "console name to use (default: current)") +BAREBOX_CMD_HELP_END + +BAREBOX_CMD_START(loady) + .cmd = do_loady, + BAREBOX_CMD_DESC("load binary file over serial line (Y-Modem)") + BAREBOX_CMD_OPTS("[-gtb]") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) + BAREBOX_CMD_HELP(cmd_loady_help) +BAREBOX_CMD_END + + /** * @brief provide the loadx(X-Modem) support * @@ -184,7 +200,7 @@ static int do_loadx(int argc, char *argv[]) else cdev = console_get_first_active(); if (!cdev) { - printf("%s:No console device %s with STDIN and STDOUT\n", + printf("%s:No console device %s with STDIN and STDOUT", argv[0], cname ? cname : "default"); return -ENODEV; } @@ -224,30 +240,19 @@ static int do_loadx(int argc, char *argv[]) return rcode; } -static const __maybe_unused char cmd_loadx_help[] = - "[OPTIONS]\n" - " -f file - where to download to - defaults to " DEF_FILE "\n" - " -o offset - what offset to download - defaults to 0\n" - " -t name - console device name to use - defaults to current console\n" - " -b baud - baudrate at which to download - defaults to console baudrate\n" - " -c - Create file if it is not present - default disabled"; +BAREBOX_CMD_HELP_START(loadx) +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-f FILE", "download to FILE (default " DEF_FILE ")") +BAREBOX_CMD_HELP_OPT("-o OFFS", "destination file OFFSet (default 0)") +BAREBOX_CMD_HELP_OPT("-b BAUD", "baudrate for download (default: console baudrate") +BAREBOX_CMD_HELP_OPT("-t NAME", "console name to use (default: current)") +BAREBOX_CMD_HELP_OPT("-c", "create file if not present") +BAREBOX_CMD_HELP_END -#ifdef CONFIG_CMD_LOADY BAREBOX_CMD_START(loadx) .cmd = do_loadx, - .usage = "Load binary file over serial line (X-Modem)", -BAREBOX_CMD_HELP(cmd_loadx_help) + BAREBOX_CMD_DESC("load binary file over serial line (X-Modem)") + BAREBOX_CMD_OPTS("[-fptbc]") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) + BAREBOX_CMD_HELP(cmd_loadx_help) BAREBOX_CMD_END - -static const __maybe_unused char cmd_loady_help[] = - "[OPTIONS]\n" - " -g - use Y-Modem/G (only for lossless tty as USB)\n" - " -t name - console device name to use - defaults to current console\n" - " -b baud - baudrate at which to download - defaults to console baudrate\n"; - -BAREBOX_CMD_START(loady) - .cmd = do_loady, - .usage = "Load binary file over serial line (Y-Modem or Y-Modem/G)", -BAREBOX_CMD_HELP(cmd_loady_help) -BAREBOX_CMD_END -#endif diff --git a/commands/login.c b/commands/login.c index d9297fa37..210eb203a 100644 --- a/commands/login.c +++ b/commands/login.c @@ -78,15 +78,20 @@ static int do_login(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_login_help[] = -"Usage: login [-t timeout []]\n" -"If a timeout is specified and expired the command will be executed;\n" -"\"boot\" by default\n" -; +BAREBOX_CMD_HELP_START(login) +BAREBOX_CMD_HELP_TEXT("Asks for a password from the console before script execution continues.") +BAREBOX_CMD_HELP_TEXT("The password can be set with the 'passwd' command. Instead of specifying") +BAREBOX_CMD_HELP_TEXT("a TIMEOUT the magic variable 'global.login.timeout' could be set.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-t TIMEOUT", "Execute COMMAND if no login withing TIMEOUT seconds") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(login) .cmd = do_login, - .usage = "login", + BAREBOX_CMD_DESC("ask for a password") + BAREBOX_CMD_OPTS("[-t TIMEOUT] COMMAND") + BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE) BAREBOX_CMD_HELP(cmd_login_help) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/commands/ls.c b/commands/ls.c index f2d990340..344079030 100644 --- a/commands/ls.c +++ b/commands/ls.c @@ -204,13 +204,18 @@ static int do_ls(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(ls) -BAREBOX_CMD_HELP_USAGE("ls [OPTIONS] [FILES]\n") -BAREBOX_CMD_HELP_SHORT("List information about the FILEs (the current directory by default).\n") -BAREBOX_CMD_HELP_OPT ("-R", "list subdirectories recursively\n") +BAREBOX_CMD_HELP_TEXT("List information about the specified files or directories.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-l", "long format") +BAREBOX_CMD_HELP_OPT ("-C", "column format (opposite of long format)") +BAREBOX_CMD_HELP_OPT ("-R", "list subdirectories recursively") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(ls) .cmd = do_ls, - .usage = "list a file or directory", + BAREBOX_CMD_DESC("list a file or directory") + BAREBOX_CMD_OPTS("[-lCR] [FILEDIR...]") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_ls_help) BAREBOX_CMD_END diff --git a/commands/lsmod.c b/commands/lsmod.c index e54eadc2f..711c1c66d 100644 --- a/commands/lsmod.c +++ b/commands/lsmod.c @@ -15,6 +15,7 @@ static int do_lsmod(int argc, char *argv[]) BAREBOX_CMD_START(lsmod) .cmd = do_lsmod, - .usage = "list modules", + BAREBOX_CMD_DESC("list loaded barebox modules") + BAREBOX_CMD_GROUP(CMD_GRP_MISC) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/commands/magicvar.c b/commands/magicvar.c index b208d337d..cf1fe45d9 100644 --- a/commands/magicvar.c +++ b/commands/magicvar.c @@ -1,20 +1,49 @@ #include #include +#include +#include #include static int do_magicvar(int argc, char *argv[]) { struct magicvar *m; + int opt; + int verbose = 0; + + while ((opt = getopt(argc, argv, "v")) > 0) { + switch (opt) { + case 'v': + verbose = 1; + break; + default: + return COMMAND_ERROR_USAGE; + } + } for (m = &__barebox_magicvar_start; m != &__barebox_magicvar_end; - m++) + m++) { printf("%-32s %s\n", m->name, m->description); + if (verbose) { + const char *val = getenv(m->name); + if (val && strlen(val)) + printf(" %s\n", val); + } + } return 0; } + +BAREBOX_CMD_HELP_START(magicvar) +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-v", "verbose (list all value if there is one)") +BAREBOX_CMD_HELP_END + BAREBOX_CMD_START(magicvar) .cmd = do_magicvar, - .usage = "List information about magic variables", + BAREBOX_CMD_DESC("list information about magic variables") + BAREBOX_CMD_OPTS("[-v]") + BAREBOX_CMD_HELP(cmd_magicvar_help) + BAREBOX_CMD_GROUP(CMD_GRP_ENV) BAREBOX_CMD_END diff --git a/commands/md.c b/commands/md.c index 03c5905bb..c1361a6a2 100644 --- a/commands/md.c +++ b/commands/md.c @@ -89,28 +89,28 @@ out: return ret ? 1 : 0; } -static const __maybe_unused char cmd_md_help[] = -"Usage md [OPTIONS] \n" -"display (hexdump) a memory region.\n" -"options:\n" -" -s display file (default /dev/mem)\n" -" -b output in bytes\n" -" -w output in halfwords (16bit)\n" -" -l output in words (32bit)\n" -" -x swap bytes at output\n" -"\n" -"Memory regions:\n" -"Memory regions can be specified in two different forms: start+size\n" -"or start-end, If is omitted it defaults to 0. If end is omitted it\n" -"defaults to the end of the device, except for interactive commands like md\n" -"and mw for which it defaults to 0x100.\n" -"Sizes can be specified as decimal, or if prefixed with 0x as hexadecimal.\n" -"an optional suffix of k, M or G is for kibibytes, Megabytes or Gigabytes,\n" -"respectively\n"; + +BAREBOX_CMD_HELP_START(md) +BAREBOX_CMD_HELP_TEXT("Display (hex dump) a memory region.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-b", "byte access") +BAREBOX_CMD_HELP_OPT ("-w", "word access (16 bit)") +BAREBOX_CMD_HELP_OPT ("-l", "long access (32 bit)") +BAREBOX_CMD_HELP_OPT ("-s FILE", "display file (default /dev/mem)") +BAREBOX_CMD_HELP_OPT ("-x", "swap bytes at output") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Memory regions can be specified in two different forms: START+SIZE") +BAREBOX_CMD_HELP_TEXT("or START-END, If START is omitted it defaults to 0x100") +BAREBOX_CMD_HELP_TEXT("Sizes can be specified as decimal, or if prefixed with 0x as hexadecimal.") +BAREBOX_CMD_HELP_TEXT("An optional suffix of k, M or G is for kbytes, Megabytes or Gigabytes.") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(md) .cmd = do_mem_md, - .usage = "memory display", + BAREBOX_CMD_DESC("memory display") + BAREBOX_CMD_OPTS("[-bwlsx] REGION") + BAREBOX_CMD_GROUP(CMD_GRP_MEM) BAREBOX_CMD_HELP(cmd_md_help) BAREBOX_CMD_END diff --git a/commands/memcmp.c b/commands/memcmp.c index 4a0386254..d04815067 100644 --- a/commands/memcmp.c +++ b/commands/memcmp.c @@ -128,21 +128,24 @@ out: return ret; } -static const __maybe_unused char cmd_memcmp_help[] = -"Usage: memcmp [OPTIONS] \n" -"\n" -"options:\n" -" -b, -w, -l use byte, halfword, or word accesses\n" -" -s source file (default /dev/mem)\n" -" -d destination file (default /dev/mem)\n" -"\n" -"Compare memory regions specified with addr1 and addr2\n" -"of size bytes. If source is a file count can\n" -"be left unspecified in which case the whole file is\n" -"compared\n"; +BAREBOX_CMD_HELP_START(memcmp) +BAREBOX_CMD_HELP_TEXT("Compare memory regions specified with ADDR and ADDR2") +BAREBOX_CMD_HELP_TEXT("of size COUNT bytes. If source is a file COUNT can") +BAREBOX_CMD_HELP_TEXT("be left unspecified, in which case the whole file is") +BAREBOX_CMD_HELP_TEXT("compared.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-b", "byte access") +BAREBOX_CMD_HELP_OPT ("-w", "word access (16 bit)") +BAREBOX_CMD_HELP_OPT ("-l", "long access (32 bit)") +BAREBOX_CMD_HELP_OPT ("-s FILE", "source file (default /dev/mem)") +BAREBOX_CMD_HELP_OPT ("-d FILE", "destination file (default /dev/mem)") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(memcmp) .cmd = do_memcmp, - .usage = "memory compare", + BAREBOX_CMD_DESC("memory compare") + BAREBOX_CMD_OPTS("[-bwlsd] ADDR1 ADDR2 COUNT") + BAREBOX_CMD_GROUP(CMD_GRP_MEM) BAREBOX_CMD_HELP(cmd_memcmp_help) BAREBOX_CMD_END diff --git a/commands/memcpy.c b/commands/memcpy.c index 98f099f18..78716b1bb 100644 --- a/commands/memcpy.c +++ b/commands/memcpy.c @@ -128,18 +128,21 @@ out: return ret; } -static const __maybe_unused char cmd_memcpy_help[] = -"Usage: memcpy [OPTIONS] \n" -"\n" -"options:\n" -" -b, -w, -l use byte, halfword, or word accesses\n" -" -s source file (default /dev/mem)\n" -" -d destination file (default /dev/mem)\n" -"\n" -"Copy memory at of bytes to \n"; +BAREBOX_CMD_HELP_START(memcpy) +BAREBOX_CMD_HELP_TEXT("Copy memory at SRC of COUNT bytes to DEST") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-b", "byte access") +BAREBOX_CMD_HELP_OPT ("-w", "word access (16 bit)") +BAREBOX_CMD_HELP_OPT ("-l", "long access (32 bit)") +BAREBOX_CMD_HELP_OPT ("-s FILE", "source file (default /dev/mem)") +BAREBOX_CMD_HELP_OPT ("-d FILE", "write file (default /dev/mem)") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(memcpy) .cmd = do_memcpy, - .usage = "memory copy", + BAREBOX_CMD_DESC("memory copy") + BAREBOX_CMD_OPTS("[-bwlsd] SRC DEST COUNT") + BAREBOX_CMD_GROUP(CMD_GRP_MEM) BAREBOX_CMD_HELP(cmd_memcpy_help) BAREBOX_CMD_END diff --git a/commands/meminfo.c b/commands/meminfo.c index 6e1e8c367..87c76fc3d 100644 --- a/commands/meminfo.c +++ b/commands/meminfo.c @@ -30,6 +30,7 @@ static int do_meminfo(int argc, char *argv[]) BAREBOX_CMD_START(meminfo) .cmd = do_meminfo, - .usage = "print info about memory usage", + BAREBOX_CMD_DESC("print info about memory usage") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/commands/memset.c b/commands/memset.c index 48e55bc68..f86930624 100644 --- a/commands/memset.c +++ b/commands/memset.c @@ -85,17 +85,20 @@ out: return ret; } -static const __maybe_unused char cmd_memset_help[] = -"Usage: memset [OPTIONS] \n" -"\n" -"options:\n" -" -b, -w, -l use byte, halfword, or word accesses\n" -" -d destination file (default /dev/mem)\n" -"\n" -"Fill the first bytes at offset with byte \n"; +BAREBOX_CMD_HELP_START(memset) +BAREBOX_CMD_HELP_TEXT("Fills the first COUNT bytes at offset ADDR with byte DATA,") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-b", "byte access") +BAREBOX_CMD_HELP_OPT ("-w", "word access (16 bit)") +BAREBOX_CMD_HELP_OPT ("-l", "long access (32 bit)") +BAREBOX_CMD_HELP_OPT ("-d FILE", "write file (default /dev/mem)") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(memset) .cmd = do_memset, - .usage = "memory fill", + BAREBOX_CMD_DESC("memory fill") + BAREBOX_CMD_OPTS("[-bwld] ADDR COUNT DATA") + BAREBOX_CMD_GROUP(CMD_GRP_MEM) BAREBOX_CMD_HELP(cmd_memset_help) BAREBOX_CMD_END diff --git a/commands/memtest.c b/commands/memtest.c index 585437596..c1ffc64ee 100644 --- a/commands/memtest.c +++ b/commands/memtest.c @@ -230,14 +230,17 @@ out: return 0; } -static const __maybe_unused char cmd_memtest_help[] = -"Usage: memtest [OPTION]...\n" -"memtest related commands\n" -" -i iterations [default=1, endless=0].\n" -" -b perform only a test on buslines."; + +BAREBOX_CMD_HELP_START(memtest) +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-i ITERATIONS", "perform number of iterations (default 1, 0 is endless)") +BAREBOX_CMD_HELP_OPT("-b", "perform only a test on bus lines") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(memtest) .cmd = do_memtest, - .usage = "Memory Test", + BAREBOX_CMD_DESC("extensive memory test") + BAREBOX_CMD_OPTS("[-ib]") + BAREBOX_CMD_GROUP(CMD_GRP_MEM) BAREBOX_CMD_HELP(cmd_memtest_help) BAREBOX_CMD_END diff --git a/commands/menu.c b/commands/menu.c index 9b96942a3..2008aa5e9 100644 --- a/commands/menu.c +++ b/commands/menu.c @@ -407,70 +407,67 @@ end: } static const __maybe_unused char cmd_menu_help[] = -"Usage: menu [OPTION]... \n" -"Manage Menu\n" +"Manage Menu:\n" " -m menu\n" " -l list\n" " -s show\n" #if defined(CONFIG_CMD_MENU_MANAGEMENT) -"Advanced\n" +"Advanced menu management:\n" " -e menu entry\n" " -a add\n" " -r remove\n" " -S select\n" #endif "\n" -"How to\n" -"\n" -"Show menu\n" +"Show menu:\n" " (-A auto select delay)\n" " (-d auto select description)\n" -" menu -s -m [-A delay] [-d auto_display]\n" +" menu -s -m MENU [-A delay] [-d auto_display]\n" "\n" -"List menu\n" +"List menu:\n" " menu -l\n" "\n" #if defined(CONFIG_CMD_MENU_MANAGEMENT) -"Add a menu\n" -" menu -a -m -d \n" +"Add a menu:\n" +" menu -a -m NAME -d DESC\n" "\n" -"Remove a menu\n" -" menu -r -m \n" +"Remove a menu:\n" +" menu -r -m NAME\n" "\n" -"Add an entry\n" +"Add an entry:\n" " (-R for do no exit the menu after executing the command)\n" " (-b for box style 1 for selected)\n" " (and optional -c for the command to run when we change the state)\n" -" menu -e -a -m -c [-R] [-b 0|1] -d \n" +" menu -e -a -m MENU -c COMMAND [-R] [-b 0|1] -d DESC\n" -"Add a submenu entry\n" +"Add a submenu entry:\n" " (-R is not needed)\n" " (-b for box style 1 for selected)\n" " (and -c is not needed)\n" -" menu -e -a -m -u submenu -d [-b 0|1] \n" +" menu -e -a -m MENU -u submenu -d [-b 0|1] DESC\n" "\n" -"Remove an entry\n" -" menu -e -r -m -n \n" +"Remove an entry:\n" +" menu -e -r -m NAME -n ENTRY\n" "\n" -"Select an entry\n" -" menu -m -S -n \n" +"Select an entry:\n" +" menu -m -S -n ENTRY\n" "\n" -"List menu\n" +"List menu:\n" " menu -e -l [menu]\n" "\n" -"Menu example\n" -"menu -a -m boot -d \"Boot Menu\"\n" -"menu -e -a -m boot -c boot -d \"Boot\"\n" -"menu -e -a -m boot -c reset -d \"Reset\"\n" -"menu -s -m boot\n" +"Menu examples:\n" +" menu -a -m boot -d \"Boot Menu\"\n" +" menu -e -a -m boot -c boot -d \"Boot\"\n" +" menu -e -a -m boot -c reset -d \"Reset\"\n" #else -"Menu example\n" -"menu -s -m boot\n" +"Menu example:\n" #endif +" menu -s -m boot\n" ; BAREBOX_CMD_START(menu) .cmd = do_menu, - .usage = "Menu Management", + BAREBOX_CMD_DESC("create and display menus") + BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE) BAREBOX_CMD_HELP(cmd_menu_help) BAREBOX_CMD_END diff --git a/commands/menutree.c b/commands/menutree.c index 3b1a26358..5d30b67ee 100644 --- a/commands/menutree.c +++ b/commands/menutree.c @@ -32,29 +32,28 @@ static int do_menutree(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(menutree) -BAREBOX_CMD_HELP_USAGE("menutree [OPTIONS]\n") -"\n" -"Create a menu from a directory structure\n" -"Each menu entry is described by a subdirectory. Each subdirectory\n" -"can contain the following files which further describe the entry:\n" -"\n" -"title - A file containing the title of the entry as shown in the menu\n" -"box - If present, the entry is a 'bool' entry. The file contains a variable\n" -" name from which the current state of the bool is taken from and saved\n" -" to.\n" -"action - if present this file contains a shell script which is executed when\n" -" when the entry is selected.\n" -"If neither 'box' or 'action' are present this entry is considered a submenu\n" -"containing more entries.\n" -"\n" -"Options:\n" -" -m directory where the menu starts (/env/menu)\n" - +BAREBOX_CMD_HELP_TEXT("Each menu entry is described by a subdirectory. Each subdirectory") +BAREBOX_CMD_HELP_TEXT("can contain the following files which further describe the entry:") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("title A file containing the title of the entry as shown in the menu") +BAREBOX_CMD_HELP_TEXT("box If present, the entry is a 'bool' entry. The file contains a") +BAREBOX_CMD_HELP_TEXT(" name from which the current state of the bool is taken from and saved") +BAREBOX_CMD_HELP_TEXT(" to.") +BAREBOX_CMD_HELP_TEXT("action if present this file contains a shell script which is executed when") +BAREBOX_CMD_HELP_TEXT(" when the entry is selected.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("If neither 'box' or 'action' are present, this entry is considered a submenu") +BAREBOX_CMD_HELP_TEXT("containing more entries.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-m DIR", "directory where the menu starts (Default: /env/menu)") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(menutree) .cmd = do_menutree, - .usage = "create a menu from a directory structure", + BAREBOX_CMD_DESC("create menu from directory structure") + BAREBOX_CMD_OPTS("[-m] DIR") + BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE) BAREBOX_CMD_HELP(cmd_menutree_help) BAREBOX_CMD_END diff --git a/commands/miitool.c b/commands/miitool.c index 1e5d4eb66..5a5278d34 100644 --- a/commands/miitool.c +++ b/commands/miitool.c @@ -285,8 +285,12 @@ static int do_miitool(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(miitool) -BAREBOX_CMD_HELP_USAGE("miitool [[[-v] -v] -v] \n") -BAREBOX_CMD_HELP_SHORT("view status for MII .\n") +BAREBOX_CMD_HELP_TEXT("This utility checks or sets the status of a network interface's") +BAREBOX_CMD_HELP_TEXT("Media Independent Interface (MII) unit. Most fast ethernet") +BAREBOX_CMD_HELP_TEXT("adapters use an MII to autonegotiate link speed and duplex setting.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-v", "increase verbosity") BAREBOX_CMD_HELP_END /** @@ -297,6 +301,8 @@ adapters use an MII to autonegotiate link speed and duplex setting. */ BAREBOX_CMD_START(miitool) .cmd = do_miitool, - .usage = "view media-independent interface status", + BAREBOX_CMD_DESC("view media-independent interface status") + BAREBOX_CMD_OPTS("[-v] PHY") + BAREBOX_CMD_GROUP(CMD_GRP_NET) BAREBOX_CMD_HELP(cmd_miitool_help) BAREBOX_CMD_END diff --git a/commands/mkdir.c b/commands/mkdir.c index 55df37937..1f978869a 100644 --- a/commands/mkdir.c +++ b/commands/mkdir.c @@ -59,12 +59,17 @@ static int do_mkdir(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_mkdir_help[] = -"Usage: mkdir [directories]\n" -"Create new directories\n"; +BAREBOX_CMD_HELP_START(mkdir) +BAREBOX_CMD_HELP_TEXT("Create new directories") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-p", "make parent directories as needed") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(mkdir) .cmd = do_mkdir, - .usage = "make directories", + BAREBOX_CMD_DESC("make directories") + BAREBOX_CMD_OPTS("[DIRECTORY ...]") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_mkdir_help) BAREBOX_CMD_END diff --git a/commands/mm.c b/commands/mm.c index f51fd27cb..ff2e74667 100644 --- a/commands/mm.c +++ b/commands/mm.c @@ -103,15 +103,21 @@ out_write: return 1; } -static const __maybe_unused char cmd_mm_help[] = -"Usage: mm [OPTIONS] \n" -"set/clear bits specified with in to \n" -"options:\n" -" -b, -w, -l use byte, halfword, or word accesses\n" -" -d write file (default /dev/mem)\n"; +BAREBOX_CMD_HELP_START(mm) +BAREBOX_CMD_HELP_TEXT("Set/clear bits specified with MASK in ADDR to VALUE") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-b", "byte access") +BAREBOX_CMD_HELP_OPT ("-w", "word access (16 bit)") +BAREBOX_CMD_HELP_OPT ("-l", "long access (32 bit)") +BAREBOX_CMD_HELP_OPT ("-d FILE", "write file (default /dev/mem)") +BAREBOX_CMD_HELP_END + BAREBOX_CMD_START(mm) .cmd = do_mem_mm, - .usage = "memory modify write with mask", + BAREBOX_CMD_DESC("memory modify with mask") + BAREBOX_CMD_OPTS("[-bwld] ADDR VAL MASK") + BAREBOX_CMD_GROUP(CMD_GRP_MEM) BAREBOX_CMD_HELP(cmd_mm_help) BAREBOX_CMD_END diff --git a/commands/mount.c b/commands/mount.c index 8629bacf4..7aa155edb 100644 --- a/commands/mount.c +++ b/commands/mount.c @@ -116,17 +116,18 @@ static int do_mount(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(mount) -BAREBOX_CMD_HELP_USAGE("mount [[OPTIONS] [mountpoint]]\n") -BAREBOX_CMD_HELP_OPT("-t ", "specify filesystem type\n") -BAREBOX_CMD_HELP_OPT("-a", "Mount all blockdevices.\n") -BAREBOX_CMD_HELP_OPT("-v", "be more verbose\n") -BAREBOX_CMD_HELP_SHORT("Mount a filesystem of a given type to a mountpoint.\n") -BAREBOX_CMD_HELP_SHORT("If no fstype is specified, try to detect it automatically.\n") -BAREBOX_CMD_HELP_SHORT("If no argument is given, list mounted filesystems.\n") -BAREBOX_CMD_HELP_SHORT("With -a the mount command mounts all block devices whose filesystem\n") -BAREBOX_CMD_HELP_SHORT("can be detected automatically to /mnt/\n") -BAREBOX_CMD_HELP_SHORT("If mountpoint is not given a standard mountpoint of /mnt/devname>\n") -BAREBOX_CMD_HELP_SHORT("is used. This directoy is created automatically if necessary.\n") +BAREBOX_CMD_HELP_TEXT("If no argument is given, list mounted filesystems.") +BAREBOX_CMD_HELP_TEXT("If no FSTYPE is specified, try to detect it automatically.") +BAREBOX_CMD_HELP_TEXT("With -a the mount command mounts all block devices whose filesystem") +BAREBOX_CMD_HELP_TEXT("can be detected automatically to /mnt/PARTNAME") +BAREBOX_CMD_HELP_TEXT("If mountpoint is not given, a standard mountpoint of /mnt/DEVICE") +BAREBOX_CMD_HELP_TEXT("is used. This directoy is created automatically if necessary.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-a\t", "mount all blockdevices") +BAREBOX_CMD_HELP_OPT("-t FSTYPE", "specify filesystem type") +BAREBOX_CMD_HELP_OPT("-o OPTIONS", "set file system OPTIONS") +BAREBOX_CMD_HELP_OPT("-v\t", "verbose") BAREBOX_CMD_HELP_END /** @@ -162,6 +163,8 @@ the filesystem has been unmounted. BAREBOX_CMD_START(mount) .cmd = do_mount, - .usage = "Mount a filesystem of a given type to a mountpoint or list mounted filesystems.", + BAREBOX_CMD_DESC("mount a filesystem or list mounted filesystems") + BAREBOX_CMD_OPTS("[[-atov] [DEVICE] [MOUNTPOINT]]") + BAREBOX_CMD_GROUP(CMD_GRP_PART) BAREBOX_CMD_HELP(cmd_mount_help) BAREBOX_CMD_END diff --git a/commands/msleep.c b/commands/msleep.c index c9fa23cc4..4aee3c394 100644 --- a/commands/msleep.c +++ b/commands/msleep.c @@ -36,5 +36,7 @@ static int do_msleep(int argc, char *argv[]) BAREBOX_CMD_START(msleep) .cmd = do_msleep, - .usage = "delay execution for n milliseconds", + BAREBOX_CMD_DESC("delay execution for n milli-seconds") + BAREBOX_CMD_OPTS("MILLISECONDS") + BAREBOX_CMD_GROUP(CMD_GRP_SCRIPT) BAREBOX_CMD_END diff --git a/commands/mw.c b/commands/mw.c index d7d73a8f4..f0384f643 100644 --- a/commands/mw.c +++ b/commands/mw.c @@ -90,15 +90,20 @@ static int do_mem_mw(int argc, char *argv[]) return ret ? 1 : 0; } -static const __maybe_unused char cmd_mw_help[] = -"Usage: mw [OPTIONS] \n" -"Write value(s) to the specifies region.\n" -"options:\n" -" -b, -w, -l use byte, halfword, or word accesses\n" -" -d write file (default /dev/mem)\n"; +BAREBOX_CMD_HELP_START(mw) +BAREBOX_CMD_HELP_TEXT("Write DATA value(s) to the specified REGION.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-b", "byte access") +BAREBOX_CMD_HELP_OPT ("-w", "word access (16 bit)") +BAREBOX_CMD_HELP_OPT ("-l", "long access (32 bit)") +BAREBOX_CMD_HELP_OPT ("-d FILE", "write file (default /dev/mem)") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(mw) .cmd = do_mem_mw, - .usage = "memory write (fill)", + BAREBOX_CMD_DESC("memory write") + BAREBOX_CMD_OPTS("[-bwld] REGION DATA...") + BAREBOX_CMD_GROUP(CMD_GRP_MEM) BAREBOX_CMD_HELP(cmd_mw_help) BAREBOX_CMD_END diff --git a/commands/nand.c b/commands/nand.c index 39fb64ef1..ad1c8c9b3 100644 --- a/commands/nand.c +++ b/commands/nand.c @@ -100,15 +100,17 @@ static int do_nand(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_nand_help[] = -"Usage: nand [OPTION]...\n" -"nand related commands\n" -" -a register a bad block aware device ontop of a normal nand device\n" -" -d deregister a bad block aware device\n" -" -b mark block at offset ofs as bad\n"; +BAREBOX_CMD_HELP_START(nand) +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-a", "register a bad block aware device ontop of a normal NAND device") +BAREBOX_CMD_HELP_OPT ("-d", "deregister a bad block aware device") +BAREBOX_CMD_HELP_OPT ("-b OFFS", "mark block at OFFSet as bad") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(nand) .cmd = do_nand, - .usage = "NAND specific handling", + BAREBOX_CMD_DESC("NAND flash handling") + BAREBOX_CMD_OPTS("[-adb] NANDDEV") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_nand_help) BAREBOX_CMD_END diff --git a/commands/nandtest.c b/commands/nandtest.c index 373ee2c5d..ee7725d47 100644 --- a/commands/nandtest.c +++ b/commands/nandtest.c @@ -336,18 +336,20 @@ err: return 1; } -/* String for usage of nandtest */ -static const __maybe_unused char cmd_nandtest_help[] = -"Usage: nandtest [OPTION] \n" - " -t, Really do a nandtest on device.\n" - " -m, Mark blocks bad if they appear so.\n" - " -s , Supply random seed.\n" - " -i , Number of iterations.\n" - " -o , Start offset on flash.\n" - " -l , Length of flash to test.\n"; +BAREBOX_CMD_HELP_START(nandtest) +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-t", "Really do a nandtest on device") +BAREBOX_CMD_HELP_OPT ("-m", "Mark blocks bad if they appear so") +BAREBOX_CMD_HELP_OPT ("-s SEED", "supply random seed") +BAREBOX_CMD_HELP_OPT ("-i ITERATIONS", "nNumber of iterations") +BAREBOX_CMD_HELP_OPT ("-o OFFS", "start offset on flash") +BAREBOX_CMD_HELP_OPT ("-l LEN", "length of flash to test") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(nandtest) .cmd = do_nandtest, - .usage = "NAND Test", + BAREBOX_CMD_DESC("NAND flash memory test") + BAREBOX_CMD_OPTS("[-tmsiol] NANDDEVICE") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_nandtest_help) BAREBOX_CMD_END diff --git a/commands/net.c b/commands/net.c index 49ffeccf4..7508c992f 100644 --- a/commands/net.c +++ b/commands/net.c @@ -57,13 +57,11 @@ static int do_ethact(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_ethact_help[] = -"Usage: ethact [ethx]\n"; - BAREBOX_CMD_START(ethact) .cmd = do_ethact, - .usage = "set current ethernet device", - BAREBOX_CMD_HELP(cmd_ethact_help) + BAREBOX_CMD_DESC("get or set current ethernet device") + BAREBOX_CMD_OPTS("[ETHX]") + BAREBOX_CMD_GROUP(CMD_GRP_NET) BAREBOX_CMD_COMPLETE(eth_complete) BAREBOX_CMD_END diff --git a/commands/of_dump.c b/commands/of_dump.c new file mode 100644 index 000000000..e3419427d --- /dev/null +++ b/commands/of_dump.c @@ -0,0 +1,108 @@ +/* + * of_dump.c - dump devicetrees to the console + * + * Copyright (c) 2014 Sascha Hauer , Pengutronix + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int do_of_dump(int argc, char *argv[]) +{ + int opt; + int ret; + struct device_node *root = NULL, *node, *of_free = NULL; + char *dtbfile = NULL; + size_t size; + const char *nodename; + + while ((opt = getopt(argc, argv, "f:")) > 0) { + switch (opt) { + case 'f': + dtbfile = optarg; + break; + default: + return COMMAND_ERROR_USAGE; + } + } + + if (optind == argc) + nodename = "/"; + else + nodename = argv[optind]; + + if (dtbfile) { + void *fdt; + + fdt = read_file(dtbfile, &size); + if (!fdt) { + printf("unable to read %s: %s\n", dtbfile, strerror(errno)); + return -errno; + } + + root = of_unflatten_dtb(fdt); + + free(fdt); + + if (IS_ERR(root)) { + ret = PTR_ERR(root); + goto out; + } + + of_free = root; + } else { + root = of_get_root_node(); + } + + node = of_find_node_by_path_or_alias(root, nodename); + if (!node) { + printf("Cannot find nodepath %s\n", nodename); + ret = -ENOENT; + goto out; + } + + of_print_nodes(node, 0); + +out: + if (of_free) + of_delete_node(of_free); + + return 0; +} + +BAREBOX_CMD_HELP_START(of_dump) +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-f dtb", "work on dtb instead of internal devicetree\n") +BAREBOX_CMD_HELP_END + +BAREBOX_CMD_START(of_dump) + .cmd = do_of_dump, + BAREBOX_CMD_DESC("dump devicetree nodes") + BAREBOX_CMD_OPTS("[-f]") + BAREBOX_CMD_GROUP(CMD_GRP_MISC) + BAREBOX_CMD_COMPLETE(devicetree_file_complete) + BAREBOX_CMD_HELP(cmd_of_dump_help) +BAREBOX_CMD_END diff --git a/commands/of_node.c b/commands/of_node.c index b1894b184..4962e5242 100644 --- a/commands/of_node.c +++ b/commands/of_node.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -94,13 +95,16 @@ static int do_of_node(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(of_node) -BAREBOX_CMD_HELP_USAGE("of_node [OPTIONS] [NODE] [NAME]\n") -BAREBOX_CMD_HELP_OPT ("-c", "create a new node\n") -BAREBOX_CMD_HELP_OPT ("-d", "delete a node\n") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-c", "create a new node") +BAREBOX_CMD_HELP_OPT ("-d", "delete a node") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(of_node) .cmd = do_of_node, - .usage = "handle of nodes", + BAREBOX_CMD_DESC("create/delete nodes in the device tree") + BAREBOX_CMD_OPTS("[-cd] NODE NAME") + BAREBOX_CMD_GROUP(CMD_GRP_MISC) + BAREBOX_CMD_COMPLETE(devicetree_complete) BAREBOX_CMD_HELP(cmd_of_node_help) BAREBOX_CMD_END diff --git a/commands/of_property.c b/commands/of_property.c index 4518c7252..e0154fc39 100644 --- a/commands/of_property.c +++ b/commands/of_property.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -301,18 +302,22 @@ static int do_of_property(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(of_property) -BAREBOX_CMD_HELP_USAGE("of_property [OPTIONS] [NODE] [PROPERTY] [VALUES]\n") -BAREBOX_CMD_HELP_OPT ("-s", "set property to value\n") -BAREBOX_CMD_HELP_OPT ("-d", "delete property\n") -BAREBOX_CMD_HELP_TEXT ("\nvalid formats for values:\n") -BAREBOX_CMD_HELP_TEXT ("<0x00112233 4 05> - an array of cells. cells not beginning with a digit are\n") -BAREBOX_CMD_HELP_TEXT (" interpreted as node pathes and converted to phandles\n") -BAREBOX_CMD_HELP_TEXT ("[00 11 22 .. nn] - byte stream\n") -BAREBOX_CMD_HELP_TEXT ("If the value does not start with '<' or '[' it is interpreted as strings\n") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-s", "set property to value") +BAREBOX_CMD_HELP_OPT ("-d", "delete property") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Valid formats for values:") +BAREBOX_CMD_HELP_TEXT("<0x00112233 4 05> - an array of cells. cells not beginning with a digit are") +BAREBOX_CMD_HELP_TEXT(" interpreted as node pathes and converted to phandles") +BAREBOX_CMD_HELP_TEXT("[00 11 22 .. nn] - byte stream") +BAREBOX_CMD_HELP_TEXT("If the value does not start with '<' or '[' it is interpreted as string") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(of_property) .cmd = do_of_property, - .usage = "handle of properties", + BAREBOX_CMD_DESC("handle device tree properties") + BAREBOX_CMD_OPTS("[-sd] NODE [PROPERTY] [VALUES]") + BAREBOX_CMD_GROUP(CMD_GRP_MISC) + BAREBOX_CMD_COMPLETE(devicetree_complete) BAREBOX_CMD_HELP(cmd_of_property_help) BAREBOX_CMD_END diff --git a/commands/oftree.c b/commands/oftree.c index 3fa516c2b..a3b0e0486 100644 --- a/commands/oftree.c +++ b/commands/oftree.c @@ -37,30 +37,24 @@ #include #include #include +#include static int do_oftree(int argc, char *argv[]) { struct fdt_header *fdt = NULL; - void *fdt_free = NULL; int size; int opt; - char *file = NULL; - const char *node = "/"; - int dump = 0; int probe = 0; - int load = 0; - int save = 0; + char *load = NULL; + char *save = NULL; int free_of = 0; int ret; - struct device_node *n, *root; + struct device_node *root; - while ((opt = getopt(argc, argv, "dpfn:ls")) > 0) { + while ((opt = getopt(argc, argv, "pfl:s:")) > 0) { switch (opt) { case 'l': - load = 1; - break; - case 'd': - dump = 1; + load = optarg; break; case 'p': if (IS_ENABLED(CONFIG_OFDEVICE)) { @@ -73,11 +67,8 @@ static int do_oftree(int argc, char *argv[]) case 'f': free_of = 1; break; - case 'n': - node = optarg; - break; case 's': - save = 1; + save = optarg; break; } } @@ -92,20 +83,10 @@ static int do_oftree(int argc, char *argv[]) return 0; } - if (optind < argc) - file = argv[optind]; - - if (!dump && !probe && !load && !save) + if (!probe && !load && !save) return COMMAND_ERROR_USAGE; if (save) { - if (!file) { - printf("no file given\n"); - ret = -ENOENT; - - goto out; - } - fdt = of_get_fixed_tree(NULL); if (!fdt) { printf("no devicetree available\n"); @@ -114,71 +95,33 @@ static int do_oftree(int argc, char *argv[]) goto out; } - ret = write_file(file, fdt, fdt32_to_cpu(fdt->totalsize)); + ret = write_file(save, fdt, fdt32_to_cpu(fdt->totalsize)); goto out; } - if (file) { - fdt = read_file(file, &size); - if (!fdt) { - printf("unable to read %s\n", file); - return 1; - } - - fdt_free = fdt; - } - if (load) { + fdt = read_file(load, &size); if (!fdt) { - printf("no fdt given\n"); - ret = -ENOENT; - - goto out; + printf("unable to read %s\n", load); + return 1; } - n = of_get_root_node(); + root = of_unflatten_dtb(fdt); + + free(fdt); - root = of_unflatten_dtb(n, fdt); if (IS_ERR(root)) - ret = PTR_ERR(root); - else - ret = 0; - - if (!n) - ret = of_set_root_node(root); + return PTR_ERR(root); + ret = of_set_root_node(root); if (ret) { - printf("parse oftree: %s\n", strerror(-ret)); + printf("setting root node failed: %s\n", strerror(-ret)); + of_delete_node(root); goto out; } } - if (dump) { - if (fdt) { - root = of_unflatten_dtb(NULL, fdt); - if (IS_ERR(root)) { - printf("parse oftree: %s\n", strerror(-PTR_ERR(root))); - ret = 1; - goto out; - } - of_print_nodes(root, 0); - of_delete_node(root); - } else { - struct device_node *n = of_find_node_by_path_or_alias(NULL, node); - if (!n) { - ret = -ENOENT; - goto out; - } - - of_print_nodes(n, 0); - } - - ret = 0; - - goto out; - } - if (probe) { ret = of_probe(); if (ret) @@ -187,22 +130,22 @@ static int do_oftree(int argc, char *argv[]) ret = 0; out: - free(fdt_free); return ret; } BAREBOX_CMD_HELP_START(oftree) -BAREBOX_CMD_HELP_USAGE("oftree [OPTIONS] [DTB]\n") -BAREBOX_CMD_HELP_OPT ("-l", "Load [DTB] to internal devicetree\n") -BAREBOX_CMD_HELP_OPT ("-p", "probe devices from stored devicetree\n") -BAREBOX_CMD_HELP_OPT ("-d", "dump oftree from [DTB] or the parsed tree if no dtb is given\n") -BAREBOX_CMD_HELP_OPT ("-f", "free stored devicetree\n") -BAREBOX_CMD_HELP_OPT ("-n ", "specify root devicenode to dump for -d\n") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-l ", "Load to internal devicetree\n") +BAREBOX_CMD_HELP_OPT ("-s ", "save internal devicetree to \n") +BAREBOX_CMD_HELP_OPT ("-p", "probe devices from stored device tree") +BAREBOX_CMD_HELP_OPT ("-f", "free stored device tree") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(oftree) .cmd = do_oftree, - .usage = "handle devicetrees", + BAREBOX_CMD_DESC("handle device trees") + BAREBOX_CMD_OPTS("[-lpfs]") + BAREBOX_CMD_GROUP(CMD_GRP_MISC) BAREBOX_CMD_HELP(cmd_oftree_help) BAREBOX_CMD_END diff --git a/commands/partition.c b/commands/partition.c index 44b91d1a1..946cf2dfb 100644 --- a/commands/partition.c +++ b/commands/partition.c @@ -165,11 +165,17 @@ static int do_addpart(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(addpart) -BAREBOX_CMD_HELP_USAGE("addpart \n") -BAREBOX_CMD_HELP_SHORT("Add a partition description to a device.\n") -BAREBOX_CMD_HELP_OPT ("-n", "no prefix. Do not prepend the device name as prefix before the partition name\n") -BAREBOX_CMD_HELP_OPT ("", "device being worked on\n") -BAREBOX_CMD_HELP_OPT ("", "size1[@offset1](name1)[ro],size2[@offset2](name2)[ro],...\n") + +BAREBOX_CMD_HELP_TEXT("The size and the offset can be given in decimal (without any prefix) and") +BAREBOX_CMD_HELP_TEXT("in hex (prefixed with 0x). Both can have an optional suffix K, M or G.") +BAREBOX_CMD_HELP_TEXT("The size of the last partition can be specified as '-' for the remaining") +BAREBOX_CMD_HELP_TEXT("space on the device. This format is the same as used by the Linux") +BAREBOX_CMD_HELP_TEXT("kernel or cmdline mtd partitions.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-n", "do not use the device name as prefix of the partition name") +BAREBOX_CMD_HELP_OPT ("DEVICE", "device being worked on") +BAREBOX_CMD_HELP_OPT ("PART", "SIZE1[@OFFSET1](NAME1)[RO],SIZE2[@OFFSET2](NAME2)[RO],...") BAREBOX_CMD_HELP_END /** @@ -186,7 +192,9 @@ kernel or cmdline mtd partitions. BAREBOX_CMD_START(addpart) .cmd = do_addpart, - .usage = "adds a partition table to a device", + BAREBOX_CMD_DESC("add a partition description to a device") + BAREBOX_CMD_OPTS("[-n] DEVICE PART") + BAREBOX_CMD_GROUP(CMD_GRP_PART) BAREBOX_CMD_HELP(cmd_addpart_help) BAREBOX_CMD_END @@ -206,8 +214,7 @@ static int do_delpart(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(delpart) -BAREBOX_CMD_HELP_USAGE("delpart [] \n") -BAREBOX_CMD_HELP_SHORT("Delete partitions previously added to a device with addpart.\n") +BAREBOX_CMD_HELP_TEXT("Delete partitions previously added to a device with addpart.") BAREBOX_CMD_HELP_END /** @@ -223,7 +230,9 @@ argument list is taken as a list of partitions to be deleted. BAREBOX_CMD_START(delpart) .cmd = do_delpart, - .usage = "delete partition(s)", + BAREBOX_CMD_DESC("delete partition(s)") + BAREBOX_CMD_OPTS("PART...") + BAREBOX_CMD_GROUP(CMD_GRP_PART) BAREBOX_CMD_HELP(cmd_delpart_help) BAREBOX_CMD_COMPLETE(devfs_partition_complete) BAREBOX_CMD_END diff --git a/commands/passwd.c b/commands/passwd.c index 368c4016b..6f68700c2 100644 --- a/commands/passwd.c +++ b/commands/passwd.c @@ -83,15 +83,17 @@ disable: return ret; } -static const __maybe_unused char cmd_passwd_help[] = -"Usage: passwd\n" -"passwd allow you to specify a password in the env\n" -"to disable it put an empty password will still use the default password if set\n" -; +BAREBOX_CMD_HELP_START(passwd) +BAREBOX_CMD_HELP_TEXT("'Interactively asks for a password. The digest of this password will be") +BAREBOX_CMD_HELP_TEXT("stored in " PASSWD_DIR "/passwd. This is then used by the 'login' command.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Entering an empty string will disable the password function.") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(passwd) .cmd = do_passwd, - .usage = "passwd", + BAREBOX_CMD_DESC("set password") + BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE) BAREBOX_CMD_HELP(cmd_passwd_help) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/commands/poweroff.c b/commands/poweroff.c index ebb146c62..e0ec04fdb 100644 --- a/commands/poweroff.c +++ b/commands/poweroff.c @@ -33,5 +33,6 @@ static int cmd_poweroff(int argc, char *argv[]) BAREBOX_CMD_START(poweroff) .cmd = cmd_poweroff, - .usage = "Perform POWER OFF of the board", + BAREBOX_CMD_DESC("turn the power off") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_END diff --git a/commands/printenv.c b/commands/printenv.c index 10e882ae9..83353aeb3 100644 --- a/commands/printenv.c +++ b/commands/printenv.c @@ -57,8 +57,9 @@ static int do_printenv(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(printenv) -BAREBOX_CMD_HELP_USAGE("printenv [variable]\n") -BAREBOX_CMD_HELP_SHORT("Print value of one or all environment variables.\n") +BAREBOX_CMD_HELP_TEXT("If an argument is given, printenv prints the content of an environment") +BAREBOX_CMD_HELP_TEXT("variable to the terminal. If no argument is specified, all variables are") +BAREBOX_CMD_HELP_TEXT("printed.") BAREBOX_CMD_HELP_END /** @@ -72,6 +73,8 @@ printed.

BAREBOX_CMD_START(printenv) .cmd = do_printenv, - .usage = "Print value of one or all environment variables.", + BAREBOX_CMD_DESC("print value of environment variables") + BAREBOX_CMD_OPTS("[VARIABLE]") + BAREBOX_CMD_GROUP(CMD_GRP_ENV) BAREBOX_CMD_HELP(cmd_printenv_help) BAREBOX_CMD_END diff --git a/commands/pwd.c b/commands/pwd.c index 6fe4cf390..d5dd16193 100644 --- a/commands/pwd.c +++ b/commands/pwd.c @@ -29,6 +29,7 @@ static int do_pwd(int argc, char *argv[]) BAREBOX_CMD_START(pwd) .cmd = do_pwd, - .usage = "print working directory", + BAREBOX_CMD_DESC("print working directory") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/commands/readf.c b/commands/readf.c index 6314c7ef2..c8cc574f3 100644 --- a/commands/readf.c +++ b/commands/readf.c @@ -50,14 +50,15 @@ out: } BAREBOX_CMD_HELP_START(readf) -BAREBOX_CMD_HELP_USAGE("readf \n") -BAREBOX_CMD_HELP_SHORT("Read a single line of a file into a shell variable. Leading and trailing whitespaces\n") -BAREBOX_CMD_HELP_SHORT("are removed, nonvisible characters are stripped. Input is limited to 1024\n") -BAREBOX_CMD_HELP_SHORT("characters.\n") +BAREBOX_CMD_HELP_TEXT("Read a single line from FILE into a VARiable. Leading and trailing") +BAREBOX_CMD_HELP_TEXT("whitespaces are removed, nonvisible characters are stripped. Input is") +BAREBOX_CMD_HELP_TEXT("limited to 1024 characters.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(readf) .cmd = do_readf, - .usage = "read file into variable", + BAREBOX_CMD_DESC("read file into variable") + BAREBOX_CMD_OPTS("FILE VAR") + BAREBOX_CMD_GROUP(CMD_GRP_SCRIPT) BAREBOX_CMD_HELP(cmd_readf_help) BAREBOX_CMD_END diff --git a/commands/readline.c b/commands/readline.c index 60670fa67..e53749887 100644 --- a/commands/readline.c +++ b/commands/readline.c @@ -41,13 +41,16 @@ static int do_readline(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_readline_help[] = -"Usage: readline VAR\n" -"readline reads a line of user input into variable VAR.\n"; +BAREBOX_CMD_HELP_START(readline) +BAREBOX_CMD_HELP_TEXT("First it displays the PROMPT, then it reads a line of user input into") +BAREBOX_CMD_HELP_TEXT("variable VAR.") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(readline) .cmd = do_readline, - .usage = "prompt for user input", + BAREBOX_CMD_DESC("prompt for user input") + BAREBOX_CMD_OPTS("PROMPT VAR") + BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE) BAREBOX_CMD_HELP(cmd_readline_help) BAREBOX_CMD_END diff --git a/commands/readlink.c b/commands/readlink.c index d2671e0f2..f17f9e8c6 100644 --- a/commands/readlink.c +++ b/commands/readlink.c @@ -68,13 +68,16 @@ err: } BAREBOX_CMD_HELP_START(readlink) -BAREBOX_CMD_HELP_USAGE("readlink [-f] FILE REALNAME\n") -BAREBOX_CMD_HELP_SHORT("read value of a symbolic link and store into $REALNAME\n") -BAREBOX_CMD_HELP_SHORT("-f canonicalize by following first symlink"); +BAREBOX_CMD_HELP_TEXT("Read value of a symbolic link and store it into VARIABLE.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-f", "canonicalize by following first symlink"); BAREBOX_CMD_HELP_END BAREBOX_CMD_START(readlink) .cmd = do_readlink, - .usage = "read value of a symbolic link", + BAREBOX_CMD_DESC("read value of a symbolic link") + BAREBOX_CMD_OPTS("[-f] FILE VARIABLE") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_readlink_help) BAREBOX_CMD_END diff --git a/commands/reginfo.c b/commands/reginfo.c index f5bc8a09b..37816cb26 100644 --- a/commands/reginfo.c +++ b/commands/reginfo.c @@ -29,6 +29,7 @@ static int do_reginfo(int argc, char *argv[]) BAREBOX_CMD_START(reginfo) .cmd = do_reginfo, - .usage = "print register information", + BAREBOX_CMD_DESC("print register information") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/commands/regulator.c b/commands/regulator.c index 42dcd0ab3..e0b704f88 100644 --- a/commands/regulator.c +++ b/commands/regulator.c @@ -29,5 +29,6 @@ static int do_regulator(int argc, char *argv[]) BAREBOX_CMD_START(regulator) .cmd = do_regulator, - .usage = "list regulators", + BAREBOX_CMD_DESC("list regulators") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_END diff --git a/commands/reset.c b/commands/reset.c index 79885f4af..4f42b91e0 100644 --- a/commands/reset.c +++ b/commands/reset.c @@ -46,14 +46,15 @@ static int cmd_reset(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(reset) -BAREBOX_CMD_HELP_USAGE("reset [-f]\n") -BAREBOX_CMD_HELP_SHORT("Perform RESET of the CPU.\n") -BAREBOX_CMD_HELP_OPT("-f", "force RESET, don't call shutdown\n") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-f", "force RESET, don't call shutdown") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(reset) .cmd = cmd_reset, - .usage = "Perform RESET of the CPU", + BAREBOX_CMD_DESC("perform RESET of the CPU") + BAREBOX_CMD_OPTS("[-f]") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_HELP(cmd_reset_help) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/commands/rm.c b/commands/rm.c index 5486005d9..5f1f582f5 100644 --- a/commands/rm.c +++ b/commands/rm.c @@ -58,13 +58,15 @@ static int do_rm(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_rm_help[] = -"Usage: rm [OPTIONS] [FILES]\n" -"Remove files\n" -"-r remove directories and their contents recursively\n"; +BAREBOX_CMD_HELP_START(rm) +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-r", "remove directories and their contents recursively") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(rm) .cmd = do_rm, - .usage = "remove files", + BAREBOX_CMD_DESC("remove files") + BAREBOX_CMD_OPTS("[-r] FILES...") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_rm_help) BAREBOX_CMD_END diff --git a/commands/rmdir.c b/commands/rmdir.c index 6034a10f7..e1cd5dc54 100644 --- a/commands/rmdir.c +++ b/commands/rmdir.c @@ -21,12 +21,15 @@ static int do_rmdir(int argc, char *argv[]) return 0; } -static const __maybe_unused char cmd_rmdir_help[] = -"Usage: rmdir [directories]\n" -"Remove directories. The directories have to be empty.\n"; + +BAREBOX_CMD_HELP_START(rmdir) +BAREBOX_CMD_HELP_TEXT("Remove directories. The directories have to be empty.") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(rmdir) .cmd = do_rmdir, - .usage = "remove directorie(s)", + BAREBOX_CMD_DESC("remove empty directory(s)") + BAREBOX_CMD_OPTS("DIRECTORY...") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_HELP(cmd_rmdir_help) BAREBOX_CMD_END diff --git a/commands/saveenv.c b/commands/saveenv.c index cb2b01db5..d629a94c5 100644 --- a/commands/saveenv.c +++ b/commands/saveenv.c @@ -48,13 +48,20 @@ static int do_saveenv(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(saveenv) -BAREBOX_CMD_HELP_USAGE("saveenv [envfs] [directory]\n") -BAREBOX_CMD_HELP_SHORT("Save the files in to the persistent storage device .\n") +BAREBOX_CMD_HELP_TEXT("Save the files in DIRECTORY to the persistent storage device ENVFS.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("ENVFS is usually a block in flash but can be any other file. If") +BAREBOX_CMD_HELP_TEXT("omitted, DIRECTORY defaults to /env and ENVFS defaults to") +BAREBOX_CMD_HELP_TEXT("/dev/env0. Note that envfs can only handle files, directories are being") +BAREBOX_CMD_HELP_TEXT("skipped silently.") + BAREBOX_CMD_HELP_END BAREBOX_CMD_START(saveenv) .cmd = do_saveenv, - .usage = "save environment to persistent storage", + BAREBOX_CMD_DESC("save environment to persistent storage") + BAREBOX_CMD_OPTS("[ENVFS] [DIRECTORY]") + BAREBOX_CMD_GROUP(CMD_GRP_ENV) BAREBOX_CMD_HELP(cmd_saveenv_help) BAREBOX_CMD_END diff --git a/commands/setenv.c b/commands/setenv.c index 57ba71e04..9e21ccec8 100644 --- a/commands/setenv.c +++ b/commands/setenv.c @@ -36,8 +36,8 @@ static int do_setenv(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(setenv) -BAREBOX_CMD_HELP_USAGE("setenv []\n") -BAREBOX_CMD_HELP_SHORT("Set environment variable to a value or delete if value is avoided.\n") +BAREBOX_CMD_HELP_TEXT("Set environment variable NAME to VALUE.") +BAREBOX_CMD_HELP_TEXT("If VALUE is ommitted, then the variable is deleted.") BAREBOX_CMD_HELP_END /** @@ -46,12 +46,12 @@ BAREBOX_CMD_HELP_END

This command is only available if the simple command line parser is in use. Within the hush shell, \c setenv is not required.

-\todo Check if kconfig does this correctly. - */ BAREBOX_CMD_START(setenv) .cmd = do_setenv, - .usage = "set environment variables", + BAREBOX_CMD_DESC("set environment variable") + BAREBOX_CMD_OPTS("NAME [VALUE]") + BAREBOX_CMD_GROUP(CMD_GRP_ENV) BAREBOX_CMD_HELP(cmd_setenv_help) BAREBOX_CMD_END diff --git a/commands/sleep.c b/commands/sleep.c index 2574804c1..2491dc261 100644 --- a/commands/sleep.c +++ b/commands/sleep.c @@ -43,6 +43,8 @@ static int do_sleep(int argc, char *argv[]) BAREBOX_CMD_START(sleep) .cmd = do_sleep, - .usage = "delay execution for n seconds", + BAREBOX_CMD_DESC("delay execution for n seconds") + BAREBOX_CMD_OPTS("SECONDS") + BAREBOX_CMD_GROUP(CMD_GRP_SCRIPT) BAREBOX_CMD_COMPLETE(command_var_complete) BAREBOX_CMD_END diff --git a/commands/spi.c b/commands/spi.c index 79fc539a6..21db9ae23 100644 --- a/commands/spi.c +++ b/commands/spi.c @@ -114,19 +114,22 @@ out: return ret; } -static const __maybe_unused char cmd_spi_help[] = -"Usage: spi [OPTION] [data to write 0xXX]\n" -"write/read spi device.\n" -" -b spi bus number (default = 0)\n" -" -r to read\n" -" -c chip select (default = 0)\n" -" -m spi mode (default = 0)\n" -" -f max_speed_hz (default = 1MHz)\n" -" -w bits_per_word (default = 8)\n" -" -v verbose\n"; + +BAREBOX_CMD_HELP_START(spi) +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-b BUS\t", "SPI bus number (default 0)") +BAREBOX_CMD_HELP_OPT ("-r COUNT", "bytes to read") +BAREBOX_CMD_HELP_OPT ("-c\t", "chip select (default 0)") +BAREBOX_CMD_HELP_OPT ("-m MODE\t", "SPI mode (default 0)") +BAREBOX_CMD_HELP_OPT ("-f HZ\t", "max speed frequency, in Hz (default 1 MHz)") +BAREBOX_CMD_HELP_OPT ("-w BIT\t", "bits per word (default 8)") +BAREBOX_CMD_HELP_OPT ("-v\t", "verbose") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(spi) .cmd = do_spi, - .usage = "write/read spi device", + BAREBOX_CMD_DESC("write/read from SPI device") + BAREBOX_CMD_OPTS("[-brcmfwv] DATA...") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_spi_help) BAREBOX_CMD_END diff --git a/commands/splash.c b/commands/splash.c index 0955c011e..c61a1d76a 100644 --- a/commands/splash.c +++ b/commands/splash.c @@ -78,13 +78,15 @@ static int do_splash(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(splash) -BAREBOX_CMD_HELP_USAGE("splash [OPTIONS] FILE\n") -BAREBOX_CMD_HELP_SHORT("Show the bitmap FILE on the framebuffer.\n") -BAREBOX_CMD_HELP_OPT ("-f ", "framebuffer device (/dev/fb0)\n") -BAREBOX_CMD_HELP_OPT ("-x ", "x offset (default center)\n") -BAREBOX_CMD_HELP_OPT ("-y ", "y offset (default center)\n") -BAREBOX_CMD_HELP_OPT ("-b ", "background color in 0xttrrggbb\n") -BAREBOX_CMD_HELP_OPT ("-o", "render offscreen\n") +BAREBOX_CMD_HELP_TEXT("This command displays a graphics in the bitmap (.bmp) format on the") +BAREBOX_CMD_HELP_TEXT("framebuffer. Currently images with 8 and 24 bit color depth are supported.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-f FB\t", "framebuffer device (default /dev/fb0)") +BAREBOX_CMD_HELP_OPT ("-x XOFFS", "x offset (default center)") +BAREBOX_CMD_HELP_OPT ("-y YOFFS", "y offset (default center)") +BAREBOX_CMD_HELP_OPT ("-b COLOR", "background color in 0xttrrggbb") +BAREBOX_CMD_HELP_OPT ("-o\t", "render offscreen") BAREBOX_CMD_HELP_END /** @@ -100,6 +102,8 @@ color depth. BAREBOX_CMD_START(splash) .cmd = do_splash, - .usage = "show a bmp image", + BAREBOX_CMD_DESC("display a BMP image") + BAREBOX_CMD_OPTS("[-fxyno] FILE") + BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE) BAREBOX_CMD_HELP(cmd_splash_help) BAREBOX_CMD_END diff --git a/commands/test.c b/commands/test.c index b3cd164f6..d0f63c139 100644 --- a/commands/test.c +++ b/commands/test.c @@ -226,16 +226,17 @@ out: static const char *test_aliases[] = { "[", NULL}; -static const __maybe_unused char cmd_test_help[] = -"Usage: test [OPTIONS]\n" -"options: !, =, !=, -eq, -ne, -ge, -gt, -le, -lt, -o, -a, -z, -n, -d, -e, -f, -L\n" -"see 'man test' on your PC for more information.\n"; - -static const __maybe_unused char cmd_test_usage[] = "minimal test like /bin/sh"; +BAREBOX_CMD_HELP_START(test) +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_TEXT("\t!, =, !=, -eq, -ne, -ge, -gt, -le, -lt, -o, -a, -z, -n, -d, -e,") +BAREBOX_CMD_HELP_TEXT("\t-f, -L; see 'man test' on your PC for more information.") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(test) .aliases = test_aliases, .cmd = do_test, - .usage = cmd_test_usage, + BAREBOX_CMD_DESC("minimal test command like in /bin/sh") + BAREBOX_CMD_OPTS("[EXPR]") + BAREBOX_CMD_GROUP(CMD_GRP_SCRIPT) BAREBOX_CMD_HELP(cmd_test_help) BAREBOX_CMD_END diff --git a/commands/tftp.c b/commands/tftp.c index 64cab2f04..c066631ad 100644 --- a/commands/tftp.c +++ b/commands/tftp.c @@ -92,12 +92,16 @@ err_free: } BAREBOX_CMD_HELP_START(tftp) -BAREBOX_CMD_HELP_USAGE("tftp [-p] [dest]\n") -BAREBOX_CMD_HELP_SHORT("Load a file from or upload to TFTP server.\n") +BAREBOX_CMD_HELP_TEXT("Load (or save) a file via TFTP.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-p", "push to TFTP server") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(tftp) .cmd = do_tftpb, - .usage = "(up-)Load file using tftp protocol", + BAREBOX_CMD_DESC("load (or save) a file using TFTP") + BAREBOX_CMD_OPTS("[-p] SOURCE [DEST]") + BAREBOX_CMD_GROUP(CMD_GRP_NET) BAREBOX_CMD_HELP(cmd_tftp_help) BAREBOX_CMD_END diff --git a/commands/time.c b/commands/time.c index ffd306233..29000d96d 100644 --- a/commands/time.c +++ b/commands/time.c @@ -45,13 +45,14 @@ static int do_time(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(time) -BAREBOX_CMD_HELP_USAGE("time \n") -BAREBOX_CMD_HELP_SHORT("note: This command depends on being interruptible,\n") -BAREBOX_CMD_HELP_SHORT("Otherwise the timer may overrun resulting in incorrect results\n") +BAREBOX_CMD_HELP_TEXT("Note: This command depends on COMMAND being interruptible,") +BAREBOX_CMD_HELP_TEXT("otherwise the timer may overrun resulting in incorrect results") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(time) .cmd = do_time, - .usage = "measure execution time of a command", + BAREBOX_CMD_DESC("measure execution duration of a command") + BAREBOX_CMD_OPTS("COMMAND") + BAREBOX_CMD_GROUP(CMD_GRP_MISC) BAREBOX_CMD_HELP(cmd_time_help) BAREBOX_CMD_END diff --git a/commands/timeout.c b/commands/timeout.c index feb27f52a..feca7140d 100644 --- a/commands/timeout.c +++ b/commands/timeout.c @@ -102,18 +102,21 @@ out: return ret; } -static const __maybe_unused char cmd_timeout_help[] = -"Usage: timeout [OPTION]... \n" -"Wait seconds for a timeout. Return 1 if the user intervented\n" -"or 0 if a timeout occured\n" -" -a interrupt on any key\n" -" -c interrupt on ctrl-c\n" -" -r interrupt on return\n" -" -s silent mode\n"; +BAREBOX_CMD_HELP_START(timeout) +BAREBOX_CMD_HELP_TEXT("Wait SECONDS for a timeout. Return 1 if the user intervented.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-a", "interrupt on any key") +BAREBOX_CMD_HELP_OPT("-c", "interrupt on Ctrl-C") +BAREBOX_CMD_HELP_OPT("-r", "interrupt on RETURN") +BAREBOX_CMD_HELP_OPT("-s", "silent mode") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(timeout) .cmd = do_timeout, - .usage = "wait for a specified timeout", + BAREBOX_CMD_DESC("wait for a specified timeout") + BAREBOX_CMD_OPTS("[-acrs] SECONDS") + BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE) BAREBOX_CMD_HELP(cmd_timeout_help) BAREBOX_CMD_END diff --git a/commands/trigger.c b/commands/trigger.c index de50bddb0..17c841150 100644 --- a/commands/trigger.c +++ b/commands/trigger.c @@ -90,15 +90,18 @@ static int do_trigger(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(trigger) -BAREBOX_CMD_HELP_USAGE("trigger [OPTIONS]\n") -BAREBOX_CMD_HELP_SHORT("control a LED trigger. Without options the currently assigned triggers are shown.\n") -BAREBOX_CMD_HELP_OPT ("-t ", "set a trigger for a led\n") -BAREBOX_CMD_HELP_OPT ("-d ", "disable a trigger\n") +BAREBOX_CMD_HELP_TEXT("Control a LED trigger. Without options assigned triggers are shown.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-t", "set a trigger (needs LED argument)") +BAREBOX_CMD_HELP_OPT ("-d", "disable a trigger") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(trigger) .cmd = do_trigger, - .usage = "handle LED triggers", + BAREBOX_CMD_DESC("handle LED triggers") + BAREBOX_CMD_OPTS("[-td] TRIGGER [LED]") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_trigger_help) BAREBOX_CMD_END diff --git a/commands/true.c b/commands/true.c index a09776bcd..fbb34e769 100644 --- a/commands/true.c +++ b/commands/true.c @@ -28,7 +28,8 @@ static int do_true(int argc, char *argv[]) BAREBOX_CMD_START(true) .cmd = do_true, - .usage = "do nothing, successfully", + BAREBOX_CMD_DESC("do nothing, successfully") + BAREBOX_CMD_GROUP(CMD_GRP_SCRIPT) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/commands/ubi.c b/commands/ubi.c index 8a409c28a..d593e71c2 100644 --- a/commands/ubi.c +++ b/commands/ubi.c @@ -44,14 +44,17 @@ static int do_ubimkvol(int argc, char *argv[]) return ret ? 1 : 0; } -static const __maybe_unused char cmd_ubimkvol_help[] = -"Usage: ubimkvol \n" -"Create an ubi volume on with name and size \n" -"If size is zero all available space is used for the volume\n"; + +BAREBOX_CMD_HELP_START(ubimkvol) +BAREBOX_CMD_HELP_TEXT("Create an UBI volume on UBIDEV with NAME and SIZE.") +BAREBOX_CMD_HELP_TEXT("If SIZE is 0 all available space is used for the volume.") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(ubimkvol) .cmd = do_ubimkvol, - .usage = "create an ubi volume", + BAREBOX_CMD_DESC("create an UBI volume") + BAREBOX_CMD_OPTS("UBIDEV NAME SIZE") + BAREBOX_CMD_GROUP(CMD_GRP_PART) BAREBOX_CMD_HELP(cmd_ubimkvol_help) BAREBOX_CMD_END @@ -99,13 +102,16 @@ err: return ret ? 1 : 0; } -static const __maybe_unused char cmd_ubiattach_help[] = -"Usage: ubiattach [-O vid-hdr-offset] \n" -"Attach to ubi\n"; +BAREBOX_CMD_HELP_START(ubiattach) +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-O OFFS", "VID header offset") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(ubiattach) .cmd = do_ubiattach, - .usage = "attach a mtd dev to ubi", + BAREBOX_CMD_DESC("attach mtd device to UBI") + BAREBOX_CMD_OPTS("[-O] MTDDEV") + BAREBOX_CMD_GROUP(CMD_GRP_PART) BAREBOX_CMD_HELP(cmd_ubiattach_help) BAREBOX_CMD_END @@ -125,14 +131,11 @@ static int do_ubidetach(int argc, char *argv[]) return ret; } -static const __maybe_unused char cmd_ubidetach_help[] = -"Usage: ubidetach \n" -"Detach from ubi\n"; - BAREBOX_CMD_START(ubidetach) .cmd = do_ubidetach, - .usage = "detach an ubi dev", - BAREBOX_CMD_HELP(cmd_ubidetach_help) + BAREBOX_CMD_DESC("detach an UBI device") + BAREBOX_CMD_OPTS("UBINUM") + BAREBOX_CMD_GROUP(CMD_GRP_PART) BAREBOX_CMD_END static int do_ubirmvol(int argc, char *argv[]) @@ -160,13 +163,15 @@ static int do_ubirmvol(int argc, char *argv[]) return ret ? 1 : 0; } -static const __maybe_unused char cmd_ubirmvol_help[] = -"Usage: ubirmvol \n" -"Delete ubi volume from \n"; +BAREBOX_CMD_HELP_START(ubirmvol) +BAREBOX_CMD_HELP_TEXT("Delete UBI volume NAME from UBIDEV") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(ubirmvol) .cmd = do_ubirmvol, - .usage = "delete an ubi volume", + BAREBOX_CMD_DESC("delete an UBI volume") + BAREBOX_CMD_OPTS("UBIDEV NAME") + BAREBOX_CMD_GROUP(CMD_GRP_PART) BAREBOX_CMD_HELP(cmd_ubirmvol_help) BAREBOX_CMD_END diff --git a/commands/ubiformat.c b/commands/ubiformat.c index 5b4e5723f..5c8a36343 100644 --- a/commands/ubiformat.c +++ b/commands/ubiformat.c @@ -764,34 +764,32 @@ out_close_mtd: } BAREBOX_CMD_HELP_START(ubiformat) -BAREBOX_CMD_HELP_USAGE(PROGRAM_NAME " [-s ] [-O ] [-n]\n" - "\t[-f ] [-e ] [-x ] [-Q ] [-y] [-q] [-v]\n") -BAREBOX_CMD_HELP_SHORT("A tool to format MTD devices and flash UBI images\n") -BAREBOX_CMD_HELP_OPT("-s ", "minimum input/output unit used for UBI headers, " -"e.g. sub-page size in case of NAND flash (equivalent to the minimum input/output " -"unit size by default)\n") -BAREBOX_CMD_HELP_OPT("-O ", "offset if the VID header from start of the " -"physical eraseblock (default is the next minimum I/O unit or sub-page after the EC " -"header)\n") -BAREBOX_CMD_HELP_OPT("-n", "only erase all eraseblock and preserve erase " -"counters, do not write empty volume table\n") -BAREBOX_CMD_HELP_OPT("-f ", "flash image file\n") -BAREBOX_CMD_HELP_OPT("-e ", "use as the erase counter value for all eraseblocks\n") -BAREBOX_CMD_HELP_OPT("-x ", "UBI version number to put to EC headers " -"(default is 1)\n") -BAREBOX_CMD_HELP_OPT("-Q ", "32-bit UBI image sequence number to use " -"(by default a random number is picked)\n") -BAREBOX_CMD_HELP_OPT("-q", "suppress progress percentage information\n") -BAREBOX_CMD_HELP_OPT("-v", "be verbose\n") -BAREBOX_CMD_HELP_TEXT( -"Example 1: " PROGRAM_NAME " /dev/nand0 -y - format nand0 and assume yes\n" -"Example 2: " PROGRAM_NAME " /dev/nand0 -q -e 0 - format nand0,\n" -" be quiet and force erase counter value 0.\n"; -) +BAREBOX_CMD_HELP_TEXT("A tool to format MTD devices and flash UBI images") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-s BYTES", "minimum input/output unit used for UBI headers") +BAREBOX_CMD_HELP_OPT("\t", "e.g. sub-page size in case of NAND flash") +BAREBOX_CMD_HELP_OPT("-O OFFS\t", "offset if the VID header from start of the") +BAREBOX_CMD_HELP_OPT("\t", "physical eraseblock (default is the next minimum I/O unit or") +BAREBOX_CMD_HELP_OPT("\t", "sub-page after the EC header)") +BAREBOX_CMD_HELP_OPT("-n\t", "only erase all eraseblock and preserve erase") +BAREBOX_CMD_HELP_OPT("\t", "counters, do not write empty volume table") +BAREBOX_CMD_HELP_OPT("-f FILE\t", "flash image file") +BAREBOX_CMD_HELP_OPT("-e VALUE", "use VALUE as erase counter value for all eraseblocks") +BAREBOX_CMD_HELP_OPT("-x NUM\t", "UBI version number to put to EC headers (default 1)") +BAREBOX_CMD_HELP_OPT("-Q NUM\t", "32-bit UBI image sequence number to use") +BAREBOX_CMD_HELP_OPT("-q\t", "suppress progress percentage information") +BAREBOX_CMD_HELP_OPT("-v\t", "be verbose") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Example 1: " PROGRAM_NAME " /dev/nand0 -y - format nand0 and assume yes") +BAREBOX_CMD_HELP_TEXT("Example 2: " PROGRAM_NAME " /dev/nand0 -q -e 0 - format nand0,") +BAREBOX_CMD_HELP_TEXT("\tbe quiet and force erase counter value 0.") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(ubiformat) .cmd = do_ubiformat, - .usage = "format an ubi volume", + BAREBOX_CMD_DESC("format an ubi volume") + BAREBOX_CMD_OPTS("[-sOnfexQqv] MTDEVICE") + BAREBOX_CMD_GROUP(CMD_GRP_PART) BAREBOX_CMD_HELP(cmd_ubiformat_help) BAREBOX_CMD_END diff --git a/commands/uimage.c b/commands/uimage.c index bdc74448d..33523d7e5 100644 --- a/commands/uimage.c +++ b/commands/uimage.c @@ -60,7 +60,7 @@ static int do_uimage(int argc, char *argv[]) } if (verify) { - printf("verifying data crc... "); + printf("verifying data CRC... "); ret = uimage_verify(handle); if (ret) goto err; @@ -91,15 +91,17 @@ err: } BAREBOX_CMD_HELP_START(uimage) -BAREBOX_CMD_HELP_USAGE("uimage [OPTIONS] \n") -BAREBOX_CMD_HELP_OPT ("-i", "show information about image\n") -BAREBOX_CMD_HELP_OPT ("-v", "verify image\n") -BAREBOX_CMD_HELP_OPT ("-e ", "extract image to \n") -BAREBOX_CMD_HELP_OPT ("-n ", "use image number in multifile images\n") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-i\t", "show information about image") +BAREBOX_CMD_HELP_OPT ("-v\t", "verify image") +BAREBOX_CMD_HELP_OPT ("-e OUTFILE", "extract image to OUTFILE") +BAREBOX_CMD_HELP_OPT ("-n NO\t", "use image number NO in multifile image") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(uimage) .cmd = do_uimage, - .usage = "extract/verify uImage", + BAREBOX_CMD_DESC("extract/verify uImage") + BAREBOX_CMD_OPTS("[-vien] FILE") + BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_HELP(cmd_uimage_help) BAREBOX_CMD_END diff --git a/commands/umount.c b/commands/umount.c index f0f9fcee2..84c84e42c 100644 --- a/commands/umount.c +++ b/commands/umount.c @@ -29,12 +29,15 @@ static int do_umount(int argc, char *argv[]) return umount(argv[1]); } -static const __maybe_unused char cmd_umount_help[] = -"Usage: umount \n" -"umount a filesystem mounted on a specific mountpoint\n"; + +BAREBOX_CMD_HELP_START(umount) +BAREBOX_CMD_HELP_TEXT("Unmount a filesystem mounted on a specific MOINTPOINT") +BAREBOX_CMD_HELP_END BAREBOX_CMD_START(umount) .cmd = do_umount, - .usage = "umount a filesystem", + BAREBOX_CMD_DESC("umount a filesystem") + BAREBOX_CMD_OPTS("MOUNTPOINT") + BAREBOX_CMD_GROUP(CMD_GRP_PART) BAREBOX_CMD_HELP(cmd_umount_help) BAREBOX_CMD_END diff --git a/commands/uncompress.c b/commands/uncompress.c index 58c8c9600..38d53e749 100644 --- a/commands/uncompress.c +++ b/commands/uncompress.c @@ -55,13 +55,10 @@ exit_close: return ret; } -static const __maybe_unused char cmd_uncompress_help[] = -"Usage: uncompress \n" -"Uncompress a compressed file\n"; BAREBOX_CMD_START(uncompress) - .cmd = do_uncompress, - .usage = "uncompress a compressed file", - BAREBOX_CMD_HELP(cmd_uncompress_help) + .cmd = do_uncompress, + BAREBOX_CMD_DESC("uncompress a compressed file") + BAREBOX_CMD_OPTS("INFILE OUTFILE") + BAREBOX_CMD_GROUP(CMD_GRP_FILE) BAREBOX_CMD_END - diff --git a/commands/usb.c b/commands/usb.c index 9aee4308d..073c79c71 100644 --- a/commands/usb.c +++ b/commands/usb.c @@ -41,14 +41,17 @@ static int do_usb(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(usb) -BAREBOX_CMD_HELP_USAGE("usb [-f]\n") -BAREBOX_CMD_HELP_SHORT("Scan for USB devices.\n") -BAREBOX_CMD_HELP_OPT("-f", "force. Rescan although scanned already\n") +BAREBOX_CMD_HELP_TEXT("Scan for USB devices.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-f", "force rescan") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(usb) .cmd = do_usb, - .usage = "(re-)detect USB devices", + BAREBOX_CMD_DESC("(re-)detect USB devices") + BAREBOX_CMD_OPTS("[-f]") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_usb_help) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/commands/usbserial.c b/commands/usbserial.c index 969fd253b..1c26246f7 100644 --- a/commands/usbserial.c +++ b/commands/usbserial.c @@ -77,18 +77,19 @@ static int do_usbserial(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(usbserial) -BAREBOX_CMD_HELP_USAGE("usbserial [OPTIONS] \n") -BAREBOX_CMD_HELP_SHORT("Enable/disable a serial gadget on the USB device interface.\n") -BAREBOX_CMD_HELP_OPT ("-m ", "Manufacturer string (barebox)\n") -BAREBOX_CMD_HELP_OPT ("-p ", "product string\n") -BAREBOX_CMD_HELP_OPT ("-V ", "vendor id\n") -BAREBOX_CMD_HELP_OPT ("-P ", "product id\n") -BAREBOX_CMD_HELP_OPT ("-a", "CDC ACM (default)\n") +BAREBOX_CMD_HELP_TEXT("Enable / disable a serial gadget on the USB device interface.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-m STR", "Manufacturer string (barebox)") +BAREBOX_CMD_HELP_OPT ("-p STR", "product string") +BAREBOX_CMD_HELP_OPT ("-V ID", "vendor id") +BAREBOX_CMD_HELP_OPT ("-P ID", "product id") +BAREBOX_CMD_HELP_OPT ("-a", "CDC ACM (default)") #ifdef HAVE_OBEX -BAREBOX_CMD_HELP_OPT ("-o", "CDC OBEX\n") +BAREBOX_CMD_HELP_OPT ("-o", "CDC OBEX") #endif -BAREBOX_CMD_HELP_OPT ("-s", "Generic Serial\n") -BAREBOX_CMD_HELP_OPT ("-d", "Disable the serial gadget\n") +BAREBOX_CMD_HELP_OPT ("-s", "Generic Serial") +BAREBOX_CMD_HELP_OPT ("-d", "Disable the serial gadget") BAREBOX_CMD_HELP_END /** @@ -97,6 +98,12 @@ BAREBOX_CMD_HELP_END BAREBOX_CMD_START(usbserial) .cmd = do_usbserial, - .usage = "Serial gadget enable/disable", + BAREBOX_CMD_DESC("serial gadget enable/disable") + BAREBOX_CMD_OPTS("[-mpVPa" +#ifdef HAVE_OBEX + "o" +#endif + "sd] ") + BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP) BAREBOX_CMD_HELP(cmd_usbserial_help) BAREBOX_CMD_END diff --git a/commands/version.c b/commands/version.c index 6578fdd9c..898c71943 100644 --- a/commands/version.c +++ b/commands/version.c @@ -29,7 +29,8 @@ static int do_version(int argc, char *argv[]) BAREBOX_CMD_START(version) .cmd = do_version, - .usage = "print monitor version", + BAREBOX_CMD_DESC("print barebox version") + BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END diff --git a/commands/wd.c b/commands/wd.c index 080bab923..26823f869 100644 --- a/commands/wd.c +++ b/commands/wd.c @@ -55,14 +55,15 @@ static int do_wd(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(wd) -BAREBOX_CMD_HELP_USAGE("wd [