diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-04-16 14:01:44 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-24 10:51:32 -0400 |
| commit | 9d88a0aae8115e96b3f323cdb23e5725366a20e2 (patch) | |
| tree | 7ead00d9ca4cf9c06308a8f3beb0c595e38e90b2 /scripts | |
| parent | f9f5a7e524fc68d965d7df240bf17db4af671808 (diff) | |
fixdep: handle CONFIG_IS_ENABLE() and friends for TPL
Since commit f1c6e1922eb5 ("spl: dm: use CONFIG_IS_ENABLED to test for
the DM option"), CONFIG_IS_ENABLED() handles CONFIG_TPL_* options, but
fixdep still cannot because it hard-codes the "SPL_" prefix as follows:
char tmp_buf[256] = "SPL_"; /* hack for U-Boot */
Take care of the "TPL_" prefix too.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/basic/fixdep.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index c9277d782c..555dada47a 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -103,7 +103,7 @@ #include <stdio.h> #include <ctype.h> -int is_spl_build = 0; /* hack for U-Boot */ +char tmp_buf[256]; /* hack for U-Boot */ static void usage(void) { @@ -230,7 +230,6 @@ static void parse_config_file(const char *p) { const char *q, *r; const char *start = p; - char tmp_buf[256] = "SPL_"; /* hack for U-Boot */ while ((p = strstr(p, "CONFIG_"))) { if (p > start && (isalnum(p[-1]) || p[-1] == '_')) { @@ -260,7 +259,7 @@ static void parse_config_file(const char *p) while (isalnum(*q) || *q == '_') q++; r = q; - if (r > p && is_spl_build) { + if (r > p && tmp_buf[0]) { memcpy(tmp_buf + 4, p, r - p); r = tmp_buf + 4 + (r - p); p = tmp_buf; @@ -419,8 +418,11 @@ int main(int argc, char *argv[]) cmdline = argv[3]; /* hack for U-Boot */ - if (!strncmp(target, "spl/", 4) || !strncmp(target, "tpl/", 4)) - is_spl_build = 1; + if (!strncmp(target, "spl/", 4)) + strcpy(tmp_buf, "SPL_"); + else if (!strncmp(target, "tpl/", 4)) + strcpy(tmp_buf, "TPL_"); + /* end U-Boot hack */ printf("cmd_%s := %s\n\n", target, cmdline); |