From 9d917546c154006445ba08a651a07dc81f022c22 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 8 Apr 2017 09:50:01 +0200 Subject: [PATCH] Synchronise with 4.9 Signed-off-by: "Yann E. MORIN" --- .version | 2 +- docs/kconfig-language.txt | 39 ++++++++++++++++++++++++++++++++++++++- scripts/ksync.log | 1 + 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/.version b/.version index d058ade..d7296b3 100644 --- a/.version +++ b/.version @@ -1,2 +1,2 @@ -4.8.0 c8d2bc9bc39ebea8437fd974fdbc21847bb897a3 Psychotic Stoned Sheep +4.9.0 69973b830859bc6529a7a0468ba0d80ee5117826 Roaring Lionus 0 diff --git a/docs/kconfig-language.txt b/docs/kconfig-language.txt index db10185..069fcb3 100644 --- a/docs/kconfig-language.txt +++ b/docs/kconfig-language.txt @@ -274,7 +274,44 @@ menuconfig: This is similar to the simple config entry above, but it also gives a hint to front ends, that all suboptions should be displayed as a -separate list of options. +separate list of options. To make sure all the suboptions will really +show up under the menuconfig entry and not outside of it, every item +from the list must depend on the menuconfig symbol. +In practice, this is achieved by using one of the next two constructs: + +(1): +menuconfig M +if M + config C1 + config C2 +endif + +(2): +menuconfig M +config C1 + depends on M +config C2 + depends on M + +In the following examples (3) and (4), C1 and C2 still have the M +dependency, but will not appear under menuconfig M anymore, because +of C0, which doesn't depend on M: + +(3): +menuconfig M + config C0 +if M + config C1 + config C2 +endif + +(4): +menuconfig M +config C0 +config C1 + depends on M +config C2 + depends on M choices: diff --git a/scripts/ksync.log b/scripts/ksync.log index 6e02beb..9c872b1 100644 --- a/scripts/ksync.log +++ b/scripts/ksync.log @@ -164,3 +164,4 @@ a466391 kconfig: add unexpected data itself to warning 3e2ba95 kconfig-language: fix comment on dependency-generated menu structures. 032a318 kconfig-language: elaborate on the type of a choice fa64e5f kconfig/symbol.c: handle choice_values that depend on 'm' symbols +cfd7c612 kconfig-language: improve menuconfig usage description -- 2.39.2