r1036 - in coreboot-v3: . arch/x86 lib util/x86emu/include/x86emu util/x86emu/x86emu

Author: hailfinger
Date: 2008-11-16 23:59:52 +0100 (Sun, 16 Nov 2008)
New Revision: 1036

Modified:
   coreboot-v3/Makefile
   coreboot-v3/arch/x86/Makefile
   coreboot-v3/arch/x86/coreboot_table.c
   coreboot-v3/lib/Makefile
   coreboot-v3/lib/console.c
   coreboot-v3/util/x86emu/include/x86emu/x86emu.h
   coreboot-v3/util/x86emu/x86emu/sys.c
Log:
Not a single file is being rebuilt in v3 if build.h changes. That means
the console banner and the option table will never be updated with more
recent build.h strings.

Thanks to Mart Raudsepp for spotting this oddness.

x86emu doesn't care about the contents of build.h, it just uses build.h
to check whether it is compiled in conjunction with coreboot.

Signed-off-by: Carl-Daniel Hailfinger 
Acked-by: Stefan Reinauer

Modified: coreboot-v3/Makefile
===================================================================
--- coreboot-v3/Makefile	2008-11-16 16:09:09 UTC (rev 1035)
+++ coreboot-v3/Makefile	2008-11-16 22:59:52 UTC (rev 1036)
@@ -88,8 +88,7 @@
    		-I$(src)/include \
    		-I$(src)/include/arch/$(ARCH)/ \
    		-I$(src)/mainboard/$(MAINBOARDDIR)/ \
-			-include $(obj)/config.h \
-			-include $(obj)/build.h
+			-include $(obj)/config.h

CC := $(CC_$(ARCH))
 AS := $(AS_$(ARCH))

Modified: coreboot-v3/arch/x86/Makefile
===================================================================
--- coreboot-v3/arch/x86/Makefile	2008-11-16 16:09:09 UTC (rev 1035)
+++ coreboot-v3/arch/x86/Makefile	2008-11-16 22:59:52 UTC (rev 1036)
@@ -248,6 +248,11 @@
 # Build rules.
 #

+$(obj)/arch/x86/coreboot_table.o: $(src)/arch/x86/coreboot_table.c $(obj)/build.h
+	$(Q)mkdir -p $(dir $@)
+	$(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
+	$(Q)$(CC) $(INITCFLAGS) -c $< -o $@
+	
 $(obj)/arch/x86/%.o: $(src)/arch/x86/%.c
    $(Q)mkdir -p $(dir $@)
    $(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"

Modified: coreboot-v3/arch/x86/coreboot_table.c
===================================================================
--- coreboot-v3/arch/x86/coreboot_table.c	2008-11-16 16:09:09 UTC (rev 1035)
+++ coreboot-v3/arch/x86/coreboot_table.c	2008-11-16 22:59:52 UTC (rev 1036)
@@ -31,6 +31,7 @@
 //#include <pirq_routing.h>
 //#include <smp/mpspec.h>
 //#include <acpi.h>
+#include <build.h>

struct lb_header *lb_table_init(unsigned long addr)
 {

Modified: coreboot-v3/lib/Makefile
===================================================================
--- coreboot-v3/lib/Makefile	2008-11-16 16:09:09 UTC (rev 1035)
+++ coreboot-v3/lib/Makefile	2008-11-16 22:59:52 UTC (rev 1036)
@@ -44,6 +44,11 @@
 nrv2b:
 endif

+$(obj)/lib/console.o: $(src)/lib/console.c $(obj)/build.h
+	$(Q)mkdir -p $(dir $@)
+	$(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
+	$(Q)$(CC) $(INITCFLAGS) -c $< -o $@
+
 $(obj)/lib/%.o: $(src)/lib/%.c
    $(Q)mkdir -p $(dir $@)
    $(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"

Modified: coreboot-v3/lib/console.c
===================================================================
--- coreboot-v3/lib/console.c	2008-11-16 16:09:09 UTC (rev 1035)
+++ coreboot-v3/lib/console.c	2008-11-16 22:59:52 UTC (rev 1036)
@@ -6,6 +6,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <globalvars.h>
+#include <build.h>

int vtxprintf(void (*)(unsigned char, void *arg), 
    	void *arg, const char *, va_list);

Modified: coreboot-v3/util/x86emu/include/x86emu/x86emu.h
===================================================================
--- coreboot-v3/util/x86emu/include/x86emu/x86emu.h	2008-11-16 16:09:09 UTC (rev 1035)
+++ coreboot-v3/util/x86emu/include/x86emu/x86emu.h	2008-11-16 22:59:52 UTC (rev 1036)
@@ -43,7 +43,7 @@
 #define __X86EMU_X86EMU_H

/* FIXME: undefine printk for the moment */
-#ifdef COREBOOT_VERSION
+#if 1 /* Coreboot needs to map prinkf to printk. */
 #include <console.h>
 #define printk(x...) printk(BIOS_DEBUG, x)
 #else

Modified: coreboot-v3/util/x86emu/x86emu/sys.c
===================================================================
--- coreboot-v3/util/x86emu/x86emu/sys.c	2008-11-16 16:09:09 UTC (rev 1035)
+++ coreboot-v3/util/x86emu/x86emu/sys.c	2008-11-16 22:59:52 UTC (rev 1036)
@@ -45,7 +45,7 @@
 #include <x86emu/regs.h>
 #include "debug.h"
 #include "prim_ops.h"
-#ifdef COREBOOT_VERSION
+#if 1 /* Coreboot needs to map prinkf to printk. */
 #include "io.h"
 #else
 #include <sys/io.h>