diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2008-10-17 00:06:50 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2008-10-17 00:06:50 +0000 |
| commit | 8829c7d904125af8040a7c15b11cbd8e7040222d (patch) | |
| tree | 374a6b0a61ec736bfff0903b6064c59a02c92485 | |
| parent | 8a3ad59653c2ecb9de0ffc91714855748f8a22b9 (diff) | |
| download | coreboot-8829c7d904125af8040a7c15b11cbd8e7040222d.tar.xz | |
ROMCC chokes on vt8237_early_network_init(). Since that function is only
called from one target and that target is compiled with GCC, make the
function dependent on GCC.
ROMCC also chokes on the ULL suffix for integer constants. Change the
affected ones to UL for ROMCC compiled code.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3664 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | src/southbridge/via/vt8237r/vt8237r.h | 4 | ||||
| -rw-r--r-- | src/southbridge/via/vt8237r/vt8237r_early_smbus.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/southbridge/via/vt8237r/vt8237r.h b/src/southbridge/via/vt8237r/vt8237r.h index 9f0e791f51..9beef960f7 100644 --- a/src/southbridge/via/vt8237r/vt8237r.h +++ b/src/southbridge/via/vt8237r/vt8237r.h @@ -29,7 +29,11 @@ #define VT8237R_SMBUS_IO_BASE 0x400 /* 0x0 disabled, 0x2 reserved, 0xf = IRQ15 */ #define VT8237R_ACPI_IRQ 0x9 +#if defined(__GNUC__) #define VT8237S_SPI_MEM_BASE 0xfed02000ULL +#else +#define VT8237S_SPI_MEM_BASE 0xfed02000UL +#endif #define VT8237R_HPET_ADDR 0xfed00000ULL #define VT8237R_APIC_BASE 0xfec00000ULL diff --git a/src/southbridge/via/vt8237r/vt8237r_early_smbus.c b/src/southbridge/via/vt8237r/vt8237r_early_smbus.c index 9c91a71963..af91707ec9 100644 --- a/src/southbridge/via/vt8237r/vt8237r_early_smbus.c +++ b/src/southbridge/via/vt8237r/vt8237r_early_smbus.c @@ -359,6 +359,11 @@ void vt8237_early_spi_init(void) (*spireg) &= 0xff00; } +/* This #if is special. ROMCC chokes on the (rom == NULL) comparison. + * Since the whole function is only called for one target and that target + * is compiled with GCC, hide the function from ROMCC and be happy. + */ +#if defined(__GNUC__) /* * Offset 0x58: * 31:20 reserved @@ -481,3 +486,4 @@ int vt8237_early_network_init(struct vt8237_network_rom *rom) /* We are done, config will be used after PCIRST#. */ return 1; } +#endif |