[U-Boot] [PATCH] Convert CONFIG LIB_HW_RAND to Kconfig

Adam Ford aford173 at gmail.com
Tue Feb 6 16:18:18 UTC 2018 

config_fallbacks.h had some logic to automatically select
LIB_RAND if RANDOM_UUID or CMD_UUID were set if LIB_HW_RAND wasn't
already selected.  By migrating LIB_HW_RAND to Kconfig, we can
remove this check from config_fallbacks.h and put it into Kconfig

Signed-off-by: Adam Ford <aford173 at gmail.com>
---
 configs/ds414_defconfig         | 1 +
 configs/odroid_defconfig        | 2 ++
 configs/trats2_defconfig        | 2 ++
 configs/trats_defconfig         | 2 ++
 include/config_fallbacks.h      | 7 -------
 include/configs/ds414.h         | 1 -
 include/configs/odroid.h        | 1 -
 include/configs/thunderx_88xx.h | 1 -
 include/configs/trats.h         | 1 -
 include/configs/trats2.h        | 1 -
 lib/Kconfig                     | 8 +++++++-
 scripts/config_whitelist.txt    | 1 -
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig
index eb3fe75..47d0377 100644
--- a/configs/ds414_defconfig
+++ b/configs/ds414_defconfig
@@ -48,3 +48,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
+CONFIG_LIB_RAND=y
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index 30889c0..14e9283 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -62,4 +62,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_FUNCTION_THOR=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_LIB_RAND=y
+CONFIG_LIB_HW_RAND=y
 CONFIG_ERRNO_STR=y
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index e28cad5..2cc7c9b 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -54,3 +54,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_FUNCTION_THOR=y
+CONFIG_LIB_RAND=y
+CONFIG_LIB_HW_RAND=y
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index 6ae39c1..f26e8ef 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -53,3 +53,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_FUNCTION_THOR=y
+CONFIG_LIB_RAND=y
+CONFIG_LIB_HW_RAND=y
diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index 9695ee7..c11abe6 100644
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -54,13 +54,6 @@
 #define CONFIG_LIB_UUID
 #endif
 
-#if (defined(CONFIG_RANDOM_UUID) || \
-	defined(CONFIG_CMD_UUID)) && \
-	(!defined(CONFIG_LIB_RAND) && \
-	!defined(CONFIG_LIB_HW_RAND))
-#define CONFIG_LIB_RAND
-#endif
-
 /* Console I/O Buffer Size */
 #ifndef CONFIG_SYS_CBSIZE
 #if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index c840c93..b795189 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -113,7 +113,6 @@
 #define CONFIG_DDR_32BIT
 
 /* Use random ethernet address if not configured */
-#define CONFIG_LIB_RAND
 #define CONFIG_NET_RANDOM_ETHADDR
 
 /* Default Environment */
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 60ed013..697e798 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -177,7 +177,6 @@
 
 /* Security subsystem - enable hw_rand() */
 #define CONFIG_EXYNOS_ACE_SHA
-#define CONFIG_LIB_HW_RAND
 
 /* USB */
 #define CONFIG_USB_EHCI_EXYNOS
diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index 34940ef..1f0b9d4 100644
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -77,7 +77,6 @@
 #define CONFIG_CMDLINE_EDITING		1
 #define CONFIG_SYS_MAXARGS		64		/* max command args */
 #define CONFIG_NO_RELOCATION		1
-#define CONFIG_LIB_RAND
 #define PLL_REF_CLK			50000000	/* 50 MHz */
 #define NS_PER_REF_CLK_TICK		(1000000000/PLL_REF_CLK)
 
diff --git a/include/configs/trats.h b/include/configs/trats.h
index b97efc2..465eed0 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -171,7 +171,6 @@
 
 /* Security subsystem - enable hw_rand() */
 #define CONFIG_EXYNOS_ACE_SHA
-#define CONFIG_LIB_HW_RAND
 
 /* Common misc for Samsung */
 #define CONFIG_MISC_COMMON
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 871accf..b9bf918 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -153,7 +153,6 @@
 
 /* Security subsystem - enable hw_rand() */
 #define CONFIG_EXYNOS_ACE_SHA
-#define CONFIG_LIB_HW_RAND
 
 /* Common misc for Samsung */
 #define CONFIG_MISC_COMMON
diff --git a/lib/Kconfig b/lib/Kconfig
index 710deb7..8b8d5b8 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -66,10 +66,16 @@ config REGEX
 	  "setexpr".
 
 config LIB_RAND
-	bool "Pseudo-random library support "
+	bool "Pseudo-random library support"
+	default y if (RANDOM_UUID || CMD_UUID) && !LIB_HW_RAND
 	help
 	  This library provides pseudo-random number generator functions.
 
+config LIB_HW_RAND
+	bool "HW Engine for random libray support"
+	help
+	  Select this if hardware engine is available for random library support
+
 config SPL_TINY_MEMSET
 	bool "Use a very small memset() in SPL"
 	help
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 33ef985..4cde67c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1217,7 +1217,6 @@ CONFIG_LEGACY_BOOTCMD_ENV
 CONFIG_LG4573
 CONFIG_LG4573_BUS
 CONFIG_LG4573_CS
-CONFIG_LIB_HW_RAND
 CONFIG_LIB_UUID
 CONFIG_LINUX
 CONFIG_LINUX_RESET_VEC
-- 
2.7.4

More information about the U-Boot mailing list