summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--payloads/coreinfo/Makefile6
-rw-r--r--payloads/coreinfo/util/kconfig/conf.c4
-rw-r--r--payloads/coreinfo/util/kconfig/confdata.c2
3 files changed, 9 insertions, 3 deletions
diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
index a05edbc051..e3d4b6ed1b 100644
--- a/payloads/coreinfo/Makefile
+++ b/payloads/coreinfo/Makefile
@@ -59,8 +59,7 @@ TARGET = $(obj)/coreinfo.elf
ifeq ($(strip $(HAVE_DOTCONFIG)),)
-all:
- $(Q)printf "Please run make config/menuconfig/xconfig/gconfig first.\n"
+all: config
else
@@ -91,9 +90,10 @@ prepare:
$(Q)mkdir -p $(obj)/util/kconfig/lxdialog
clean:
- $(Q)rm -rf build
+ $(Q)rm -rf build/util build/*.conf build/*.cmd build/*.elf build/*.o
distclean: clean
+ $(Q)rm -rf build
$(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
include util/kconfig/Makefile
diff --git a/payloads/coreinfo/util/kconfig/conf.c b/payloads/coreinfo/util/kconfig/conf.c
index cb215a6c70..3d42572420 100644
--- a/payloads/coreinfo/util/kconfig/conf.c
+++ b/payloads/coreinfo/util/kconfig/conf.c
@@ -624,6 +624,10 @@ int main(int ac, char **av)
fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
return 1;
}
+ if (conf_write_autoconf()) {
+ fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
+ return 1;
+ }
skip_check:
if (input_mode == ask_silent && conf_write_autoconf()) {
fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
diff --git a/payloads/coreinfo/util/kconfig/confdata.c b/payloads/coreinfo/util/kconfig/confdata.c
index da24d2759f..087b366f21 100644
--- a/payloads/coreinfo/util/kconfig/confdata.c
+++ b/payloads/coreinfo/util/kconfig/confdata.c
@@ -679,8 +679,10 @@ int conf_write_autoconf(void)
file_write_dep("build/auto.conf.cmd");
+#if 0
if (conf_split_config())
return 1;
+#endif
out = fopen(".tmpconfig", "w");
if (!out)