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
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