[coreboot] coreinfo: Build system fixes
Jordan Crouse
jordan.crouse at amd.com
Thu Apr 3 23:30:49 CEST 2008
On 03/04/08 23:22 +0200, Uwe Hermann wrote:
> See patch.
>
>
> Uwe.
> --
> http://www.hermann-uwe.de | http://www.holsham-traders.de
> http://www.crazy-hacks.org | http://www.unmaintained-free-software.org
> 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>
> Index: Makefile
> ===================================================================
> --- Makefile (Revision 3210)
> +++ Makefile (Arbeitskopie)
> @@ -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
> Index: util/kconfig/confdata.c
> ===================================================================
> --- util/kconfig/confdata.c (Revision 3210)
> +++ util/kconfig/confdata.c (Arbeitskopie)
> @@ -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)
> Index: util/kconfig/conf.c
> ===================================================================
> --- util/kconfig/conf.c (Revision 3210)
> +++ util/kconfig/conf.c (Arbeitskopie)
> @@ -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"));
> --
> coreboot mailing list
> coreboot at coreboot.org
> http://www.coreboot.org/mailman/listinfo/coreboot
--
Jordan Crouse
Systems Software Development Engineer
Advanced Micro Devices, Inc.
More information about the coreboot
mailing list