From e31e0a84c17f9bf29cea7afa481ce587a8e3a1f2 Mon Sep 17 00:00:00 2001
From: "Ronald G. Minnich" <rminnich@gmail.com>
Date: Wed, 24 Jan 2007 20:11:35 +0000
Subject: [PATCH] This now works to the point of creating (from dtc) a
 statictree.c. compile fails;

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Stefan Reinauer <   stepan@coresystems.de >


git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@57 f3766cd6-281f-0410-b1cd-43a5c92072e9
---
 arch/x86/Makefile.target              | 16 +++++++++-------
 mainboard/emulation/qemu-i386/Kconfig |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/arch/x86/Makefile.target b/arch/x86/Makefile.target
index 988e721600..686ccd6dd7 100644
--- a/arch/x86/Makefile.target
+++ b/arch/x86/Makefile.target
@@ -55,7 +55,7 @@ initram:
 # This needs to be compressed with the default compressor
 #
 
-linuxbios_ram: dtc.o
+linuxbios_ram: statictree.o
 	$(Q)echo "building linuxbios_ram"
 
 #
@@ -108,16 +108,18 @@ linuxbios.rom: linuxbios.lar linuxbios.init linuxbios.vpd linuxbios.jump
 		$(objtree)/linuxbios.rom
 
 # miscellaneous important targets. 
-$(obj)/mainboard.o: $(obj)/dtc.o
+$(objtree)/mainboard.o: $(objtree)/statictree.o
 
-$(obj)/dtc.o:  $(obj)/dtc.c
-$(obj)/dtc.c: $(obj)/mainboard/$(CONFIG_CONFIG_MAINBOARD_NAME)/dts $(src)/dts $(obj)/dtc
-	$(obj)/dtc -O lb $(shell ecoh $(src)/mainboard/$(CONFIG_CONFIG_MAINBOARD_NAME)/dts) >$(obj)/dtc.c
+$(objtree)/statictree.o:  $(objtree)/statictree.c
+	$(CC) -c -o $(objtree)/statictree.o  $(objtree)/statictree.c
+
+$(objtree)/statictree.c: $(shell echo $(srctree)/mainboard/$(CONFIG_MAINBOARD_NAME)/dts) $(objtree)/dtc
+	$(objtree)/dtc -O lb $(shell echo $(srctree)/mainboard/$(CONFIG_MAINBOARD_NAME)/dts) >$(objtree)/statictree.c
 
 
-$(obj)/dtc:
+$(objtree)/dtc:
 	$(MAKE) -C $(srctree)/util/dtc/
-	cp $(srctree)/util/dtc/dtc $(obj)
+	cp $(srctree)/util/dtc/dtc $(objtree)
 
 
 .PHONY: linuxbios.rom
diff --git a/mainboard/emulation/qemu-i386/Kconfig b/mainboard/emulation/qemu-i386/Kconfig
index d4d1307a97..29504098ba 100644
--- a/mainboard/emulation/qemu-i386/Kconfig
+++ b/mainboard/emulation/qemu-i386/Kconfig
@@ -1,6 +1,6 @@
-config CONFIG_MAINBOARD_NAME 
+config MAINBOARD_NAME 
 	string
-	default 'emulation/qemu-i386'
+	default emulation/qemu-i386
 	depends BOARD_EMULATION_QEMU_X86
 	help
 	  This is the default mainboard name.