LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux/kconfig.h: simplify logic for choosing CONFIG_{SPL_, TPL_, }* 

Instead of using the arg1_or_junk trick to pick between two choices,
with a bit of duplication between the branches (and most of the
CONFIG_TPL_BUILD case being redundant, as _IS_TPL is known to be
defined to 1 in that case), simply define a prefix that we inject
between CONFIG_ and the given config symbol.

This only requires one level of indirection (to get the
_CONFIG_PREFIX macro expanded before the token concatenation takes
place), and makes it easy to, say, introduce a CONFIG_HOSTTOOL_
prefix. [I would expect most HOSTTOOL_ symbols to just be def_bool y,
but it would allow us to clean up some of the ifdef HOSTCC mess in the
sources shared between U-Boot and host tools.]

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:04 -06:00 committed by Bin Meng
parent 7d5de35b6f
commit b4f73886c4
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/linux/kconfig.h
View File

@ -47,30 +47,19 @@
* U-Boot add-on: Helper macros to reference to different macros * U-Boot add-on: Helper macros to reference to different macros
* (CONFIG_ or CONFIG_SPL_ prefixed), depending on the build context. * (CONFIG_ or CONFIG_SPL_ prefixed), depending on the build context.
*/ */
#ifdef CONFIG_SPL_BUILD
#define _IS_SPL 1
#endif
#ifdef CONFIG_TPL_BUILD
#define _IS_TPL 1
#endif
#if defined(CONFIG_TPL_BUILD) #if defined(CONFIG_TPL_BUILD)
#define config_val(cfg) _config_val(_IS_TPL, cfg) #define _CONFIG_PREFIX TPL_
#define _config_val(x, cfg) __config_val(x, cfg) #elif defined(CONFIG_SPL_BUILD)
#define __config_val(x, cfg) ___config_val(__ARG_PLACEHOLDER_##x, cfg) #define _CONFIG_PREFIX SPL_
#define ___config_val(arg1_or_junk, cfg) \
____config_val(arg1_or_junk CONFIG_TPL_##cfg, CONFIG_##cfg)
#define ____config_val(__ignored, val, ...) val
#else #else
#define config_val(cfg) _config_val(_IS_SPL, cfg) #define _CONFIG_PREFIX
#define _config_val(x, cfg) __config_val(x, cfg)
#define __config_val(x, cfg) ___config_val(__ARG_PLACEHOLDER_##x, cfg)
#define ___config_val(arg1_or_junk, cfg) \
____config_val(arg1_or_junk CONFIG_SPL_##cfg, CONFIG_##cfg)
#define ____config_val(__ignored, val, ...) val
#endif #endif
#define config_val(cfg) _config_val(_CONFIG_PREFIX, cfg)
#define _config_val(pfx, cfg) __config_val(pfx, cfg)
#define __config_val(pfx, cfg) CONFIG_ ## pfx ## cfg
/* /*
* CONFIG_VAL(FOO) evaluates to the value of * CONFIG_VAL(FOO) evaluates to the value of
* CONFIG_FOO if CONFIG_SPL_BUILD is undefined, * CONFIG_FOO if CONFIG_SPL_BUILD is undefined,