Synchronise with v3.15

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/.version b/.version
index 2acc951fca97160561c338a6bedc37806930d532..69d9a5d511d52f5aaa4a738045cb0307b3352ae9 100644 (file)
--- a/.version
+++ b/.version
@@ -1,2 +1,2 @@
-3.14.0 455c6fdbd219161bd09b1165f11699d6d73de11c Shuffling Zombie Juror
+3.15.0 1860e379875dfe7271c649058aeddffe5afd9d0d Shuffling Zombie Juror
 0

diff --git a/docs/kconfig-language.txt b/docs/kconfig-language.txt
index c420676c6fe31d3ac66c1b63f165888ccd0efd6e..350f733bf2c7165fd13a960df68bbfebf4a34bf8 100644 (file)
--- a/docs/kconfig-language.txt
+++ b/docs/kconfig-language.txt
@@ -157,6 +157,10 @@ applicable everywhere (see syntax).
     to the build environment (if this is desired, it can be done via
     another symbol).
 
+  - "allnoconfig_y"
+    This declares the symbol as one that should have the value y when
+    using "allnoconfig". Used for symbols that hide other symbols.
+
 Menu dependencies
 -----------------
 

diff --git a/libs/parser/confdata.c b/libs/parser/confdata.c
index 87f723804079ed3b6c1fbb0d1470f717582c4a28..f88d90f20228e8783b5ca39accc436140af7b3ff 100644 (file)
--- a/libs/parser/confdata.c
+++ b/libs/parser/confdata.c
@@ -1178,7 +1178,10 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode)
                                sym->def[S_DEF_USER].tri = mod;
                                break;
                        case def_no:
-                               sym->def[S_DEF_USER].tri = no;
+                               if (sym->flags & SYMBOL_ALLNOCONFIG_Y)
+                                       sym->def[S_DEF_USER].tri = yes;
+                               else
+                                       sym->def[S_DEF_USER].tri = no;
                                break;
                        case def_random:
                                sym->def[S_DEF_USER].tri = no;

diff --git a/libs/parser/expr.h b/libs/parser/expr.h
index ba663e1dc7e35b7bf732c4863c1202e3249ac636..412ea8a2abb8b80c6f0a889e2fb9d7b55bf0bafa 100644 (file)
--- a/libs/parser/expr.h
+++ b/libs/parser/expr.h
@@ -109,6 +109,9 @@ struct symbol {
 /* choice values need to be set before calculating this symbol value */
 #define SYMBOL_NEED_SET_CHOICE_VALUES  0x100000
 
+/* Set symbol to y if allnoconfig; used for symbols that hide others */
+#define SYMBOL_ALLNOCONFIG_Y 0x200000
+
 #define SYMBOL_MAXLENGTH       256
 #define SYMBOL_HASHSIZE                9973
 

diff --git a/libs/parser/hconf.gperf b/libs/parser/hconf.gperf
index f14ab41154b665c5759e3234201296a0cfbd43aa..b6ac02d604f1fbcca8ecc04cf09ac038bcb81fa8 100644 (file)
--- a/libs/parser/hconf.gperf
+++ b/libs/parser/hconf.gperf
@@ -44,4 +44,5 @@ on,           T_ON,           TF_PARAM
 modules,       T_OPT_MODULES,  TF_OPTION
 defconfig_list,        T_OPT_DEFCONFIG_LIST,TF_OPTION
 env,           T_OPT_ENV,      TF_OPTION
+allnoconfig_y, T_OPT_ALLNOCONFIG_Y,TF_OPTION
 %%

diff --git a/libs/parser/lkc.h b/libs/parser/lkc.h
index 09f4edfdc91132887e1e54e09faf1a9b99865965..d5daa7af8b496e89143b3fd222fc3c35e7eeb748 100644 (file)
--- a/libs/parser/lkc.h
+++ b/libs/parser/lkc.h
@@ -61,6 +61,7 @@ enum conf_def_mode {
 #define T_OPT_MODULES          1
 #define T_OPT_DEFCONFIG_LIST   2
 #define T_OPT_ENV              3
+#define T_OPT_ALLNOCONFIG_Y    4
 
 struct kconf_id {
        int name;

diff --git a/libs/parser/menu.c b/libs/parser/menu.c
index db1512ae30cc48d6f2ea87bc26a082a084551811..3ac2c9c6e280300275920d2ea1cadb0c7be66746 100644 (file)
--- a/libs/parser/menu.c
+++ b/libs/parser/menu.c
@@ -217,6 +217,9 @@ void menu_add_option(int token, char *arg)
        case T_OPT_ENV:
                prop_add_env(arg);
                break;
+       case T_OPT_ALLNOCONFIG_Y:
+               current_entry->sym->flags |= SYMBOL_ALLNOCONFIG_Y;
+               break;
        }
 }
 

diff --git a/scripts/ksync.log b/scripts/ksync.log
index 845a12053ff71bec44222bf430c52d118e055349..79573b9c74e2ebd9fd4e0e938d3b28a2d0fffd08 100644 (file)
--- a/scripts/ksync.log
+++ b/scripts/ksync.log
@@ -91,3 +91,4 @@ e062781 kconfig: do not allow more than one symbol to have 'option modules'
 3381960 kconfig: remove unused definition from scanner
 503c823 kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len
 00d4f8f xconfig: Fix the filename for GUI settings
+5d2acfc kconfig: make allnoconfig disable options behind EMBEDDED and EXPERT