diff options
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/boot/dtb.c | 2 | ||||
| -rw-r--r-- | arch/mips/configs/dlink-dir-320_defconfig | 4 | ||||
| -rw-r--r-- | arch/mips/configs/loongson-ls1b_defconfig | 2 | ||||
| -rw-r--r-- | arch/mips/configs/qemu-malta_defconfig | 6 | ||||
| -rw-r--r-- | arch/mips/configs/ritmix-rzx50_defconfig | 2 | ||||
| -rw-r--r-- | arch/mips/lib/cpuinfo.c | 3 |
6 files changed, 10 insertions, 9 deletions
diff --git a/arch/mips/boot/dtb.c b/arch/mips/boot/dtb.c index c1962bfd0c..23d8979ad5 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 6b5d2fdda5..2ff9dd7f4c 100644 --- a/arch/mips/configs/dlink-dir-320_defconfig +++ b/arch/mips/configs/dlink-dir-320_defconfig @@ -49,9 +49,9 @@ CONFIG_CMD_OF_PROPERTY=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=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 bc48abad79..8e04170f44 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 1b9ee9ae77..ba5fa96dfc 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 7691bae6e6..62f23b291b 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 de2055e599..1b171697ba 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 |