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