From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Thu, 3 Apr 2008 22:20:35 +0000 (+0000)
Subject: Doing another 'make' after a 'make clean' was broken until now. Fix it
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=c7582274068429db814b130ba83e6f123c961f80;p=coreboot.git

Doing another 'make' after a 'make clean' was broken until now. Fix it
by not deleting build/config.h during 'make clean' (only in 'make distclean').

Also, change the default behaviour of 'make' from asking the user to
run 'make config' (or similar) to actually _run_ 'make config' without
asking questions. It's always possible to explicitly invoke
'make menuconfig' or 'make xconfig' and so on, of course.

Finally, make _all_ targets (allyesconfig, randconfig, and so on)
generate a build/config.h file, as we always #include it.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3211 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---

diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
index a05edbc05..e3d4b6ed1 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 cb215a6c7..3d4257242 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 da24d2759..087b366f2 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)