[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1316224159-3556-2-git-send-email-john.stultz@linaro.org>
Date: Fri, 16 Sep 2011 18:49:18 -0700
From: John Stultz <john.stultz@...aro.org>
To: lkml <linux-kernel@...r.kernel.org>
Cc: John Stultz <john.stultz@...aro.org>, gthelen@...gle.com,
tartler@...fau.de, Dmitry Fink <Dmitry.Fink@...m.com>,
Darren Hart <dvhart@...ux.intel.com>,
Eric B Munson <ebmunson@...ibm.com>,
Bruce Ashfield <Bruce.Ashfield@...driver.com>,
Michal Marek <mmarek@...e.cz>, linux-kbuild@...r.kernel.org
Subject: [PATCH 1/2] kconfig: Add make olddefconfig
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@...gle.com
CC: tartler@...fau.de
CC: Dmitry Fink <Dmitry.Fink@...m.com>
CC: Darren Hart <dvhart@...ux.intel.com>
CC: Eric B Munson <ebmunson@...ibm.com>
CC: Bruce Ashfield <Bruce.Ashfield@...driver.com>
CC: Michal Marek <mmarek@...e.cz>
CC: linux-kbuild@...r.kernel.org
Signed-off-by: John Stultz <john.stultz@...aro.org>
---
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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists