summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-08-12 07:31:43 +0900
committerTom Rini <trini@konsulko.com>2015-08-18 13:46:00 -0400
commit8be60f06c258df5aca5a28304a1fa1bbc47f8578 (patch)
tree6e934ceceef3cb98296ba33dd833727bf0c5e7d6 /scripts
parent04a5c40601adb007ab064e1aa4a2b5717217457e (diff)
downloadtalos-obmc-uboot-8be60f06c258df5aca5a28304a1fa1bbc47f8578.zip
talos-obmc-uboot-8be60f06c258df5aca5a28304a1fa1bbc47f8578.tar.gz
linux/kconfig.h: add CPP macros useful for per-image config options
The previous commit introduced a useful macro used in makefiles, in order to reference to different variables (CONFIG_... or CONFIG_SPL_...) depending on the build context. Per-image config option control is a PITA in C sources, too. Here are some macros useful in C/CPP expressions. CONFIG_IS_ENABLED(FOO) can be used as a shorthand for (!defined(CONFIG_SPL_BUILD) && defined(CONFIG_FOO)) || \ (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_FOO)) For example, it is useful to describe C code as follows, #if CONFIG_IS_ENABLED(OF_CONTROL) (device tree code) #else (board file code) #endif The ifdef conditional above is switched by CONFIG_OF_CONTROL during the U-Boot proper building (CONFIG_SPL_BUILD is not defined), and by CONFIG_SPL_OF_CONTROL during SPL building (CONFIG_SPL_BUILD is defined). The macro can be used in C context as well, so you can also write the equivalent code as follows: if (CONFIG_IS_ENABLED(OF_CONTROL)) { (device tree code) } else { (board file code) } Another useful macro is CONFIG_VALUE(). CONFIG_VALUE(FOO) is expanded into CONFIG_FOO if CONFIG_SPL_BUILD is undefined, and into CONFIG_SPL_FOO if CONFIG_SPL_BUILD is defined. You can write as follows: text_base = CONFIG_VALUE(TEXT_BASE); instead of: #ifdef CONFIG_SPL_BUILD text_base = CONFIG_SPL_TEXT_BASE; #else text_base = CONFIG_TEXT_BASE; #endif This commit also adds slight hacking on fixdep so that it can output a correct list of fixed dependencies. If the fixdep finds CONFIG_IS_ENABLED(FOO) in a source file, we want $(wildcard include/config/foo.h) in the U-boot proper building context, while we want $(wildcard include/config/spl/foo.h) in the SPL build context. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/basic/fixdep.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 46cc1b3..20fed03 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -123,6 +123,7 @@
char *target;
char *depfile;
char *cmdline;
+int is_spl_build = 0; /* hack for U-boot */
static void usage(void)
{
@@ -239,6 +240,7 @@ static void parse_config_file(const char *map, size_t len)
/* start at +1, so that p can never be < map */
const int *m = (const int *) map + 1;
const char *p, *q;
+ char tmp_buf[256] = "SPL_"; /* hack for U-Boot */
for (; m < end; m++) {
if (*m == INT_CONF) { p = (char *) m ; goto conf; }
@@ -263,6 +265,26 @@ static void parse_config_file(const char *map, size_t len)
q -= 7;
if (q - p < 0)
continue;
+
+ /* U-Boot also handles CONFIG_IS_{ENABLED/BUILTIN/MODULE} */
+ if ((q - p == 10 && !memcmp(p, "IS_ENABLED(", 11)) ||
+ (q - p == 10 && !memcmp(p, "IS_BUILTIN(", 11)) ||
+ (q - p == 9 && !memcmp(p, "IS_MODULE(", 10))) {
+ p = q + 1;
+ for (q = p; q < map + len; q++)
+ if (*q == ')')
+ goto found2;
+ continue;
+
+ found2:
+ if (is_spl_build) {
+ memcpy(tmp_buf + 4, p, q - p);
+ q = tmp_buf + 4 + (q - p);
+ p = tmp_buf;
+ }
+ }
+ /* end U-Boot hack */
+
use_config(p, q - p);
}
}
@@ -456,6 +478,10 @@ int main(int argc, char *argv[])
target = argv[2];
cmdline = argv[3];
+ /* hack for U-boot */
+ if (!strncmp(target, "spl/", 4) || !strncmp(target, "tpl/", 4))
+ is_spl_build = 1;
+
print_cmdline();
print_deps();
OpenPOWER on IntegriCloud