support/kconfig/merge_config.sh: fix merging buildroot config files
authorNasser Afshin <afshin.nasser@gmail.com>
Wed, 14 Nov 2018 07:11:54 +0000 (10:41 +0330)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Sat, 24 Nov 2018 09:11:11 +0000 (10:11 +0100)
commit8f069a665c862b6c4890d0802e7835d0ba62e27a
tree2d5f005c2635bf3237340bff2bd037368915b876
parent6ef7de3023a36a7c9068ad44ec6c280c809722f0
support/kconfig/merge_config.sh: fix merging buildroot config files

This patch allows us to define config prefix with CONFIG_ environment
variable.

By setting the proper config prefix, we will have proper 'redundant
configuration warnings' when we use '-r -m' options.

This is actually already in mainline for v4.20-rc1:
2cd3faf87d2d8f6123adf34741b9a7b98828a76f
("merge_config.sh: Allow to define config prefix")

Signed-off-by: Nasser Afshin <afshin.nasser@gmail.com>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
support/kconfig/merge_config.sh
support/kconfig/patches/20-merge_config.sh-Allow-to-define-config-prefix.patch [new file with mode: 0644]
support/kconfig/patches/series