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/merge_config.sh | |
| 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/merge_config.sh')
| -rwxr-xr-x | support/kconfig/merge_config.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/support/kconfig/merge_config.sh b/support/kconfig/merge_config.sh index 05274fccb8..81b0c61bb9 100755 --- a/support/kconfig/merge_config.sh +++ b/support/kconfig/merge_config.sh @@ -120,10 +120,18 @@ if [ "$MAKE" = "false" ]; then exit fi +# If we have an output dir, setup the O= argument, otherwise leave +# it blank, since O=. will create an unnecessary ./source softlink +OUTPUT_ARG="" +if [ "$OUTPUT" != "." ] ; then + OUTPUT_ARG="O=$OUTPUT" +fi + + # Use the merged file as the starting point for: # alldefconfig: Fills in any missing symbols with Kconfig default # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set -make KCONFIG_ALLCONFIG=$TMP_FILE O=$OUTPUT $ALLTARGET +make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET # Check all specified config values took (might have missed-dependency issues) |
