Gabriel de Perthuis ed94fea5ba kconfig/merge_config.sh: Support KCONFIG_CONFIG
All make targets support $KCONFIG_CONFIG because they
run scripts/kconf.  Make sure merge_config.sh accesses the
correct file in all cases.

Previously this script broke in two different code paths,
one for targets like kvmconfig (which use merge_config.sh -m
then call a target that respects KCONFIG_CONFIG) and one for
direct use of the script without -m, which called make rules
that edit KCONFIG_CONFIG but verified a different file.

Signed-off-by: Gabriel de Perthuis <g2p.code@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
2015-10-14 16:19:33 +02:00
..
2015-08-20 14:57:47 +02:00
2015-09-04 11:25:03 +02:00
2014-08-20 16:03:45 +02:00
2014-08-20 16:03:45 +02:00
2011-08-31 16:12:17 +02:00
2014-08-20 16:03:45 +02:00
2014-08-20 16:03:45 +02:00
2014-08-20 16:03:45 +02:00
2012-06-27 12:44:29 -07:00
2010-03-23 12:26:38 +01:00
2014-12-20 00:01:12 +01:00
2015-09-04 13:14:10 +02:00
2014-08-20 16:03:45 +02:00
2014-08-20 16:03:45 +02:00
2015-08-28 17:04:40 +02:00
2015-08-28 17:04:40 +02:00
2009-06-09 22:37:54 +02:00
2014-08-20 16:03:45 +02:00