Drop prototype guarding for romcc

Commit "romcc: Don't fail on function prototypes" (11a7db3b) [1]
made romcc not choke on function prototypes anymore. This
allows us to get rid of a lot of ifdefs guarding __ROMCC__ .

[1] http://review.coreboot.org/2424

Change-Id: Ib1be3b294e5b49f5101f2e02ee1473809109c8ac
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/3216
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

src/southbridge/amd/cs5535/cs5535.h

@@ -115,7 +115,7 @@
 /* Flash Memory Mask values */
 #define FLASH_MEM_4K		0xFFFFF000
 
-#if !defined(__ASSEMBLER__) && !defined(__ROMCC__)
+#if !defined(__ASSEMBLER__)
 #if defined(__PRE_RAM__)
 void cs5535_disable_internal_uart(void);
 #else

src/southbridge/amd/cs5536/cs5536.h

@@ -442,7 +442,7 @@
 #define FLASH_IO_128B		0x0000FF80
 #define FLASH_IO_256B		0x0000FF00
 
-#if !defined(__ASSEMBLER__) && !defined(__ROMCC__)
+#if !defined(__ASSEMBLER__)
 #if defined(__PRE_RAM__)
 void cs5536_setup_onchipuart(int uart);
 void cs5536_disable_internal_uart(void);

src/southbridge/intel/bd82x6x/pch.h

@@ -56,7 +56,7 @@
 void intel_pch_finalize_smm(void);
 #endif
 
-#if !defined(__ASSEMBLER__) && !defined(__ROMCC__)
+#if !defined(__ASSEMBLER__)
 #if !defined(__PRE_RAM__)
 #if !defined(__SMM__)
 #include "chip.h"

src/southbridge/intel/i82371eb/i82371eb.h

@@ -21,26 +21,19 @@
 #ifndef SOUTHBRIDGE_INTEL_I82371EB_I82371EB_H
 #define SOUTHBRIDGE_INTEL_I82371EB_I82371EB_H
 
-#if !defined(__ASSEMBLER__)
+#if !defined(__ASSEMBLER__) && !defined(__ACPI__)
 #if !defined(__PRE_RAM__)
-#if !defined(__ACPI__) /* dsdt include */
-
 #include <arch/io.h>
 #include <device/device.h>
 #include "chip.h"
-
 void i82371eb_enable(device_t dev);
 void i82371eb_hard_reset(void);
-
-#endif
-#endif
-#endif
-
-#if defined(__PRE_RAM__) && !defined(__ROMCC__)
+#else
 void enable_smbus(void);
 int smbus_read_byte(u8 device, u8 address);
 void enable_pm(void);
 #endif
+#endif
 
 /* If 'cond' is true this macro sets the bit(s) specified by 'bits' in the
  * 'reg' variable, otherwise it clears those bits.

src/southbridge/intel/i82801ax/i82801ax.h

@@ -24,9 +24,7 @@
 #if !defined(__PRE_RAM__)
 #include "chip.h"
 void i82801ax_enable(device_t dev);
-#endif
-
-#if defined(__PRE_RAM__) && !defined(__ROMCC__)
+#else
 void enable_smbus(void);
 int smbus_read_byte(u8 device, u8 address);
 #endif

src/southbridge/intel/i82801bx/i82801bx.h

@@ -26,7 +26,7 @@
 extern void i82801bx_enable(device_t dev);
 #endif
 
-#if defined(__PRE_RAM__) && !defined(__ROMCC__)
+#if defined(__PRE_RAM__)
 void enable_smbus(void);
 int smbus_read_byte(u8 device, u8 address);
 #endif

src/southbridge/intel/i82801dx/i82801dx.h

@@ -31,7 +31,7 @@
 #ifndef I82801DX_H
 #define I82801DX_H
 
-#if !defined(__ASSEMBLER__) && !defined(__ROMCC__)
+#if !defined(__ASSEMBLER__)
 #if !defined(__PRE_RAM__)
 #include "chip.h"
 extern void i82801dx_enable(device_t dev);

src/southbridge/intel/i82801gx/i82801gx.h

@@ -37,7 +37,7 @@
 #ifndef __ACPI__
 #define DEBUG_PERIODIC_SMIS 0
 
-#if !defined(__ASSEMBLER__) && !defined(__ROMCC__)
+#if !defined(__ASSEMBLER__)
 #if !defined(__PRE_RAM__)
 #include "chip.h"
 extern void i82801gx_enable(device_t dev);

src/southbridge/intel/lynxpoint/pch.h

@@ -21,7 +21,6 @@
 #ifndef SOUTHBRIDGE_INTEL_LYNXPOINT_PCH_H
 #define SOUTHBRIDGE_INTEL_LYNXPOINT_PCH_H
 
-
 /*
  * Lynx Point PCH PCI Devices:
  *
@@ -125,7 +124,7 @@ struct rcba_config_instruction
 	u32 or_value;
 };
 
-#if !defined(__ASSEMBLER__) && !defined(__ROMCC__)
+#if !defined(__ASSEMBLER__)
 void pch_config_rcba(const struct rcba_config_instruction *rcba_config);
 int pch_silicon_revision(void);
 int pch_silicon_type(void);

src/southbridge/nvidia/mcp55/mcp55.h

@@ -33,9 +33,7 @@
 void mcp55_enable(device_t dev);
 extern struct pci_operations mcp55_pci_ops;
 #else
-#if !defined(__ROMCC__)
 void enable_fid_change_on_sb(unsigned sbbusn, unsigned sbdn);
 #endif
-#endif
 
 #endif

src/southbridge/sis/sis966/sis966.h

@@ -35,8 +35,6 @@
 #define DEBUG_USB 0
 #define DEBUG_USB2 0
 
-#if !defined(__ROMCC__)
 void sis966_enable(device_t dev);
-#endif
 
 #endif /* SIS966_H */

src/southbridge/via/vt8237r/vt8237r.h

@@ -145,7 +145,6 @@ __attribute__ ((packed))
 
 
 #ifdef __PRE_RAM__
-#ifndef __ROMCC__
 u8 smbus_read_byte(u8 dimm, u8 offset);
 void smbus_write_byte(u8 dimm, u8 offset, u8 data);
 void enable_smbus(void);
@@ -155,7 +154,6 @@ void vt8237_sb_enable_fid_vid(void);
 void enable_rom_decode(void);
 void vt8237_early_spi_init(void);
 int vt8237_early_network_init(struct vt8237_network_rom *rom);
-#endif
 #else
 void writeback(device_t dev, u16 where, u8 what);
 void dump_south(device_t dev);