summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-04-10 20:01:24 -0600
committerTom Rini <trini@ti.com>2014-05-29 17:45:31 -0400
commiteca86fad3d823c3c1e7e78b07752aa6a10e35283 (patch)
tree2cae72efd4bd45c45a0164b2c9cdf372a387b546
parentae4223f4444d7e673ff6b4a066c8584858629025 (diff)
downloadu-boot-imx-eca86fad3d823c3c1e7e78b07752aa6a10e35283.zip
u-boot-imx-eca86fad3d823c3c1e7e78b07752aa6a10e35283.tar.gz
u-boot-imx-eca86fad3d823c3c1e7e78b07752aa6a10e35283.tar.bz2
Rename hush to cli_hush
Hush is a command-line interpreter, so rename it to make that clearer. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--board/keymile/common/common.c2
-rw-r--r--board/keymile/common/ivm.c2
-rw-r--r--common/Makefile2
-rw-r--r--common/cli_hush.c (renamed from common/hush.c)4
-rw-r--r--common/main.c2
-rw-r--r--include/cli_hush.h (renamed from include/hush.h)4
6 files changed, 8 insertions, 8 deletions
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index f941e44..2ddb3da 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -12,7 +12,7 @@
#include <ioports.h>
#include <command.h>
#include <malloc.h>
-#include <hush.h>
+#include <cli_hush.h>
#include <net.h>
#include <netdev.h>
#include <asm/io.h>
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
index f0e91bb..bffc08b 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -6,7 +6,7 @@
*/
#include <common.h>
-#include <hush.h>
+#include <cli_hush.h>
#include <i2c.h>
#include "common.h"
diff --git a/common/Makefile b/common/Makefile
index 219cb51..da184a8 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -11,7 +11,7 @@ obj-y += main.o
obj-y += command.o
obj-y += exports.o
obj-y += hash.o
-obj-$(CONFIG_SYS_HUSH_PARSER) += hush.o
+obj-$(CONFIG_SYS_HUSH_PARSER) += cli_hush.o
obj-y += s_record.o
obj-y += xyzModem.o
obj-y += cmd_disk.o
diff --git a/common/hush.c b/common/cli_hush.c
index 5b43224..012004a 100644
--- a/common/hush.c
+++ b/common/cli_hush.c
@@ -79,7 +79,7 @@
#include <malloc.h> /* malloc, free, realloc*/
#include <linux/ctype.h> /* isalpha, isdigit */
#include <common.h> /* readline */
-#include <hush.h>
+#include <cli_hush.h>
#include <command.h> /* find_cmd */
#ifndef CONFIG_SYS_PROMPT_HUSH_PS2
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
@@ -222,7 +222,7 @@ struct child_prog {
#endif
char **argv; /* program name and arguments */
/* was quoted when parsed; copy of struct o_string.nonnull field */
- int *argv_nonnull;
+ int *argv_nonnull;
#ifdef __U_BOOT__
int argc; /* number of program arguments */
#endif
diff --git a/common/main.c b/common/main.c
index 9bee7bd..a80fb7c 100644
--- a/common/main.c
+++ b/common/main.c
@@ -14,7 +14,7 @@
#include <common.h>
#include <command.h>
#include <fdtdec.h>
-#include <hush.h>
+#include <cli_hush.h>
#include <malloc.h>
#include <menu.h>
#include <post.h>
diff --git a/include/hush.h b/include/cli_hush.h
index 595303a..4951eef 100644
--- a/include/hush.h
+++ b/include/cli_hush.h
@@ -5,8 +5,8 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef _HUSH_H_
-#define _HUSH_H_
+#ifndef _CLI_HUSH_H_
+#define _CLI_HUSH_H_
#define FLAG_EXIT_FROM_LOOP 1
#define FLAG_PARSE_SEMICOLON (1 << 1) /* symbol ';' is special for parser */