From b9a4e333ad23c4eafa22e4e337cfee46216cc19f Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Tue, 10 Oct 2006 01:58:27 +0000 Subject: [PATCH] a trial layout for cpu and arch stuff. git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@21 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- src/Makefile | 7 +++++- src/include/cpu/generic/x86/pci_ops.h | 25 ++++++++++++++++++++++ src/include/device/pci_ops.h | 1 - src/mainboard/emulation/qemu-i386/Makefile | 2 ++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 src/include/cpu/generic/x86/pci_ops.h diff --git a/src/Makefile b/src/Makefile index b97f122040..4de263cec9 100644 --- a/src/Makefile +++ b/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 diff --git a/src/include/cpu/generic/x86/pci_ops.h b/src/include/cpu/generic/x86/pci_ops.h new file mode 100644 index 0000000000..f23f2bca51 --- /dev/null +++ b/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 */ diff --git a/src/include/device/pci_ops.h b/src/include/device/pci_ops.h index 2f678efdf9..d9cda9961b 100644 --- a/src/include/device/pci_ops.h +++ b/src/include/device/pci_ops.h @@ -19,7 +19,6 @@ #include #include -#include uint8_t pci_read_config8(device_t dev, unsigned where); uint16_t pci_read_config16(device_t dev, unsigned where); diff --git a/src/mainboard/emulation/qemu-i386/Makefile b/src/mainboard/emulation/qemu-i386/Makefile index bb12d4dc96..667e9c9fb5 100644 --- a/src/mainboard/emulation/qemu-i386/Makefile +++ b/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