From 815c5d857b34cd9b2bf24ce73a967b1494b3dce0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 18 Sep 2010 09:40:01 +0400 Subject: [PATCH 4/9] Kill some x86-related ifdefs in code - this is now controlled via autotools Signed-off-by: Peter Lemenkov --- atahpt.c | 6 ------ ich_descriptors.c | 3 --- ich_descriptors.h | 2 -- ichspi.c | 4 ---- it85spi.c | 4 ---- it87spi.c | 4 ---- mcp6x_spi.c | 4 ---- nic3com.c | 6 ------ nicnatsemi.c | 6 ------ nicrealtek.c | 6 ------ rayer_spi.c | 5 ----- satamv.c | 5 ----- sb600spi.c | 4 ---- wbsio_spi.c | 4 ---- 14 files changed, 63 deletions(-) diff --git a/atahpt.c b/atahpt.c index 4234f6d..27b106d 100644 --- a/atahpt.c +++ b/atahpt.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined(__i386__) || defined(__x86_64__) - #include #include #include "flash.h" @@ -97,7 +95,3 @@ static uint8_t atahpt_chip_readb(const struct flashctx *flash, OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR); return INB(io_base_addr + BIOS_ROM_DATA); } - -#else -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/ich_descriptors.c b/ich_descriptors.c index b55625e..79b9c20 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined(__i386__) || defined(__x86_64__) - #include "ich_descriptors.h" #ifdef ICH_DESCRIPTORS_FROM_DUMP @@ -840,4 +838,3 @@ int read_ich_descriptors_via_fdo(void *spibar, struct ich_descriptors *desc) return ICH_RET_OK; } #endif /* ICH_DESCRIPTORS_FROM_DUMP */ -#endif /* defined(__i386__) || defined(__x86_64__) */ diff --git a/ich_descriptors.h b/ich_descriptors.h index 34bcc6a..690ba6a 100644 --- a/ich_descriptors.h +++ b/ich_descriptors.h @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined(__i386__) || defined(__x86_64__) #ifndef __ICH_DESCRIPTORS_H__ #define __ICH_DESCRIPTORS_H__ 1 @@ -572,4 +571,3 @@ int getFCBA_component_density(const struct ich_descriptors *desc, uint8_t idx); #endif /* ICH_DESCRIPTORS_FROM_DUMP */ #endif /* __ICH_DESCRIPTORS_H__ */ -#endif /* defined(__i386__) || defined(__x86_64__) */ diff --git a/ichspi.c b/ichspi.c index 403d763..6ecf50a 100644 --- a/ichspi.c +++ b/ichspi.c @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined(__i386__) || defined(__x86_64__) - #include #include #include "flash.h" @@ -1888,5 +1886,3 @@ int via_init_spi(struct pci_dev *dev) return 0; } - -#endif diff --git a/it85spi.c b/it85spi.c index 01cb086..e911ddf 100644 --- a/it85spi.c +++ b/it85spi.c @@ -24,8 +24,6 @@ * Contains the ITE IT85* SPI specific routines */ -#if defined(__i386__) || defined(__x86_64__) - #include #include #include @@ -368,5 +366,3 @@ static int it85xx_spi_send_command(struct flashctx *flash, return 0; } - -#endif diff --git a/it87spi.c b/it87spi.c index fa37d52..d3ba900 100644 --- a/it87spi.c +++ b/it87spi.c @@ -23,8 +23,6 @@ * Contains the ITE IT87* SPI specific routines */ -#if defined(__i386__) || defined(__x86_64__) - #include #include #include "flash.h" @@ -404,5 +402,3 @@ static int it8716f_spi_chip_write_256(struct flashctx *flash, uint8_t *buf, return 0; } - -#endif diff --git a/mcp6x_spi.c b/mcp6x_spi.c index 23f39a5..34be29e 100644 --- a/mcp6x_spi.c +++ b/mcp6x_spi.c @@ -23,8 +23,6 @@ * created by Michael Karcher. */ -#if defined(__i386__) || defined(__x86_64__) - #include #include #include "flash.h" @@ -168,5 +166,3 @@ int mcp6x_spi_init(int want_spi) return 0; } - -#endif diff --git a/nic3com.c b/nic3com.c index 473c7b1..338da53 100644 --- a/nic3com.c +++ b/nic3com.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined(__i386__) || defined(__x86_64__) - #include #include "flash.h" #include "programmer.h" @@ -133,7 +131,3 @@ static uint8_t nic3com_chip_readb(const struct flashctx *flash, OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR); return INB(io_base_addr + BIOS_ROM_DATA); } - -#else -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/nicnatsemi.c b/nicnatsemi.c index eb2a7f8..1bf412c 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined(__i386__) || defined(__x86_64__) - #include #include "flash.h" #include "programmer.h" @@ -107,7 +105,3 @@ static uint8_t nicnatsemi_chip_readb(const struct flashctx *flash, */ return INB(io_base_addr + BOOT_ROM_DATA); } - -#else -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/nicrealtek.c b/nicrealtek.c index 32aa434..4a50ec5 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined(__i386__) || defined(__x86_64__) - #include #include "flash.h" #include "programmer.h" @@ -112,7 +110,3 @@ static uint8_t nicrealtek_chip_readb(const struct flashctx *flash, return val; } - -#else -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/rayer_spi.c b/rayer_spi.c index 0011bc0..c88360d 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -28,7 +28,6 @@ * most OS parport drivers will perform many unnecessary accesses although * this driver just treats the parallel port as a GPIO set. */ -#if defined(__i386__) || defined(__x86_64__) #include #include @@ -177,7 +176,3 @@ int rayer_spi_init(void) return 0; } - -#else -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/satamv.c b/satamv.c index e39385b..45a62f7 100644 --- a/satamv.c +++ b/satamv.c @@ -19,7 +19,6 @@ */ /* Datasheets are not public (yet?) */ -#if defined(__i386__) || defined(__x86_64__) #include #include "flash.h" @@ -199,7 +198,3 @@ static uint8_t satamv_chip_readb(const struct flashctx *flash, { return satamv_indirect_chip_readb(addr); } - -#else -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/sb600spi.c b/sb600spi.c index c3d7710..458206a 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined(__i386__) || defined(__x86_64__) - #include "flash.h" #include "programmer.h" #include "spi.h" @@ -321,5 +319,3 @@ int sb600_probe_spi(struct pci_dev *dev) register_spi_programmer(&spi_programmer_sb600); return 0; } - -#endif diff --git a/wbsio_spi.c b/wbsio_spi.c index 774890e..f6076aa 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined(__i386__) || defined(__x86_64__) - #include "flash.h" #include "chipdrivers.h" #include "programmer.h" @@ -205,5 +203,3 @@ static int wbsio_spi_read(struct flashctx *flash, uint8_t *buf, mmio_readn((void *)(flash->virtual_memory + start), buf, len); return 0; } - -#endif -- 1.7.10.1