[PATCH] kconfig: add KCONFIG_ALLCONFIG support for tinyconfig

[Randrianaina Georges Aaron]

Since f8f0d06438e5, tinyconfig overrides KCONFIG_ALLCONFIG to
include kernel/configs/tiny-base.config. However, this ignores
user's preset if defined.

This modification checks if the user has set KCONFIG_ALLCONFIG
and if so, concatenates it with kernel/configs/tiny-base.config
to be used as preset config symbols.

Signed-off-by: Randrianaina Georges Aaron <georges-aaron.randrianaina@xxxxxxxx>
---
 scripts/kconfig/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index b8ef0fb4bbef..337693fb4762 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -102,7 +102,13 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c
 
 PHONY += tinyconfig
 tinyconfig:
+ifeq ($(KCONFIG_ALLCONFIG),)
 	$(Q)KCONFIG_ALLCONFIG=kernel/configs/tiny-base.config $(MAKE) -f $(srctree)/Makefile allnoconfig
+else
+	$(Q)cat $(KCONFIG_ALLCONFIG) <(echo) kernel/configs/tiny-base.config > .tmp.config
+	$(Q)KCONFIG_ALLCONFIG=.tmp.config $(MAKE) -f $(srctree)/Makefile allnoconfig
+	$(Q)rm -f .tmp.config
+endif
 	$(Q)$(MAKE) -f $(srctree)/Makefile tiny.config
 
 # CHECK: -o cache_dir=<path> working?
-- 
2.34.1