GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux/kconfig.h: remove unused helper macros

Browse source 
U-Boot does not have loadable modules, and nothing currently uses any
of the (CONFIG_)?IS_(BUILTIN|MODULE) macros - only
the (CONFIG_)?IS_ENABLED variants are ever used.

While I understand the desire to keep this somewhat synchronized with
linux, we've already departed by the introduction of the
CONFIG_IS_ENABLED extra logic, and deleting these makes the next patch
much simpler, since I won't have to duplicate a lot of logic for no
real gain (as there are no users).

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Rasmus Villemoes 2020-07-03 10:37:05 -06:00 • committed by Bin Meng
parent b4f73886c4
commit 7d78a4547d
2 changed files with 6 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
include/linux/kconfig.h
View file

@ -23,25 +23,12 @@
#define ___config_enabled(__ignored, val, ...) val #define ___config_enabled(__ignored, val, ...) val
/* /*
* IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm', * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y',
* 0 otherwise. * 0 otherwise.
* *
*/ */
#define IS_ENABLED(option) \ #define IS_ENABLED(option) \
(config_enabled(option) || config_enabled(option##_MODULE)) (config_enabled(option))
/*
* IS_BUILTIN(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0
* otherwise. For boolean options, this is equivalent to
* IS_ENABLED(CONFIG_FOO).
*/
#define IS_BUILTIN(option) config_enabled(option)
/*
* IS_MODULE(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'm', 0
* otherwise.
*/
#define IS_MODULE(option) config_enabled(option##_MODULE)
/* /*
* U-Boot add-on: Helper macros to reference to different macros * U-Boot add-on: Helper macros to reference to different macros
@ -70,29 +57,12 @@
/* /*
* CONFIG_IS_ENABLED(FOO) evaluates to * CONFIG_IS_ENABLED(FOO) evaluates to
* 1 if CONFIG_SPL_BUILD is undefined and CONFIG_FOO is set to 'y' or 'm', * 1 if CONFIG_SPL_BUILD is undefined and CONFIG_FOO is set to 'y',
* 1 if CONFIG_SPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y' or 'm', * 1 if CONFIG_SPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y',
* 1 if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y' or 'm', * 1 if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y',
* 0 otherwise. * 0 otherwise.
*/ */
#define CONFIG_IS_ENABLED(option) \ #define CONFIG_IS_ENABLED(option) \
(config_enabled(CONFIG_VAL(option)) || \ (config_enabled(CONFIG_VAL(option)))
config_enabled(CONFIG_VAL(option##_MODULE)))
/*
* CONFIG_IS_BUILTIN(FOO) evaluates to
* 1 if CONFIG_SPL_BUILD is undefined and CONFIG_FOO is set to 'y',
* 1 if CONFIG_SPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y',
* 0 otherwise.
*/
#define CONFIG_IS_BUILTIN(option) config_enabled(CONFIG_VAL(option))
/*
* CONFIG_IS_MODULE(FOO) evaluates to
* 1 if CONFIG_SPL_BUILD is undefined and CONFIG_FOO is set to 'm',
* 1 if CONFIG_SPL_BUILD is defined and CONFIG_SPL_FOO is set to 'm',
* 0 otherwise.
*/
#define CONFIG_IS_MODULE(option) config_enabled(CONFIG_VAL(option##_MODULE))
#endif /* __LINUX_KCONFIG_H */ #endif /* __LINUX_KCONFIG_H */

2
scripts/config_whitelist.txt
View file

@ -873,9 +873,7 @@ CONFIG_IRAM_SIZE
CONFIG_IRAM_STACK CONFIG_IRAM_STACK
CONFIG_IRAM_TOP CONFIG_IRAM_TOP
CONFIG_IRDA_BASE CONFIG_IRDA_BASE
CONFIG_IS_BUILTIN
CONFIG_IS_ENABLED CONFIG_IS_ENABLED
CONFIG_IS_MODULE
CONFIG_JFFS2_CMDLINE CONFIG_JFFS2_CMDLINE
CONFIG_JFFS2_DEV CONFIG_JFFS2_DEV
CONFIG_JFFS2_LZO CONFIG_JFFS2_LZO