On Mon, Jul 26, 2010 at 12:01 PM, Peter Stuge <[email protected]> wrote:
> Myles Watson wrote:
>> >> 3. Just use the path
>> >
>> > I think this is *by far* the cleanest approach!
>>
>> I agree that it looks the best. I'm worried that it introduces
>> ambiguity.
>>
>> #include <path/file.h>
>>
>> Could look in src/path/file.h or src/include/path/file.h and others
>>
>> Is that what we want? Should we remove -I$(src) from the command line
>> in the long term?
It won't be, but I think it should only be used for including .c files
for romcc.
> I'm not sure that I feel good about .h files outside include/ being
> referenced from other parts of the code. They should probably be
> moved to include/ if they are needed in more than one place..
So I guess option 1 is the best. It makes it obvious (and ugly) when
that rule is ignored.
>
>> from src/arch/i386/Makefile.bootblock.inc:
>>
>> $(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include
>> -I$(src)/arch/i386/include -I$(obj) -I$(obj)/bootblock -include
>> $(obj)/config.h -I. -I$(src) $< -o $@
I forgot about all of our included .c files. That's the reason for -I$(src).
> And again, why are there include files in
> src/arch/i386/include instead of include/arch-i386 or something?
Linux does it that way. It keeps all of the architecture-specific
code and includes under arch/
include_path.diff: fix the ones that are broken for me.
include_path2.diff: fix the ones that look identical but work anyway.
include_path3.diff: fix <../path/file.h> to be "../../../path/file.h"
to make it obvious that they're not in src/include
Abuild tested.
Signed-off-by: Myles Watson <[email protected]>
Thanks,
Myles
Index: svn/src/mainboard/asus/a8v-e_se/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/asus/a8v-e_se/acpi_tables.c
+++ svn/src/mainboard/asus/a8v-e_se/acpi_tables.c
@@ -28,8 +28,8 @@
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci_ids.h>
-#include <../../../southbridge/via/vt8237r/vt8237r.h>
-#include <../../../southbridge/via/k8t890/k8t890.h>
+#include "../../../southbridge/via/vt8237r/vt8237r.h"
+#include "../../../southbridge/via/k8t890/k8t890.h"
extern const unsigned char AmlCode[];
Index: svn/src/mainboard/asus/a8v-e_se/mptable.c
===================================================================
--- svn.orig/src/mainboard/asus/a8v-e_se/mptable.c
+++ svn/src/mainboard/asus/a8v-e_se/mptable.c
@@ -20,8 +20,8 @@
#include <string.h>
#include <stdint.h>
#include <arch/smp/mpspec.h>
-#include <../../../southbridge/via/vt8237r/vt8237r.h>
-#include <../../../southbridge/via/k8t890/k8t890.h>
+#include "../../../southbridge/via/vt8237r/vt8237r.h"
+#include "../../../southbridge/via/k8t890/k8t890.h"
static void *smp_write_config_table(void *v)
{
Index: svn/src/mainboard/asus/m2v-mx_se/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/asus/m2v-mx_se/acpi_tables.c
+++ svn/src/mainboard/asus/m2v-mx_se/acpi_tables.c
@@ -28,9 +28,9 @@
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci_ids.h>
-#include <../../../southbridge/via/vt8237r/vt8237r.h>
-#include <../../../southbridge/via/k8t890/k8t890.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../southbridge/via/vt8237r/vt8237r.h"
+#include "../../../southbridge/via/k8t890/k8t890.h"
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include <cpu/amd/model_fxx_powernow.h>
extern const unsigned char AmlCode[];
Index: svn/src/mainboard/via/pc2500e/mptable.c
===================================================================
--- svn.orig/src/mainboard/via/pc2500e/mptable.c
+++ svn/src/mainboard/via/pc2500e/mptable.c
@@ -27,7 +27,7 @@
#include <device/pci.h>
#include <string.h>
#include <stdint.h>
-#include <../../../southbridge/via/vt8237r/vt8237r.h>
+#include "../../../southbridge/via/vt8237r/vt8237r.h"
#define bus_isa 2
Index: svn/src/mainboard/amd/dbm690t/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/amd/dbm690t/acpi_tables.c
+++ svn/src/mainboard/amd/dbm690t/acpi_tables.c
@@ -25,7 +25,7 @@
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <cpu/amd/amdk8_sysconf.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include <arch/cpu.h>
#include <cpu/amd/model_fxx_powernow.h>
Index: svn/src/mainboard/amd/mahogany/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/amd/mahogany/acpi_tables.c
+++ svn/src/mainboard/amd/mahogany/acpi_tables.c
@@ -25,7 +25,7 @@
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <cpu/amd/amdk8_sysconf.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include <arch/cpu.h>
#include <cpu/amd/model_fxx_powernow.h>
Index: svn/src/mainboard/amd/pistachio/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/amd/pistachio/acpi_tables.c
+++ svn/src/mainboard/amd/pistachio/acpi_tables.c
@@ -25,7 +25,7 @@
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <cpu/amd/amdk8_sysconf.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include <arch/cpu.h>
#include <cpu/amd/model_fxx_powernow.h>
Index: svn/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
+++ svn/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
@@ -16,7 +16,7 @@
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <cpu/amd/amdk8_sysconf.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include "mb_sysconf.h"
Index: svn/src/mainboard/asrock/939a785gmh/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/asrock/939a785gmh/acpi_tables.c
+++ svn/src/mainboard/asrock/939a785gmh/acpi_tables.c
@@ -25,7 +25,7 @@
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <cpu/amd/amdk8_sysconf.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include <arch/cpu.h>
#include <cpu/amd/model_fxx_powernow.h>
Index: svn/src/mainboard/gigabyte/m57sli/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/gigabyte/m57sli/acpi_tables.c
+++ svn/src/mainboard/gigabyte/m57sli/acpi_tables.c
@@ -29,7 +29,7 @@
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci_ids.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include <cpu/amd/model_fxx_powernow.h>
#include <device/pci.h>
#include <cpu/amd/amdk8_sysconf.h>
Index: svn/src/mainboard/iwill/dk8_htx/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/iwill/dk8_htx/acpi_tables.c
+++ svn/src/mainboard/iwill/dk8_htx/acpi_tables.c
@@ -16,7 +16,7 @@
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <cpu/amd/amdk8_sysconf.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include "mb_sysconf.h"
Index: svn/src/mainboard/kontron/kt690/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/kontron/kt690/acpi_tables.c
+++ svn/src/mainboard/kontron/kt690/acpi_tables.c
@@ -25,7 +25,7 @@
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <cpu/amd/amdk8_sysconf.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include <arch/cpu.h>
#include <cpu/amd/model_fxx_powernow.h>
Index: svn/src/mainboard/technexion/tim5690/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/technexion/tim5690/acpi_tables.c
+++ svn/src/mainboard/technexion/tim5690/acpi_tables.c
@@ -25,7 +25,7 @@
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <cpu/amd/amdk8_sysconf.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include <arch/cpu.h>
#include <cpu/amd/model_fxx_powernow.h>
Index: svn/src/mainboard/technexion/tim8690/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/technexion/tim8690/acpi_tables.c
+++ svn/src/mainboard/technexion/tim8690/acpi_tables.c
@@ -25,7 +25,7 @@
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <cpu/amd/amdk8_sysconf.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include <arch/cpu.h>
#include <cpu/amd/model_fxx_powernow.h>
Index: svn/src/mainboard/tyan/s2891/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2891/acpi_tables.c
+++ svn/src/mainboard/tyan/s2891/acpi_tables.c
@@ -17,7 +17,7 @@
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <cpu/amd/amdk8_sysconf.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include <cpu/amd/model_fxx_powernow.h>
extern const unsigned char AmlCode[];
Index: svn/src/mainboard/tyan/s2892/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2892/acpi_tables.c
+++ svn/src/mainboard/tyan/s2892/acpi_tables.c
@@ -17,7 +17,7 @@
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <cpu/amd/amdk8_sysconf.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include <cpu/amd/model_fxx_powernow.h>
extern const unsigned char AmlCode[];
Index: svn/src/mainboard/tyan/s2895/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2895/acpi_tables.c
+++ svn/src/mainboard/tyan/s2895/acpi_tables.c
@@ -17,7 +17,7 @@
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <cpu/amd/amdk8_sysconf.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "../../../northbridge/amd/amdk8/amdk8_acpi.h"
#include <cpu/amd/model_fxx_powernow.h>
extern const unsigned char AmlCode[];
Index: svn/src/mainboard/via/epia-m700/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/via/epia-m700/acpi_tables.c
+++ svn/src/mainboard/via/epia-m700/acpi_tables.c
@@ -33,7 +33,7 @@
#include <arch/acpi.h>
#include <device/device.h>
#include <device/pci_ids.h>
-#include <../../../northbridge/via/vx800/vx800.h>
+#include "../../../northbridge/via/vx800/vx800.h"
extern const unsigned char AmlCode_dsdt[];
extern const unsigned char AmlCode_ssdt[];
Index: svn/src/mainboard/via/epia-m700/fadt.c
===================================================================
--- svn.orig/src/mainboard/via/epia-m700/fadt.c
+++ svn/src/mainboard/via/epia-m700/fadt.c
@@ -21,7 +21,7 @@
#include <string.h>
#include <arch/acpi.h>
-#include <../../../northbridge/via/vx800/vx800.h>
+#include "../../../northbridge/via/vx800/vx800.h"
void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt)
{
Index: svn/src/mainboard/msi/ms9652_fam10/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/msi/ms9652_fam10/acpi_tables.c
+++ svn/src/mainboard/msi/ms9652_fam10/acpi_tables.c
@@ -29,7 +29,7 @@
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci_ids.h>
-//#include <../../../northbridge/amd/amdfam10/amdfam10_acpi.h>
+//#include "../../../northbridge/amd/amdfam10/amdfam10_acpi.h"
#include <cpu/amd/model_fxx_powernow.h>
#include <device/pci.h>
#include <cpu/amd/amdfam10_sysconf.h>
Index: svn/src/mainboard/amd/dbm690t/fadt.c
===================================================================
--- svn.orig/src/mainboard/amd/dbm690t/fadt.c
+++ svn/src/mainboard/amd/dbm690t/fadt.c
@@ -26,7 +26,7 @@
#include <arch/acpi.h>
#include <arch/io.h>
#include <device/device.h>
-#include <../southbridge/amd/sb600/sb600.h>
+#include "../../../southbridge/amd/sb600/sb600.h"
/*extern*/ u16 pm_base = 0x800;
/* pm_base should be set in sb acpi */
Index: svn/src/mainboard/amd/mahogany/fadt.c
===================================================================
--- svn.orig/src/mainboard/amd/mahogany/fadt.c
+++ svn/src/mainboard/amd/mahogany/fadt.c
@@ -26,7 +26,7 @@
#include <arch/acpi.h>
#include <arch/io.h>
#include <device/device.h>
-#include <../southbridge/amd/sb700/sb700.h>
+#include "../../../southbridge/amd/sb700/sb700.h"
/*extern*/ u16 pm_base = 0x800;
/* pm_base should be set in sb acpi */
Index: svn/src/mainboard/amd/mahogany_fam10/fadt.c
===================================================================
--- svn.orig/src/mainboard/amd/mahogany_fam10/fadt.c
+++ svn/src/mainboard/amd/mahogany_fam10/fadt.c
@@ -26,7 +26,7 @@
#include <arch/acpi.h>
#include <arch/io.h>
#include <device/device.h>
-#include <../southbridge/amd/sb700/sb700.h>
+#include "../../../southbridge/amd/sb700/sb700.h"
/*extern*/ u16 pm_base = 0x800;
/* pm_base should be set in sb acpi */
Index: svn/src/mainboard/amd/pistachio/fadt.c
===================================================================
--- svn.orig/src/mainboard/amd/pistachio/fadt.c
+++ svn/src/mainboard/amd/pistachio/fadt.c
@@ -26,7 +26,7 @@
#include <arch/acpi.h>
#include <arch/io.h>
#include <device/device.h>
-#include <../southbridge/amd/sb600/sb600.h>
+#include "../../../southbridge/amd/sb600/sb600.h"
/*extern*/ u16 pm_base = 0x800;
/* pm_base should be set in sb acpi */
Index: svn/src/mainboard/amd/tilapia_fam10/fadt.c
===================================================================
--- svn.orig/src/mainboard/amd/tilapia_fam10/fadt.c
+++ svn/src/mainboard/amd/tilapia_fam10/fadt.c
@@ -26,7 +26,7 @@
#include <arch/acpi.h>
#include <arch/io.h>
#include <device/device.h>
-#include <../southbridge/amd/sb700/sb700.h>
+#include "../../../southbridge/amd/sb700/sb700.h"
/*extern*/ u16 pm_base = 0x800;
/* pm_base should be set in sb acpi */
Index: svn/src/mainboard/asrock/939a785gmh/fadt.c
===================================================================
--- svn.orig/src/mainboard/asrock/939a785gmh/fadt.c
+++ svn/src/mainboard/asrock/939a785gmh/fadt.c
@@ -26,7 +26,7 @@
#include <arch/acpi.h>
#include <arch/io.h>
#include <device/device.h>
-#include <../southbridge/amd/sb700/sb700.h>
+#include "../../../southbridge/amd/sb700/sb700.h"
/*extern*/ u16 pm_base = 0x800;
/* pm_base should be set in sb acpi */
Index: svn/src/mainboard/kontron/kt690/fadt.c
===================================================================
--- svn.orig/src/mainboard/kontron/kt690/fadt.c
+++ svn/src/mainboard/kontron/kt690/fadt.c
@@ -26,7 +26,7 @@
#include <arch/acpi.h>
#include <arch/io.h>
#include <device/device.h>
-#include <../southbridge/amd/sb600/sb600.h>
+#include "../../../southbridge/amd/sb600/sb600.h"
/*extern*/ u16 pm_base = 0x800;
/* pm_base should be set in sb acpi */
Index: svn/src/mainboard/technexion/tim5690/fadt.c
===================================================================
--- svn.orig/src/mainboard/technexion/tim5690/fadt.c
+++ svn/src/mainboard/technexion/tim5690/fadt.c
@@ -26,7 +26,7 @@
#include <arch/acpi.h>
#include <arch/io.h>
#include <device/device.h>
-#include <../southbridge/amd/sb600/sb600.h>
+#include "../../../southbridge/amd/sb600/sb600.h"
/*extern*/ u16 pm_base = 0x800;
/* pm_base should be set in sb acpi */
Index: svn/src/mainboard/technexion/tim5690/speaker.c
===================================================================
--- svn.orig/src/mainboard/technexion/tim5690/speaker.c
+++ svn/src/mainboard/technexion/tim5690/speaker.c
@@ -29,7 +29,7 @@
#include <arch/io.h>
#include <device/pci.h>
#include <device/pci_ids.h>
-#include <../southbridge/amd/sb600/sb600.h>
+#include "../../../southbridge/amd/sb600/sb600.h"
#include <delay.h>
#endif /* __PRE_RAM__ */
Index: svn/src/mainboard/technexion/tim8690/fadt.c
===================================================================
--- svn.orig/src/mainboard/technexion/tim8690/fadt.c
+++ svn/src/mainboard/technexion/tim8690/fadt.c
@@ -26,7 +26,7 @@
#include <arch/acpi.h>
#include <arch/io.h>
#include <device/device.h>
-#include <../southbridge/amd/sb600/sb600.h>
+#include "../../../southbridge/amd/sb600/sb600.h"
/*extern*/ u16 pm_base = 0x800;
/* pm_base should be set in sb acpi */
Index: svn/src/northbridge/via/vx800/examples/chipset_init.c
===================================================================
--- svn.orig/src/northbridge/via/vx800/examples/chipset_init.c
+++ svn/src/northbridge/via/vx800/examples/chipset_init.c
@@ -21,7 +21,7 @@
#if CONFIG_HAVE_ACPI_RESUME == 1
#include <arch/acpi.h>
#endif
-#include <../northbridge/via/vx800/vx800.h>
+#include "../vx800.h"
#include <arch/io.h>
#include "pci_rawops.h"
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
