Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-27 16:01:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kconfig: binman: Check for SPL instead of XPL

Browse source 
Now that SPL means SPL (only) and is not defined for other phases,
update kconfig rules.

This is done in one patch since otherwise many Binman tests fail.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2024-09-29 19:49:52 -06:00 • committed by Tom Rini
parent 9280a948b1
commit 53abdda2f6
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/linux/kconfig.h
View file

@ -40,7 +40,7 @@
#define _CONFIG_PREFIX TPL_ #define _CONFIG_PREFIX TPL_
#elif defined(CONFIG_VPL_BUILD) #elif defined(CONFIG_VPL_BUILD)
#define _CONFIG_PREFIX VPL_ #define _CONFIG_PREFIX VPL_
#elif defined(CONFIG_XPL_BUILD) #elif defined(CONFIG_SPL_BUILD)
#define _CONFIG_PREFIX SPL_ #define _CONFIG_PREFIX SPL_
#else #else
#define _CONFIG_PREFIX #define _CONFIG_PREFIX
@ -54,7 +54,7 @@
* CONFIG_VAL(FOO) evaluates to the value of * CONFIG_VAL(FOO) evaluates to the value of
* CONFIG_TOOLS_FOO if USE_HOSTCC is defined, * CONFIG_TOOLS_FOO if USE_HOSTCC is defined,
* CONFIG_FOO if CONFIG_XPL_BUILD is undefined, * CONFIG_FOO if CONFIG_XPL_BUILD is undefined,
* CONFIG_SPL_FOO if CONFIG_XPL_BUILD is defined. * CONFIG_SPL_FOO if CONFIG_SPL_BUILD is defined.
* CONFIG_TPL_FOO if CONFIG_TPL_BUILD is defined. * CONFIG_TPL_FOO if CONFIG_TPL_BUILD is defined.
* CONFIG_VPL_FOO if CONFIG_VPL_BUILD is defined. * CONFIG_VPL_FOO if CONFIG_VPL_BUILD is defined.
*/ */
@ -107,21 +107,21 @@ long invalid_use_of_IF_ENABLED_INT(void);
* CONFIG_IS_ENABLED(FOO) expands to * CONFIG_IS_ENABLED(FOO) expands to
* 1 if USE_HOSTCC is defined and CONFIG_TOOLS_FOO is set to 'y', * 1 if USE_HOSTCC is defined and CONFIG_TOOLS_FOO is set to 'y',
* 1 if CONFIG_XPL_BUILD is undefined and CONFIG_FOO is set to 'y', * 1 if CONFIG_XPL_BUILD is undefined and CONFIG_FOO is set to 'y',
* 1 if CONFIG_XPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y', * 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', * 1 if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y',
* 0 otherwise. * 0 otherwise.
* *
* CONFIG_IS_ENABLED(FOO, (abc)) expands to * CONFIG_IS_ENABLED(FOO, (abc)) expands to
* abc if USE_HOSTCC is defined and CONFIG_TOOLS_FOO is set to 'y', * abc if USE_HOSTCC is defined and CONFIG_TOOLS_FOO is set to 'y',
* abc if CONFIG_XPL_BUILD is undefined and CONFIG_FOO is set to 'y', * abc if CONFIG_XPL_BUILD is undefined and CONFIG_FOO is set to 'y',
* abc if CONFIG_XPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y', * abc if CONFIG_SPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y',
* abc if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y', * abc if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y',
* nothing otherwise. * nothing otherwise.
* *
* CONFIG_IS_ENABLED(FOO, (abc), (def)) expands to * CONFIG_IS_ENABLED(FOO, (abc), (def)) expands to
* abc if USE_HOSTCC is defined and CONFIG_TOOLS_FOO is set to 'y', * abc if USE_HOSTCC is defined and CONFIG_TOOLS_FOO is set to 'y',
* abc if CONFIG_XPL_BUILD is undefined and CONFIG_FOO is set to 'y', * abc if CONFIG_XPL_BUILD is undefined and CONFIG_FOO is set to 'y',
* abc if CONFIG_XPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y', * abc if CONFIG_SPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y',
* abc if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y', * abc if CONFIG_TPL_BUILD is defined and CONFIG_TPL_FOO is set to 'y',
* def otherwise. * def otherwise.
* *

2
tools/binman/test/generated/autoconf.h
View file

@ -1,3 +1,3 @@
#define CONFIG_BINMAN 1 #define CONFIG_BINMAN 1
#define CONFIG_XPL_BUILD 1 #define CONFIG_SPL_BUILD 1
#define CONFIG_SPL_BINMAN_SYMBOLS 1 #define CONFIG_SPL_BINMAN_SYMBOLS 1