[U-Boot] [PATCH] fixdep: remove multiple .config support code

Since commit e02ee2548afe (kconfig: switch to single .config configuration), the ".*.cmd" files are not correctly created for SPL/TPL. The U-Boot extension code in fixdep, which was introduced to support the multiple .config, must be removed.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com --- Tom,
Sorry, this is an urgent bug fix.
scripts/basic/fixdep.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 1a41723..b304068 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -221,11 +221,7 @@ static void use_config(const char *m, int slen)
define_config(m, slen, hash);
- /* printf(" $(wildcard include/config/"); */ - /* modified for U-Boot */ - printf(" $(wildcard %sinclude/config/", - strncmp(depfile, "spl/", 4) ? - (strncmp(depfile, "tpl/", 4) ? "" : "tpl/") : "spl/"); + printf(" $(wildcard include/config/"); for (i = 0; i < slen; i++) { c = m[i]; if (c == '_')

On 27 February 2015 at 08:37, Masahiro Yamada yamada.m@jp.panasonic.com wrote:
Since commit e02ee2548afe (kconfig: switch to single .config configuration), the ".*.cmd" files are not correctly created for SPL/TPL. The U-Boot extension code in fixdep, which was introduced to support the multiple .config, must be removed.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com
Tom,
Sorry, this is an urgent bug fix.
scripts/basic/fixdep.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 1a41723..b304068 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -221,11 +221,7 @@ static void use_config(const char *m, int slen)
define_config(m, slen, hash);
/* printf(" $(wildcard include/config/"); */
/* modified for U-Boot */
printf(" $(wildcard %sinclude/config/",
strncmp(depfile, "spl/", 4) ?
(strncmp(depfile, "tpl/", 4) ? "" : "tpl/") : "spl/");
printf(" $(wildcard include/config/"); for (i = 0; i < slen; i++) { c = m[i]; if (c == '_')
-- 1.9.1

On Sat, Feb 28, 2015 at 12:37:57AM +0900, Masahiro Yamada wrote:
Since commit e02ee2548afe (kconfig: switch to single .config configuration), the ".*.cmd" files are not correctly created for SPL/TPL. The U-Boot extension code in fixdep, which was introduced to support the multiple .config, must be removed.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
participants (3)
-
Masahiro Yamada
-
Simon Glass
-
Tom Rini