[coreboot] r3211 - in trunk/payloads/coreinfo: . util/kconfig

[svn at coreboot.org]

Author: uwe
Date: 2008-04-04 00:20:35 +0200 (Fri, 04 Apr 2008)
New Revision: 3211

Modified:
   trunk/payloads/coreinfo/Makefile
   trunk/payloads/coreinfo/util/kconfig/conf.c
   trunk/payloads/coreinfo/util/kconfig/confdata.c
Log:
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 at hermann-uwe.de>
Acked-by: Jordan Crouse <jordan.crouse at amd.com>



Modified: trunk/payloads/coreinfo/Makefile
===================================================================
--- trunk/payloads/coreinfo/Makefile	2008-04-02 12:35:45 UTC (rev 3210)
+++ trunk/payloads/coreinfo/Makefile	2008-04-03 22:20:35 UTC (rev 3211)
@@ -59,8 +59,7 @@
 
 ifeq ($(strip $(HAVE_DOTCONFIG)),)
 
-all:
-	$(Q)printf "Please run make config/menuconfig/xconfig/gconfig first.\n"
+all: config
 
 else
 
@@ -91,9 +90,10 @@
 	$(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

Modified: trunk/payloads/coreinfo/util/kconfig/conf.c
===================================================================
--- trunk/payloads/coreinfo/util/kconfig/conf.c	2008-04-02 12:35:45 UTC (rev 3210)
+++ trunk/payloads/coreinfo/util/kconfig/conf.c	2008-04-03 22:20:35 UTC (rev 3211)
@@ -624,6 +624,10 @@
 		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"));

Modified: trunk/payloads/coreinfo/util/kconfig/confdata.c
===================================================================
--- trunk/payloads/coreinfo/util/kconfig/confdata.c	2008-04-02 12:35:45 UTC (rev 3210)
+++ trunk/payloads/coreinfo/util/kconfig/confdata.c	2008-04-03 22:20:35 UTC (rev 3211)
@@ -679,8 +679,10 @@
 
 	file_write_dep("build/auto.conf.cmd");
 
+#if 0
 	if (conf_split_config())
 		return 1;
+#endif
 
 	out = fopen(".tmpconfig", "w");
 	if (!out)