From patchwork Wed Aug 26 14:54:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Grinberg X-Patchwork-Id: 511146 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3F46F1401AF for ; Thu, 27 Aug 2015 11:56:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=compulab.co.il header.i=@compulab.co.il header.b=3j7ETBdh; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B42A44B6B1; Thu, 27 Aug 2015 03:56:12 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R3xvbmMY8ppg; Thu, 27 Aug 2015 03:56:12 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1B95B4B6D7; Thu, 27 Aug 2015 03:55:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ECCC64B6AF for ; Thu, 27 Aug 2015 03:14:23 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HjomjUJnEgas for ; Thu, 27 Aug 2015 03:14:23 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from compulab.co.il (softlayer.compulab.co.il [50.23.254.55]) by theia.denx.de (Postfix) with ESMTPS id 35DA54B6B5 for ; Thu, 27 Aug 2015 03:14:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=compulab.co.il; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=b8bEhT3kzUBornpKNP1+bIgnlYbS4vEgRXykX0PJyMo=; b=3j7ETBdhANpyU1yr5qsVMIUS+iKX+KBsuUQlteaEzFA5EEQyHjWZ0X4IdCjX0pi96LfxvxaXnVVKBdRx2QdXvNahKWghcteZf5fn1uP4ASnPcUamu2HlWImsxUjFZhDiUGy+AEq6FltH56pjDmT5tdmTIp/PJU+WMxuTGLkrCxw=; Received: from [62.90.235.247] (port=58619 helo=zimbra-mta.compulab.co.il) by softlayer.compulab.co.il with esmtp (Exim 4.85) (envelope-from ) id 1ZUllh-000874-R5; Thu, 27 Aug 2015 04:14:18 +0300 Received: from localhost (localhost [127.0.0.1]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id AF049482FE9; Thu, 27 Aug 2015 04:14:16 +0300 (IDT) Received: from zimbra-mta.compulab.co.il ([127.0.0.1]) by localhost (zimbra-mta.compulab.co.il [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id chgEgyHExfbD; Thu, 27 Aug 2015 04:14:15 +0300 (IDT) Received: from localhost (localhost [127.0.0.1]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id 2E3E6482FEC; Thu, 27 Aug 2015 04:14:15 +0300 (IDT) X-Virus-Scanned: amavisd-new at zimbra-mta.compulab.co.il Received: from zimbra-mta.compulab.co.il ([127.0.0.1]) by localhost (zimbra-mta.compulab.co.il [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id tDZLoBMHBPWj; Thu, 27 Aug 2015 04:14:15 +0300 (IDT) Received: from compulab.co.il (grinberg-linux.compulab.local [192.168.11.13]) by zimbra-mta.compulab.co.il (Postfix) with SMTP id DE590482FE7; Thu, 27 Aug 2015 04:14:14 +0300 (IDT) Received: (nullmailer pid 21792 invoked by uid 1000); Wed, 26 Aug 2015 14:54:57 -0000 From: Igor Grinberg To: u-boot@lists.denx.de, Tom Rini Date: Wed, 26 Aug 2015 17:54:49 +0300 Message-Id: <1440600893-20542-7-git-send-email-grinberg@compulab.co.il> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1440600893-20542-1-git-send-email-grinberg@compulab.co.il> References: <1440600893-20542-1-git-send-email-grinberg@compulab.co.il> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - softlayer.compulab.co.il X-AntiAbuse: Original Domain - lists.denx.de X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - compulab.co.il X-Get-Message-Sender-Via: softlayer.compulab.co.il: acl_c_relayhosts_text_entry: grinberg@compulab.co.il|compulab.co.il X-Mailman-Approved-At: Thu, 27 Aug 2015 03:55:48 +0200 Cc: Thomas Weber , Gilles Gameiro , Lars Poeschel , "Albert ARIBAUD \(3ADEV\)" , Enric Balletbo i Serra , Lothar Felten , Ash Charles Subject: [U-Boot] [PATCH 06/10] ti: omap/am: move CONFIG_HUSH_PARSER to defconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Make more use of the Kconfig and move CONFIG_HUSH_PARSER config option to defconfigs for ti omap/am based boards. Signed-off-by: Igor Grinberg Cc: Yegor Yefremov Cc: Enric Balletbo i Serra Cc: Lokesh Vutla Cc: Felipe Balbi Cc: Gilles Gameiro Cc: "Albert ARIBAUD (3ADEV)" Cc: Nikita Kiryanov Cc: Dmitry Lifshitz Cc: Thomas Weber Cc: Ash Charles Cc: Vitaly Andrianov Cc: Steve Sakoman Cc: Grazvydas Ignotas Cc: Nishanth Menon Cc: Lars Poeschel Cc: Lothar Felten --- configs/am335x_baltos_defconfig | 1 + configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_norboot_defconfig | 1 + configs/am335x_evm_spiboot_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am335x_gp_evm_defconfig | 1 + configs/am335x_igep0033_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_qspiboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/beagle_x15_defconfig | 1 + configs/birdland_bav335a_defconfig | 1 + configs/birdland_bav335b_defconfig | 1 + configs/cairo_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/cm_t35_defconfig | 3 ++- configs/cm_t43_defconfig | 3 ++- configs/cm_t54_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/dra72_evm_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_evm_qspiboot_defconfig | 1 + configs/dra7xx_evm_uart3_defconfig | 1 + configs/duovero_defconfig | 1 + configs/igep0020_defconfig | 1 + configs/igep0020_nand_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0030_nand_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/k2e_evm_defconfig | 3 ++- configs/k2hk_evm_defconfig | 3 ++- configs/k2l_evm_defconfig | 3 ++- configs/omap3_beagle_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap3_pandora_defconfig | 1 + configs/omap3_zoom1_defconfig | 1 + configs/omap4_panda_defconfig | 1 + configs/omap4_sdp4430_defconfig | 1 + configs/omap5_uevm_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/pepper_defconfig | 1 + include/config_distro_defaults.h | 2 ++ include/configs/cm_t35.h | 1 - include/configs/ti_armv7_common.h | 1 - 48 files changed, 52 insertions(+), 7 deletions(-) diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 8e8a897..884fdf5 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 96599c6..3358cf8 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 6a39041..d42ce40 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index 9fdffca..3584763 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -5,3 +5,4 @@ CONFIG_NOR_BOOT=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index bbeb3c9..cb96ed3 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index c6109f1..85667f3 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND,SPL_USBETH_SUPPORT" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig index 62d3b6b..3cfc521 100644 --- a/configs/am335x_gp_evm_defconfig +++ b/configs/am335x_gp_evm_defconfig @@ -12,3 +12,4 @@ CONFIG_OF_CONTROL=y CONFIG_SPL_DISABLE_OF_CONTROL=y CONFIG_SPI_FLASH=y CONFIG_RSA=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig index a31982a..fc2f79b 100644 --- a/configs/am335x_igep0033_defconfig +++ b/configs/am335x_igep0033_defconfig @@ -6,3 +6,4 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index f84f57d..a44df2d 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND" # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 2d1a301..393dbe9 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_ETH_SUPPORT" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index ff0109f..d4ae25f 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 2a6c3dc..ae8ac44 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_USB_HOST_SUPPORT" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/beagle_x15_defconfig b/configs/beagle_x15_defconfig index 3b3c027..d8344f0 100644 --- a/configs/beagle_x15_defconfig +++ b/configs/beagle_x15_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 244c770..37e8180 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index a86b203..05bcc26 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 756457c..b5a66ce 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -8,3 +8,4 @@ CONFIG_SPL=y # CONFIG_CMD_FPGA is not set # CONFIG_CMD_NET is not set CONFIG_SYS_PROMPT="Cairo # " +CONFIG_HUSH_PARSER=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 4f4bd0b..81aa52d 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -5,3 +5,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SYS_PROMPT="CM-T335 # " +CONFIG_HUSH_PARSER=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 99dd2f4..966b81f 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -2,8 +2,9 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_CM_T35=y CONFIG_SPL=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="CM-T3x # " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set -CONFIG_SYS_PROMPT="CM-T3x # " diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 19ac18a..242b8c7 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -1,10 +1,11 @@ CONFIG_ARM=y CONFIG_TARGET_CM_T43=y CONFIG_SPL=y +CONFIG_HUSH_PARSER=y +# CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set -# CONFIG_CMD_FLASH is not set # CONFIG_CMD_NFS is not set CONFIG_DM=y CONFIG_DM_GPIO=y diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig index fc72ffa..fd4b3f3 100644 --- a/configs/cm_t54_defconfig +++ b/configs/cm_t54_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="CM-T54 # " +CONFIG_HUSH_PARSER=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 60ead72..cdb7b99 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 3205e72..fa06116 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -15,3 +15,4 @@ CONFIG_DM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_DM_GPIO=y +CONFIG_HUSH_PARSER=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index f98e7b7..952d146 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -10,3 +10,4 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y +CONFIG_HUSH_PARSER=y diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index f14fa62..6de333a 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index 8882260..f4ba4ac 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SPL_YMODEM_SUPPORT" # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig index d3de28a..58d86e1 100644 --- a/configs/duovero_defconfig +++ b/configs/duovero_defconfig @@ -7,3 +7,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="duovero # " +CONFIG_HUSH_PARSER=y diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index e45e83c..d1dd75e 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig index 75fabef..4bda465 100644 --- a/configs/igep0020_nand_defconfig +++ b/configs/igep0020_nand_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 1bb7a6f..ebaff74 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig index ed01766..85ef454 100644 --- a/configs/igep0030_nand_defconfig +++ b/configs/igep0030_nand_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index bfa15d7..37937dc 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index c4cbadd..e1bec71 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -2,8 +2,9 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y CONFIG_TARGET_K2E_EVM=y CONFIG_SPL=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="K2E EVM # " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y -CONFIG_SYS_PROMPT="K2E EVM # " diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index a604939..6e62326 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -2,8 +2,9 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y CONFIG_TARGET_K2HK_EVM=y CONFIG_SPL=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="K2HK EVM # " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y -CONFIG_SYS_PROMPT="K2HK EVM # " diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index a687e0c..8a3f447 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -2,8 +2,9 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y CONFIG_TARGET_K2L_EVM=y CONFIG_SPL=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="K2L EVM # " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y -CONFIG_SYS_PROMPT="K2L EVM # " diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index dde076a..e0b8f4f 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -5,3 +5,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 5d03485..8f7b4de 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -9,3 +9,4 @@ CONFIG_SPL=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="Overo # " +CONFIG_HUSH_PARSER=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index 4fb7899..93dde54 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -9,3 +9,4 @@ CONFIG_TARGET_OMAP3_PANDORA=y # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set CONFIG_SYS_PROMPT="Pandora # " +CONFIG_HUSH_PARSER=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index 9efd6de..654d94b 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -6,3 +6,4 @@ CONFIG_TARGET_OMAP3_ZOOM1=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 1be285d..0683fe2 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -6,3 +6,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index b369d1d..248863f 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_OMAP44XX=y CONFIG_TARGET_OMAP4_SDP4430=y CONFIG_SPL=y +CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 15221ad..338d62c 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -5,3 +5,4 @@ CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index 2f1022c..aaf4632 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="REV1" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index 61d94b8..e02780c 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="REV3" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 38add54..3fdadde 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -4,3 +4,4 @@ CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig index 787c5f9..300c147 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -5,3 +5,4 @@ CONFIG_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SYS_PROMPT="pepper# " +CONFIG_HUSH_PARSER=y diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index d8165cc..7503bff 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -66,6 +66,8 @@ #define CONFIG_DOS_PARTITION #define CONFIG_EFI_PARTITION #define CONFIG_SUPPORT_RAW_INITRD +#ifndef CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_HUSH_PARSER +#endif #endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index e5fb474..3ff138f 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -220,7 +220,6 @@ #define CONFIG_TIMESTAMP #define CONFIG_SYS_AUTOLOAD "no" #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 18fca02..6dde989 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -114,7 +114,6 @@ #else #define CONFIG_SYS_MALLOC_LEN (16 << 20) #endif -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_BAUDRATE 115200 #define CONFIG_ENV_VARS_UBOOT_CONFIG /* Strongly encouraged */