kconfig: re-sync with Linux 4.17-rc4

[u-boot] / scripts / kconfig / mconf.c

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 953d5c75e5de76bd23c2158babfcd491195064e9..c829be8bb19fb3e0b37ee72a7e632074dd3f1b11 100644 (file)
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -246,7 +246,7 @@ search_help[] = N_(
        "  Selected by: BAR [=n]\n"
        "-----------------------------------------------------------------\n"
        "o The line 'Type:' shows the type of the configuration option for\n"
-       "  this symbol (boolean, tristate, string, ...)\n"
+       "  this symbol (bool, tristate, string, ...)\n"
        "o The line 'Prompt:' shows the text used in the menu structure for\n"
        "  this symbol\n"
        "o The 'Defined at' line tells at what file / line number the symbol\n"
@@ -379,7 +379,7 @@ static void update_text(char *buf, size_t start, size_t end, void *_data)
                                data->targets[k] = pos->target;
                                k++;
                        } else {
-                               strcpy(header, "   ");
+                               sprintf(header, "   ");
                        }
 
                        memcpy(buf + pos->offset, header, sizeof(header) - 1);