diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:02:03 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:02:03 +0200 |
| commit | c44aac9f8c1a528379d48a274ed9f332360c810d (patch) | |
| tree | e8fb8ed76de202bcbef3bb0aac6e6a46ac06f3e6 /scripts/kconfig | |
| parent | 631a95903dab725c1198b8247beb0260eea0ba88 (diff) | |
| download | barebox-c44aac9f8c1a528379d48a274ed9f332360c810d.tar.gz barebox-c44aac9f8c1a528379d48a274ed9f332360c810d.tar.xz | |
svn_rev_543
linux->uboot
Diffstat (limited to 'scripts/kconfig')
| -rw-r--r-- | scripts/kconfig/conf.c | 8 | ||||
| -rw-r--r-- | scripts/kconfig/gconf.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/lex.zconf.c_shipped | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 4dcb8867b5..2e2aad8a1d 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -557,7 +557,7 @@ int main(int ac, char **av) case ask_silent: if (stat(".config", &tmpstat)) { printf(_("***\n" - "*** You have not yet configured your kernel!\n" + "*** You have not yet configured uboot!\n" "***\n" "*** Please run some configurator (e.g. \"make oldconfig\" or\n" "*** \"make menuconfig\" or \"make xconfig\").\n" @@ -603,7 +603,7 @@ int main(int ac, char **av) } else if (sym_change_count) { name = getenv("KCONFIG_NOSILENTUPDATE"); if (name && *name) { - fprintf(stderr, _("\n*** Kernel configuration requires explicit update.\n\n")); + fprintf(stderr, _("\n*** uboot configuration requires explicit update.\n\n")); return 1; } } else @@ -614,12 +614,12 @@ int main(int ac, char **av) check_conf(&rootmenu); } while (conf_cnt); if (conf_write(NULL)) { - fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); + fprintf(stderr, _("\n*** Error during writing of the uboot configuration.\n\n")); return 1; } skip_check: if (input_mode == ask_silent && conf_write_autoconf()) { - fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); + fprintf(stderr, _("\n*** Error during writing of the uboot configuration.\n\n")); return 1; } diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 7b0d3a93d5..f80ec3192e 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -733,7 +733,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) { GtkWidget *dialog; const gchar *intro_text = _( - "Welcome to gkc, the GTK+ graphical kernel configuration tool\n" + "Welcome to gkc, the GTK+ graphical uboot configuration tool\n" "for Linux.\n" "For each option, a blank box indicates the feature is disabled, a\n" "check indicates it is enabled, and a dot indicates that it is to\n" diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped index 92f87cc269..20ee9be313 100644 --- a/scripts/kconfig/lex.zconf.c_shipped +++ b/scripts/kconfig/lex.zconf.c_shipped @@ -2255,7 +2255,7 @@ static void zconf_endhelp(void) * ./name * $(srctree)/name * The latter is used when srctree is separate from objtree - * when compiling the kernel. + * when compiling uboot. * Return NULL if file is not found. */ FILE *zconf_fopen(const char *name) |