This adds an "olddefconfig" build target, which updates a .config file filling any any absent symbols with the Kconfig default value (note: not the architecture defconfig value). Similar to oldnoconfig, this option is useful for build systems when dealing with config fragments. CC: gthelen@xxxxxxxxxx CC: tartler@xxxxxxxxx CC: Dmitry Fink <Dmitry.Fink@xxxxxxxx> CC: Darren Hart <dvhart@xxxxxxxxxxxxxxx> CC: Eric B Munson <ebmunson@xxxxxxxxxx> CC: Bruce Ashfield <Bruce.Ashfield@xxxxxxxxxxxxx> CC: Michal Marek <mmarek@xxxxxxx> CC: linux-kbuild@xxxxxxxxxxxxxxx Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx> --- scripts/kconfig/Makefile | 2 +- scripts/kconfig/conf.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 82d2eb2..c238f3e 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -103,7 +103,7 @@ allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf PHONY += listnewconfig oldnoconfig savedefconfig defconfig -listnewconfig oldnoconfig: $(obj)/conf +listnewconfig oldnoconfig olddefconfig: $(obj)/conf $< --$@ $(Kconfig) savedefconfig: $(obj)/conf diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index f208f90..ab7bc68 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -33,6 +33,7 @@ enum input_mode { savedefconfig, listnewconfig, oldnoconfig, + olddefconfig, } input_mode = oldaskconfig; static int indent = 1; @@ -455,6 +456,7 @@ static struct option long_opts[] = { {"randconfig", no_argument, NULL, randconfig}, {"listnewconfig", no_argument, NULL, listnewconfig}, {"oldnoconfig", no_argument, NULL, oldnoconfig}, + {"olddefconfig", no_argument, NULL, olddefconfig}, {NULL, 0, NULL, 0} }; @@ -566,6 +568,7 @@ int main(int ac, char **av) case oldconfig: case listnewconfig: case oldnoconfig: + case olddefconfig: conf_read(NULL); break; case allnoconfig: @@ -624,6 +627,7 @@ int main(int ac, char **av) conf_set_all_new_symbols(def_random); break; case defconfig: + case olddefconfig: conf_set_all_new_symbols(def_default); break; case savedefconfig: -- 1.7.3.2.146.gca209 -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html