Petr Vorel 2cd3faf87d merge_config.sh: Allow to define config prefix ... with CONFIG_ environment variable. merge_config.sh uses CONFIG_ which is used in kernel and other projects. There are some projects which use kconfig with different prefixes (e.g. buildroot: BR2_ prefix). CONFIG_ variable is already used for this purpose in kconfig binary (scripts/kconfig/lkc.h), let's use the same rule for in merge_config.sh. Suggested-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Petr Vorel <petr.vorel@gmail.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>		2018-11-02 00:15:26 +09:00
..
lxdialog	kconfig: drop localization support	2018-05-28 18:25:21 +09:00
tests	kconfig: improve the recursive dependency report	2018-08-22 23:21:39 +09:00
.gitignore	kconfig: drop localization support	2018-05-28 18:25:21 +09:00
conf.c	kconfig: remove oldnoconfig target	2018-11-02 00:15:25 +09:00
confdata.c	kconfig: allow all config targets to write auto.conf if missing	2018-07-25 23:25:30 +09:00
expr.c	kconfig: make unmet dependency warnings readable	2018-03-26 02:04:06 +09:00
expr.h	kconfig: remove P_ENV property type	2018-08-14 09:01:47 +09:00
gconf-cfg.sh	kconfig: do not require pkg-config on make {menu,n}config	2018-09-03 02:13:48 +09:00
gconf.c	kconfig: allow all config targets to write auto.conf if missing	2018-07-25 23:25:30 +09:00
gconf.glade
images.c
kconf_id.c	kconfig: reference environment variables directly and remove 'option env='	2018-05-29 03:28:58 +09:00
list.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
lkc_proto.h	kconfig: allow all config targets to write auto.conf if missing	2018-07-25 23:25:30 +09:00
lkc.h	kconfig: remove unused sym_get_env_prop() function	2018-08-14 08:59:57 +09:00
Makefile	kconfig: remove silentoldconfig target	2018-11-02 00:15:25 +09:00
mconf-cfg.sh	kconfig: do not require pkg-config on make {menu,n}config	2018-09-03 02:13:48 +09:00
mconf.c	kconfig: remove a spurious self-assignment	2018-09-01 01:21:42 +09:00
menu.c	kconfig: rename SYMBOL_AUTO to SYMBOL_NO_WRITE	2018-07-18 01:18:09 +09:00
merge_config.sh	merge_config.sh: Allow to define config prefix	2018-11-02 00:15:26 +09:00
nconf-cfg.sh	kconfig: do not require pkg-config on make {menu,n}config	2018-09-03 02:13:48 +09:00
nconf.c	kconfig: allow all config targets to write auto.conf if missing	2018-07-25 23:25:30 +09:00
nconf.gui.c	kconfig: add xrealloc() helper	2018-02-10 11:26:04 +09:00
nconf.h	kconfig: drop localization support	2018-05-28 18:25:21 +09:00
preprocess.c	kconfig: loop boundary condition fix	2018-06-28 22:48:08 +09:00
qconf-cfg.sh	kconfig: do not require pkg-config on make {menu,n}config	2018-09-03 02:13:48 +09:00
qconf.cc	kconfig: remove P_ENV property type	2018-08-14 09:01:47 +09:00
qconf.h
streamline_config.pl	kconfig: fix localmodconfig	2018-06-11 09:16:30 +09:00
symbol.c	kconfig: improve the recursive dependency report	2018-08-22 23:21:39 +09:00
util.c	kconfig: rename file_write_dep and move it to confdata.c	2018-07-25 23:25:28 +09:00
zconf.l	kconfig: expand lefthand side of assignment statement	2018-05-29 03:31:19 +09:00
zconf.y	kconfig: fix the rule of mainmenu_stmt symbol	2018-08-13 12:04:51 +09:00