summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-06-21 02:11:18 +0900
committerTom Rini <trini@konsulko.com>2016-06-24 17:24:33 -0400
commitb88d6f761445df5fd9d2dfe8eb5e32891a3843f0 (patch)
tree5c8125952e902970153ff7275d2241a70e0d0473
parent62f8183f6adee9df47d6d3c02bf19809117dcbad (diff)
downloadtalos-obmc-uboot-b88d6f761445df5fd9d2dfe8eb5e32891a3843f0.tar.gz
talos-obmc-uboot-b88d6f761445df5fd9d2dfe8eb5e32891a3843f0.zip
Move CONFIG_SYS_HUSH_PARSER to Kconfig for last 4 boards
I still see some defines of this config in board headers. Move them to defconfigs (+ renaming to CONFIG_HUSH_PARSER) to complete this migration. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--configs/gurnard_defconfig1
-rw-r--r--configs/odroid-c2_defconfig1
-rw-r--r--configs/s32v234evb_defconfig1
-rw-r--r--configs/tplink_wdr4300_defconfig1
-rw-r--r--include/configs/meson-gxbb-common.h1
-rw-r--r--include/configs/s32v234evb.h1
-rw-r--r--include/configs/snapper9g45.h1
-rw-r--r--include/configs/tplink_wdr4300.h1
8 files changed, 4 insertions, 4 deletions
diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig
index 80f0013bf4..d74757c85d 100644
--- a/configs/gurnard_defconfig
+++ b/configs/gurnard_defconfig
@@ -5,6 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-gurnard"
CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45"
CONFIG_BOOTDELAY=3
+CONFIG_HUSH_PARSER=y
# CONFIG_CMD_BDI is not set
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig
index 483d4900b7..808bbc2b89 100644
--- a/configs/odroid-c2_defconfig
+++ b/configs/odroid-c2_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_MESON=y
CONFIG_MESON_GXBB=y
CONFIG_TARGET_ODROID_C2=y
CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-odroidc2"
+CONFIG_HUSH_PARSER=y
# CONFIG_CMD_BDI is not set
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
diff --git a/configs/s32v234evb_defconfig b/configs/s32v234evb_defconfig
index 847de635b5..dfedf82f57 100644
--- a/configs/s32v234evb_defconfig
+++ b/configs/s32v234evb_defconfig
@@ -2,5 +2,6 @@ CONFIG_ARM=y
CONFIG_TARGET_S32V234EVB=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/s32v234evb/s32v234evb.cfg"
+CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/tplink_wdr4300_defconfig b/configs/tplink_wdr4300_defconfig
index a69c0b63b1..ed6239b59d 100644
--- a/configs/tplink_wdr4300_defconfig
+++ b/configs/tplink_wdr4300_defconfig
@@ -7,6 +7,7 @@ CONFIG_ARCH_ATH79=y
CONFIG_BOARD_TPLINK_WDR4300=y
CONFIG_DEFAULT_DEVICE_TREE="tplink_wdr4300"
CONFIG_BOOTDELAY=3
+CONFIG_HUSH_PARSER=y
# CONFIG_CMD_ELF is not set
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_XIMG is not set
diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h
index d1c0050677..eaf6a9c08a 100644
--- a/include/configs/meson-gxbb-common.h
+++ b/include/configs/meson-gxbb-common.h
@@ -35,7 +35,6 @@
/* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 9723bab77e..13eac75f8d 100644
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -190,7 +190,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_PROMPT "=> "
#undef CONFIG_AUTO_COMPLETE
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index ddfbcec980..8344f15920 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -136,7 +136,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_HUSH_PARSER
/* U-Boot memory settings */
#define CONFIG_SYS_MALLOC_LEN (1 << 20)
diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h
index 74a9a098a0..b2ccb70023 100644
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -60,7 +60,6 @@
#define CONFIG_VERSION_VARIABLE /* U-BOOT version */
#define CONFIG_AUTO_COMPLETE /* Command auto complete */
#define CONFIG_CMDLINE_EDITING /* Command history etc */
-#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
/* USB, USB storage, USB ethernet */
OpenPOWER on IntegriCloud