Remove unnecessary use of hush header file

Some files include hush.h but don't actually use it. Remove this where
possible.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
index d4711c070c3ddaef84740c608d75cb0d6c5617bd..093750626886d48c1c3f3a99077506eb21c2d0e2 100644 (file)
--- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
@@ -13,7 +13,6 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/kirkwood.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/kirkwood.h>

-#include <hush.h>

 
 #define BUFLEN 16
 
 
 #define BUFLEN 16
 

diff --git a/arch/arm/cpu/arm926ejs/orion5x/cpu.c b/arch/arm/cpu/arm926ejs/orion5x/cpu.c
index b55c5f09433b776614cefa407be521a2a3446c58..f88db3b1f96ad400fdf47c0e3bbd83f91a46ed6a 100644 (file)
--- a/arch/arm/cpu/arm926ejs/orion5x/cpu.c
+++ b/arch/arm/cpu/arm926ejs/orion5x/cpu.c
@@ -15,7 +15,6 @@
 #include <asm/io.h>
 #include <u-boot/md5.h>
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
 #include <u-boot/md5.h>
 #include <asm/arch/cpu.h>

-#include <hush.h>

 
 #define BUFLEN 16
 
 
 #define BUFLEN 16
 

diff --git a/board/ait/cam_enc_4xx/cam_enc_4xx.c b/board/ait/cam_enc_4xx/cam_enc_4xx.c
index 7e1b16ac4655317e121fe46e5adf5159bd86f10d..b5cc3ed36356bcb51a46ebcea819ab4e8815eb71 100644 (file)
--- a/board/ait/cam_enc_4xx/cam_enc_4xx.c
+++ b/board/ait/cam_enc_4xx/cam_enc_4xx.c
@@ -9,7 +9,6 @@
 
 #include <common.h>
 #include <errno.h>
 
 #include <common.h>
 #include <errno.h>

-#include <hush.h>

 #include <linux/mtd/nand.h>
 #include <nand.h>
 #include <miiphy.h>
 #include <linux/mtd/nand.h>
 #include <nand.h>
 #include <miiphy.h>

diff --git a/board/mcc200/auto_update.c b/board/mcc200/auto_update.c
index 2f622b0846e103f5b3036322269e5577ca451427..43173ce060d56817353595d681bbf531cba1c76a 100644 (file)
--- a/board/mcc200/auto_update.c
+++ b/board/mcc200/auto_update.c
@@ -12,11 +12,6 @@
 #include <usb.h>
 #include <part.h>
 
 #include <usb.h>
 #include <part.h>
 

-#ifdef CONFIG_SYS_HUSH_PARSER
-#include <hush.h>
-#endif
-
-

 #ifdef CONFIG_AUTO_UPDATE
 
 #ifndef CONFIG_USB_OHCI
 #ifdef CONFIG_AUTO_UPDATE
 
 #ifndef CONFIG_USB_OHCI


@@ -247,7 +242,7 @@ int au_do_update(int idx, long sz)
                /* parse_string_outer() runs off the end. */
                addr[image_get_data_size (hdr)] = 0;
                addr += 8;
                /* parse_string_outer() runs off the end. */
                addr[image_get_data_size (hdr)] = 0;
                addr += 8;

-               parse_string_outer(addr, FLAG_PARSE_SEMICOLON);
+               run_command_list(addr, -1, 0);

                return 0;
        }
 
                return 0;
        }
 

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 34b4b583baafc1bb0ca62df3ea89fc7bb2ae2da9..449bb363f554a622d11834dbc149b2951185c6c1 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -32,10 +32,6 @@
 #include <usb.h>
 #endif
 
 #include <usb.h>
 #endif
 

-#ifdef CONFIG_SYS_HUSH_PARSER
-#include <hush.h>
-#endif
-

 #if defined(CONFIG_OF_LIBFDT)
 #include <libfdt.h>
 #include <fdt_support.h>
 #if defined(CONFIG_OF_LIBFDT)
 #include <libfdt.h>
 #include <fdt_support.h>

diff --git a/common/cmd_bootmenu.c b/common/cmd_bootmenu.c
index 163d5b2e2bdb1119e9f3f8f54ec0e43635726557..5879065c2ea45cc7b9731884aad1aa9a95128340 100644 (file)
--- a/common/cmd_bootmenu.c
+++ b/common/cmd_bootmenu.c
@@ -8,7 +8,6 @@
 #include <command.h>
 #include <ansi.h>
 #include <menu.h>
 #include <command.h>
 #include <ansi.h>
 #include <menu.h>

-#include <hush.h>

 #include <watchdog.h>
 #include <malloc.h>
 #include <linux/string.h>
 #include <watchdog.h>
 #include <malloc.h>
 #include <linux/string.h>