diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2013-11-14 00:53:35 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2013-11-14 12:34:49 +0100 |
| commit | b48e35a28a6391ec16f09df66ad5b1065330f265 (patch) | |
| tree | 83e955dab61ba5cca95707c2b7920e74ec99e2d0 /support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch | |
| parent | 147be50283c49ed15a6b56aaa5d455eec92c9615 (diff) | |
| download | buildroot-b48e35a28a6391ec16f09df66ad5b1065330f265.tar.gz buildroot-b48e35a28a6391ec16f09df66ad5b1065330f265.zip | |
support/kconfig: bump to kconfig from linux-3.12
With this, we can trash our probability patch, it's now upstream.
Refresh a few other patches.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch')
| -rw-r--r-- | support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch index d7206a0040..25b436b7a2 100644 --- a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch +++ b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch @@ -25,7 +25,7 @@ Index: b/mconf.c +++ b/mconf.c @@ -178,9 +178,9 @@ "Arrow keys navigate the menu. " - "<Enter> selects submenus --->. " + "<Enter> selects submenus ---> (or empty submenus ----). " "Highlighted letters are hotkeys. " - "Pressing <Y> includes, <N> excludes, <M> modularizes features. " + "Pressing <Y> selectes a feature, while <N> will exclude a feature. " @@ -39,10 +39,10 @@ Index: b/zconf.tab.c_shipped =================================================================== --- a/zconf.tab.c_shipped +++ b/zconf.tab.c_shipped -@@ -2259,7 +2259,7 @@ - modules_sym = sym_lookup(NULL, 0); - modules_sym->type = S_BOOLEAN; - modules_sym->flags |= SYMBOL_AUTO; +@@ -2297,7 +2297,7 @@ + + sym_init(); + _menu_init(); - rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); + rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL); @@ -52,10 +52,10 @@ Index: b/zconf.y =================================================================== --- a/zconf.y +++ b/zconf.y -@@ -496,7 +496,7 @@ - modules_sym = sym_lookup(NULL, 0); - modules_sym->type = S_BOOLEAN; - modules_sym->flags |= SYMBOL_AUTO; +@@ -493,7 +493,7 @@ + + sym_init(); + _menu_init(); - rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); + rootmenu.prompt = menu_add_prompt(P_MENU, "Buildroot Configuration", NULL); @@ -65,7 +65,7 @@ Index: b/confdata.c =================================================================== --- a/confdata.c +++ b/confdata.c -@@ -25,7 +26,7 @@ +@@ -25,7 +25,7 @@ static const char *conf_filename; static int conf_lineno, conf_warnings, conf_unsaved; @@ -74,7 +74,7 @@ Index: b/confdata.c static void conf_warning(const char *fmt, ...) { -@@ -63,7 +64,7 @@ +@@ -63,7 +63,7 @@ const char *conf_get_configname(void) { |
