a trial layout for cpu and arch stuff.

git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@21 f3766cd6-281f-0410-b1cd-43a5c92072e9

src/Makefile

@@ -257,8 +257,11 @@ AFLAGS	=
 
 # Use LINUXBIOSINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
+# how to set the fucking LBARCH in time? arg.
 LINUXBIOSINCLUDE    := -Iinclude \
                    -I$(srctree)/include \
+			-I$(srctree)/include/cpu/generic/$(LBARCH)/  \
+			-I$(srctree)/include/cpu/generic/x86/  \
 		   -include include/linuxbios/autoconf.h
 
 CPPFLAGS        := $(LINUXBIOSINCLUDE)
@@ -354,6 +357,7 @@ ifeq ($(config-targets),1)
 # LBBUILD_DEFCONFIG may point out an alternative default configuration
 # used for 'make defconfig'
 include $(srctree)/mainboard/$(MAINBOARD)/Makefile
+
 export LBBUILD_DEFCONFIG
 
 config %config: scripts_basic outputmakefile FORCE
@@ -421,7 +425,8 @@ endif
 include $(srctree)/mainboard/$(MAINBOARD)/Makefile
 
 # mainboard Makefile may override CC so keep this after mainboard Makefile is included
-NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
+#NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
+NOSTDINC_FLAGS += -isystem $(shell $(CC) -print-file-name=include)
 CHECKFLAGS     += $(NOSTDINC_FLAGS)
 
 # warn about C99 declaration after statement

src/include/cpu/generic/x86/pci_ops.h

@@ -0,0 +1,25 @@
+/*
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+*/
+#ifndef ARCH_I386_PCI_OPS_H
+#define ARCH_I386_PCI_OPS_H
+
+const struct pci_bus_operations pci_cf8_conf1;
+const struct pci_bus_operations pci_cf8_conf2;
+
+void pci_set_method(device_t dev);
+
+#endif /* ARCH_I386_PCI_OPS_H */

src/include/device/pci_ops.h

@@ -19,7 +19,6 @@
 
 #include <stdint.h>
 #include <device/device.h>
-#include <arch/pci_ops.h>
 
 uint8_t  pci_read_config8(device_t dev, unsigned where);
 uint16_t pci_read_config16(device_t dev, unsigned where);

src/mainboard/emulation/qemu-i386/Makefile

@@ -1,6 +1,8 @@
 #
 # Makefile for this mainboard
 #
+# not configurable
+LBARCH=x86
 
 obj-y     = mainboard.o irq_tables.o setup_before_car.o
 core-$(COMPRESSORS) += compressors