mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
fixdep: handle CONFIG_IS_ENABLE() and friends for TPL
Since commit f1c6e1922e
("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>
This commit is contained in:
parent
f9f5a7e524
commit
9d88a0aae8
1 changed files with 7 additions and 5 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue