[LinuxBIOS] r370 - LinuxBIOSv3/mainboard/emulation/qemu-x86
svn at openbios.org
svn at openbios.org
Wed Jun 27 21:16:00 CEST 2007
Author: rminnich
Date: 2007-06-27 21:16:00 +0200 (Wed, 27 Jun 2007)
New Revision: 370
Modified:
LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile
LinuxBIOSv3/mainboard/emulation/qemu-x86/dts
Log:
the tree mods needed to make qemu compile.
Signed-off-by: Ronald G. Minnich <rminnich at gmail.com>
Acked-by: Stefan Reinauer <stepan at coresystems.de>
Modified: LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile
===================================================================
--- LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile 2007-06-27 19:14:26 UTC (rev 369)
+++ LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile 2007-06-27 19:16:00 UTC (rev 370)
@@ -52,11 +52,15 @@
$(obj)/mainboard/$(MAINBOARDDIR)/mainboard.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.o
-$(obj)/mainboard/$(MAINBOARDDIR)/statictree.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.c
+$(obj)/mainboard/$(MAINBOARDDIR)/statictree.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.c $(obj)/statictree.h
$(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(CC) $(CFLAGS) $(LINUXBIOSINCLUDE) -c -o $@ $<
+ $(Q)$(CC) $(INITCFLAGS) $(LINUXBIOSINCLUDE) -c -o $@ $<
-$(obj)/mainboard/$(MAINBOARDDIR)/statictree.c: $(src)/mainboard/$(MAINBOARDDIR)/dts $(obj)/util/dtc/dtc
+$(obj)/statictree.h: $(src)/mainboard/$(MAINBOARDDIR)/dts $(obj)/util/dtc/dtc
+ $(Q)printf " DTC (static.h) $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)$(obj)/util/dtc/dtc -O lbh mainboard/$(MAINBOARDDIR)/dts > $@
+
+$(obj)/mainboard/$(MAINBOARDDIR)/statictree.c: $(src)/mainboard/$(MAINBOARDDIR)/dts $(obj)/util/dtc/dtc $(obj)/statictree.h
$(Q)printf " DTC $(subst $(shell pwd)/,,$(@))\n"
$(Q)$(obj)/util/dtc/dtc -O lb mainboard/$(MAINBOARDDIR)/dts > $@
Modified: LinuxBIOSv3/mainboard/emulation/qemu-x86/dts
===================================================================
--- LinuxBIOSv3/mainboard/emulation/qemu-x86/dts 2007-06-27 19:14:26 UTC (rev 369)
+++ LinuxBIOSv3/mainboard/emulation/qemu-x86/dts 2007-06-27 19:16:00 UTC (rev 370)
@@ -18,43 +18,25 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/{
- config = "mainboard,emulation,qemu-x86";
enabled;
-
+ constructor = "qemuvga_constructors";
cpus {
enabled;
};
domain0 {
- enabled;
- config = "northbridge,intel,i440bxemulation";
+ /config/("northbridge/intel/i440bxemulation");
ops = "i440bxemulation_pcidomainops";
+ enabled;
pcidomain = "0";
device0,0 {
enabled;
pcipath = "0,0";
};
-/* southbridge,intel,piix4{
- pcipath = "0,0";
+ southbridge,intel,piix4{
+ /config/("southbridge/intel/i82371eb");
+ pcipath = "1,0";
enabled;
};
-*/
};
};
-
-%%
-
-#include <southbridge/intel/i82371eb/config.h>
-extern struct constructor qemuvga_constructors[];
-
-struct mainboard_emulation_qemu_x86_config root = {
- .nothing = 1,
-};
-
-struct northbridge_intel_i440bx_config domain0 = {
- .ramsize = CONFIG_NORTHBRIDGE_INTEL_I440BXEMULATION_RAMSIZE,
-};
-
-struct constructor *all_constructors[] = {
- i440bx_constructors, i82371eb_constructors, qemuvga_constructors, 0
-};
More information about the coreboot
mailing list