kconfig: Move REGEX to Kconfig

Having this as a Kconfig allows it to be a dependent feature.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/acadia_defconfig b/configs/acadia_defconfig
index 26221ce4e0b5054b0cf7ae3d9fc77dcb03ee02de..4e0d81c81e70005f1acc89df36a8a902e9042fc6 100644 (file)
--- a/configs/acadia_defconfig
+++ b/configs/acadia_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_ACADIA=y
+CONFIG_REGEX=y

diff --git a/configs/bamboo_defconfig b/configs/bamboo_defconfig
index 1d66807df8dd73e17718fd496d286eed330d4a93..df4adb69628506fcdc06e5025260ae916b2b171d 100644 (file)
--- a/configs/bamboo_defconfig
+++ b/configs/bamboo_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_BAMBOO=y
+CONFIG_REGEX=y

diff --git a/configs/bubinga_defconfig b/configs/bubinga_defconfig
index 65ea4d1f7cc87667f571abb289a06c8e7872ce32..532448d09a670c13a929f8500988f6e5d7fdb8f0 100644 (file)
--- a/configs/bubinga_defconfig
+++ b/configs/bubinga_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_BUBINGA=y
+CONFIG_REGEX=y

diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig
index 44d4fbdb9dbfa37f0dfb48e011fe6221dfefd2b3..e936d7b130b0a27bdb53c814938a0a33589f393b 100644 (file)
--- a/configs/canyonlands_defconfig
+++ b/configs/canyonlands_defconfig
@@ -5,3 +5,4 @@ CONFIG_CANYONLANDS=y
 CONFIG_DEFAULT_DEVICE_TREE="canyonlands"
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_REGEX=y

diff --git a/configs/dlvision-10g_defconfig b/configs/dlvision-10g_defconfig
index 1d2a5718b05148b20be86b875510536e82d657aa..2f508c37f517334f16840b2ad210c6d0ed9c4c3a 100644 (file)
--- a/configs/dlvision-10g_defconfig
+++ b/configs/dlvision-10g_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_DLVISION_10G=y
+CONFIG_REGEX=y

diff --git a/configs/dlvision_defconfig b/configs/dlvision_defconfig
index c0317dcf09ef38300d46cc2f92c3fd0154ecda54..3149cb1e3b71e737ce371923aa52ba6991d159ee 100644 (file)
--- a/configs/dlvision_defconfig
+++ b/configs/dlvision_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_DLVISION=y
+CONFIG_REGEX=y

diff --git a/configs/ebony_defconfig b/configs/ebony_defconfig
index db93555b9e7e7a538a7cf4e2a8d0b04396ec30c6..bf2dab65dff4ea1dc8b67bd467399f78958ea927 100644 (file)
--- a/configs/ebony_defconfig
+++ b/configs/ebony_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_EBONY=y
+CONFIG_REGEX=y

diff --git a/configs/gdppc440etx_defconfig b/configs/gdppc440etx_defconfig
index 1097b9c1576ab6d1abe2f166664c542f4bd90f28..5aa579aa60314b67ede08ecd151497d8c17361a9 100644 (file)
--- a/configs/gdppc440etx_defconfig
+++ b/configs/gdppc440etx_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_GDPPC440ETX=y
+CONFIG_REGEX=y

diff --git a/configs/icon_defconfig b/configs/icon_defconfig
index 771a0932503288478bc90468dc2445f55d877b71..caf7c2349791d23ea185b3c2f396d413a37c9cf3 100644 (file)
--- a/configs/icon_defconfig
+++ b/configs/icon_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_ICON=y
+CONFIG_REGEX=y

diff --git a/configs/intip_defconfig b/configs/intip_defconfig
index d6af774363f797c2529ff08b977dcf88c825ab0e..79360af07a92350ca64d63c064f825ed82d5031c 100644 (file)
--- a/configs/intip_defconfig
+++ b/configs/intip_defconfig
@@ -2,3 +2,4 @@ CONFIG_SYS_EXTRA_OPTIONS="INTIB"
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_INTIP=y
+CONFIG_REGEX=y

diff --git a/configs/io64_defconfig b/configs/io64_defconfig
index 1111e54e9d6427bcf645807c180aa861c2d6b37d..9c0566eb202f86eec3582e11cdd6c9b99a1a8f39 100644 (file)
--- a/configs/io64_defconfig
+++ b/configs/io64_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_IO64=y
+CONFIG_REGEX=y

diff --git a/configs/io_defconfig b/configs/io_defconfig
index 959af75a1e88a6a835813d216bffc102df9c8f3f..5037ff3c6ad5b6e71fa4085313a84638753a84c4 100644 (file)
--- a/configs/io_defconfig
+++ b/configs/io_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_IO=y
+CONFIG_REGEX=y

diff --git a/configs/iocon_defconfig b/configs/iocon_defconfig
index 6dc88874fad6b3b963f034fd527c7e6587810a9c..72956d479c8c97fc118564de564fceb92cc0f3e2 100644 (file)
--- a/configs/iocon_defconfig
+++ b/configs/iocon_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_IOCON=y
+CONFIG_REGEX=y

diff --git a/configs/katmai_defconfig b/configs/katmai_defconfig
index 849231492b727cce7186815d930d8ca314eb8dff..02cff2f79a63991738a7b2b6eb5470a6b34732bf 100644 (file)
--- a/configs/katmai_defconfig
+++ b/configs/katmai_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_KATMAI=y
+CONFIG_REGEX=y

diff --git a/configs/kilauea_defconfig b/configs/kilauea_defconfig
index 28021d99c3ab934d33138323116656d9d78e0b1c..6285fdfa2da2eb5398c01ac99aafffc84ddcebc5 100644 (file)
--- a/configs/kilauea_defconfig
+++ b/configs/kilauea_defconfig
@@ -2,3 +2,4 @@ CONFIG_SYS_EXTRA_OPTIONS="KILAUEA"
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_KILAUEA=y
+CONFIG_REGEX=y

diff --git a/configs/luan_defconfig b/configs/luan_defconfig
index d42b4a902f872993dce506c9a44b34082328088c..3ca5ad15213a198916347889a6283742d651bf32 100644 (file)
--- a/configs/luan_defconfig
+++ b/configs/luan_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_LUAN=y
+CONFIG_REGEX=y

diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig
index d902434f2ed44645c1ec25ca8edf36a8317aed41..85ede57e045f8b16181ce64f604c046cb197a104 100644 (file)
--- a/configs/m28evk_defconfig
+++ b/configs/m28evk_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 CONFIG_ARM=y
 CONFIG_TARGET_M28EVK=y
+CONFIG_REGEX=y

diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig
index 1d7933bb8bc7149f961bc08d0cc0a26b543713fe..a61e2d1e052181ec050532537bdaca2806c83457 100644 (file)
--- a/configs/m53evk_defconfig
+++ b/configs/m53evk_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/denx/m53evk/imximage.cfg"
 CONFIG_ARM=y
 CONFIG_TARGET_M53EVK=y
+CONFIG_REGEX=y

diff --git a/configs/makalu_defconfig b/configs/makalu_defconfig
index ed9b82d5030ccd434674350b7ccd0ee99bb24029..18c7a20eda64cf4ae3214a8448ac173c4982d637 100644 (file)
--- a/configs/makalu_defconfig
+++ b/configs/makalu_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_MAKALU=y
+CONFIG_REGEX=y

diff --git a/configs/neo_defconfig b/configs/neo_defconfig
index 2a192477313021c83a3090b28b401f843c4299d2..bc2835362cf9124e8bb2c7eff689affc244eef8f 100644 (file)
--- a/configs/neo_defconfig
+++ b/configs/neo_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_NEO=y
+CONFIG_REGEX=y

diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index ba120753f0b1e0d5bcca24a30adacb6e66acc81d..e05c4dcee08bfe5655dbe3c320623de9d35548c5 100644 (file)
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_ARM=y
 CONFIG_TARGET_KOSAGI_NOVENA=y
+CONFIG_REGEX=y

diff --git a/configs/ocotea_defconfig b/configs/ocotea_defconfig
index 34518cd457f3e1350d6a58aebafc6e7b29e0f29e..c0fa6ce1025de5f8a73ec8f2d4b7cfdca0d6a57a 100644 (file)
--- a/configs/ocotea_defconfig
+++ b/configs/ocotea_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_OCOTEA=y
+CONFIG_REGEX=y

diff --git a/configs/redwood_defconfig b/configs/redwood_defconfig
index ad87d0eb4ae076fb9877aa337d85d523a8e9bc0d..36840dd944a1510412e68b76e5e209be45288a06 100644 (file)
--- a/configs/redwood_defconfig
+++ b/configs/redwood_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_REDWOOD=y
+CONFIG_REGEX=y

diff --git a/configs/sequoia_defconfig b/configs/sequoia_defconfig
index 678c2bb5d14e832b2c723fbf4f5597657b3c426b..19ac985a856f4e1b92732d3f893edcd57a2e0b38 100644 (file)
--- a/configs/sequoia_defconfig
+++ b/configs/sequoia_defconfig
@@ -2,3 +2,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA"
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_SEQUOIA=y
+CONFIG_REGEX=y

diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
index d658a503c90467457f88d6bfc39372af9b9302b1..3ef6b88635ed164764a4fb3fe53a21b4b273b983 100644 (file)
--- a/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@ -4,3 +4,4 @@ CONFIG_ARCH_SOCFPGA=y
 CONFIG_TARGET_SOCFPGA_ARRIA5=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
+CONFIG_REGEX=y

diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index a67b0c150dc3088f27e84479771457b09fdbeddd..d68e1c0fec0a7d9cf7af69ee950e31bdc384be25 100644 (file)
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -7,3 +7,4 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_NETDEVICES=y
 CONFIG_NET=y
+CONFIG_REGEX=y

diff --git a/configs/t3corp_defconfig b/configs/t3corp_defconfig
index c61508af345e1bbcfe01f97ddc490a25c7ac11a3..beac6239312b5a33797ea5dc792a98c4db94bfad 100644 (file)
--- a/configs/t3corp_defconfig
+++ b/configs/t3corp_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_T3CORP=y
+CONFIG_REGEX=y

diff --git a/configs/taihu_defconfig b/configs/taihu_defconfig
index ac837251304199b2add101f5735bf86a862610f8..42126f5fa30ef2bce7d5355db5662a53ae6bee42 100644 (file)
--- a/configs/taihu_defconfig
+++ b/configs/taihu_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_TAIHU=y
+CONFIG_REGEX=y

diff --git a/configs/taishan_defconfig b/configs/taishan_defconfig
index e956c6f85600761c6d7235f68a94c9945975c15d..81fe19d9a1ab9642d9070138292ee872a23a28fd 100644 (file)
--- a/configs/taishan_defconfig
+++ b/configs/taishan_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_TAISHAN=y
+CONFIG_REGEX=y

diff --git a/configs/walnut_defconfig b/configs/walnut_defconfig
index 844e67fe3a6baf0e99af085241622c365c39df80..c5b302e32eaf937c597dd74e971126d3d008731e 100644 (file)
--- a/configs/walnut_defconfig
+++ b/configs/walnut_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_WALNUT=y
+CONFIG_REGEX=y

diff --git a/configs/yosemite_defconfig b/configs/yosemite_defconfig
index d5eea68c04a4cb1086c25f9bf5e0fdc33acdd3c8..554b8dc6dbe70e35e6cdf8105f5f2e18dbb7d45a 100644 (file)
--- a/configs/yosemite_defconfig
+++ b/configs/yosemite_defconfig
@@ -2,3 +2,4 @@ CONFIG_SYS_EXTRA_OPTIONS="YOSEMITE"
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_YOSEMITE=y
+CONFIG_REGEX=y

diff --git a/configs/yucca_defconfig b/configs/yucca_defconfig
index 6c8e20a36e9bc703603885398f41cb7ec0da8b79..ed42523db29c94807443c7787c1a5245a26fcbb7 100644 (file)
--- a/configs/yucca_defconfig
+++ b/configs/yucca_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_YUCCA=y
+CONFIG_REGEX=y

diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index d5b6e37a38fd882adef40f1d70c36b1a310da98d..9e7f37dda94a9a693face089bc582b6ea81dc33e 100644 (file)
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -106,7 +106,6 @@
 #define CONFIG_LOADS_ECHO              /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   /* allow baudrate change        */
 
-#define CONFIG_REGEX                   /* Enable regular expression support */
 /*
  * BOOTP options
  */

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 5c209913e544e01ff713c1ee98c15d7e3acf638e..dbc00ce71369fc1f7a7cc85fb311017c26f5003e 100644 (file)
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -49,7 +49,6 @@
 #define CONFIG_CMD_USB
 #define        CONFIG_VIDEO
 
-#define CONFIG_REGEX                   /* Enable regular expression support */
 
 /* Memory configuration */
 #define CONFIG_NR_DRAM_BANKS           1               /* 1 bank of DRAM */

diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index c348d38c325ba309074a1e73e1348cf779bb1dd1..0cc1282281a6044df0df9468f2e3c5792b3eaafd 100644 (file)
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -51,7 +51,6 @@
 #define CONFIG_CMD_USB
 #define CONFIG_VIDEO
 
-#define CONFIG_REGEX                   /* Enable regular expression support */
 
 /*
  * Memory configurations

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 5f834690f3bb0182b4d280a485e68318d3568534..425db8adee409aa757c9859d66cc74fd93b4b13a 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -22,7 +22,6 @@
 #define CONFIG_KEYBOARD
 #define CONFIG_MXC_GPIO
 #define CONFIG_OF_LIBFDT
-#define CONFIG_REGEX
 #define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_SYS_NO_FLASH
 

diff --git a/include/configs/socfpga_arria5.h b/include/configs/socfpga_arria5.h
index 668a91e1161bfdd3e5a33a89917a2d72b4ec3b71..b8e1c47651cf8c75a789887d96145d95014d45cc 100644 (file)
--- a/include/configs/socfpga_arria5.h
+++ b/include/configs/socfpga_arria5.h
@@ -37,7 +37,6 @@
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_USB_MASS_STORAGE
 
-#define CONFIG_REGEX                   /* Enable regular expression support */
 
 /* Memory configurations */
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB on SoCDK */

diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
index 676144a668aa2acf2cf2ebabd102afdb430fb1e3..1227711f32c70de8db00c5963d5387ac7fc03470 100644 (file)
--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@@ -37,7 +37,6 @@
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_USB_MASS_STORAGE
 
-#define CONFIG_REGEX                   /* Enable regular expression support */
 
 /* Memory configurations */
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB on SoCDK */

diff --git a/lib/Kconfig b/lib/Kconfig
index d7fd21928db595a84bc8ce06fb566bd634e616ad..0454a86a02511625eb0a8b4d41ce5a1e42baf0f4 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -36,6 +36,14 @@ config SYS_VSNPRINTF
          Thumb-2, about 420 bytes). Enable this option for safety when
          using sprintf() with data you do not control.
 
+config REGEX
+       bool "Enable regular expression support"
+       help
+         If this variable is defined, U-Boot is linked against the
+         SLRE (Super Light Regular Expression) library, which adds
+         regex support to some commands, for example "env grep" and
+         "setexpr".
+
 source lib/rsa/Kconfig
 
 menu "Hashing Support"