68abf3998f
- Add support for Winbond W25Q40.V chips - Add support for Macronix MX23L1654, MX23L6454 and MX23L12854 mask ROMs - Add support for Intel Wildcat Point PCH - Add support for Intel Silvermont: Bay Trail, Rangeley and Avoton - Add support for S25FL128P, S25FL129P chips - Add support for a bunch of 29GL parallel flash chips - Add support for Atmel AT49LH004 and AT49LH00B4 - Add new programmer for SPI EEPROMs attached to Intel 82580 NICs - Add support for AMD Bolton chipset - Add Board Enable for ASUS Vintage 2 PH1 (P5LD2-MQ) - Add support for Macronix MX29F022(N)B and MX29F022(N)T - Add support for Macronix MX25U12835F - Add support for Sanyo LE25FW106 - Add IT8212F PCI ATA controller as programmer - Add support for Atmel (now Adesto) AT25DL081 and AT25DL161 - Add VIA VT6421A LPC programmer driver - Add support for ESMT F25L32PA - Add support for Sanyo LE25FW406A - Add support for new AMD SPI controller (SPI 100) - Add support for Sanyo LE25FU406B - Add support for SST25LF020A - Add support for Spansion S25FL132K and S25FL164K - Add support for SST25WF08 - Add support for Macronix MX23L3254 mask ROM - Add support for TUMPA Lite - Add support for Intel 82574L - Add board enable for ASUS A7V8X-MX - Add board enable for ASUS P5LD2-VM DH - Add board enable for abit BF6 - Add support for SST25VF512A, ST25VF020, SST25VF020B chips - Add pinout for Wiggler LPT - Add pinout for Atmel STK200/300 - Add pinout for Altera ByteBlasterMV - Add support for ST M50LPW080 chip - Add an internal DMI decoder - Add board enable for Bcom WinNET P680 - Add support for AT45CS1282 chip - Add support for AT45DB321C - Add support for Atmel AT45DB* chips - Add support for Fujitsu MBM29LV160BE/TE - Add ability to select between chips on GIGABYTE DualBIOS boards - Temporarily disable ftdi support Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
319 lines
7.8 KiB
Diff
319 lines
7.8 KiB
Diff
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
Date: Sat, 18 Sep 2010 09:40:01 +0400
|
|
Subject: [PATCH] Kill some x86-related ifdefs in code - this is now controlled
|
|
via autotools
|
|
|
|
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
|
diff --git a/amd_imc.c b/amd_imc.c
|
|
index b05390c..9aabe3f 100644
|
|
--- a/amd_imc.c
|
|
+++ b/amd_imc.c
|
|
@@ -19,8 +19,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 "hwaccess.h"
|
|
@@ -155,5 +153,3 @@ int amd_imc_shutdown(struct pci_dev *dev)
|
|
|
|
return ret;
|
|
}
|
|
-
|
|
-#endif
|
|
diff --git a/atahpt.c b/atahpt.c
|
|
index 5966be8..03627f4 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 <stdlib.h>
|
|
#include <string.h>
|
|
#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/dmi.c b/dmi.c
|
|
index 093b9a2..a37edea 100644
|
|
--- a/dmi.c
|
|
+++ b/dmi.c
|
|
@@ -30,8 +30,6 @@
|
|
#include "flash.h"
|
|
#include "programmer.h"
|
|
|
|
-#if defined(__i386__) || defined(__x86_64__)
|
|
-
|
|
/* Enable SMBIOS decoding. Currently legacy DMI decoding is enough. */
|
|
#define SM_SUPPORT 0
|
|
|
|
@@ -482,5 +480,3 @@ int dmi_match(const char *pattern)
|
|
|
|
return 0;
|
|
}
|
|
-
|
|
-#endif // defined(__i386__) || defined(__x86_64__)
|
|
diff --git a/ich_descriptors.c b/ich_descriptors.c
|
|
index 1966f66..0e7675a 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
|
|
@@ -923,4 +921,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 c41f9d9..056e6e4 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
|
|
|
|
@@ -599,4 +598,3 @@ int getFCBA_component_density(enum ich_chipset cs, const struct ich_descriptors
|
|
|
|
#endif /* ICH_DESCRIPTORS_FROM_DUMP */
|
|
#endif /* __ICH_DESCRIPTORS_H__ */
|
|
-#endif /* defined(__i386__) || defined(__x86_64__) */
|
|
diff --git a/ichspi.c b/ichspi.c
|
|
index 0cd9c68..b7cc882 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 <string.h>
|
|
#include <stdlib.h>
|
|
#include "flash.h"
|
|
@@ -1877,5 +1875,3 @@ int via_init_spi(struct pci_dev *dev, uint32_t mmio_base)
|
|
|
|
return 0;
|
|
}
|
|
-
|
|
-#endif
|
|
diff --git a/it85spi.c b/it85spi.c
|
|
index 1cc8730..55783ac 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 <string.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
@@ -373,5 +371,3 @@ static int it85xx_spi_send_command(struct flashctx *flash,
|
|
|
|
return 0;
|
|
}
|
|
-
|
|
-#endif
|
|
diff --git a/it87spi.c b/it87spi.c
|
|
index 0a1e894..1218b41 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 <string.h>
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
@@ -434,5 +432,3 @@ static int it8716f_spi_chip_write_256(struct flashctx *flash, const uint8_t *buf
|
|
|
|
return 0;
|
|
}
|
|
-
|
|
-#endif
|
|
diff --git a/mcp6x_spi.c b/mcp6x_spi.c
|
|
index 38e9a8b..eb6bcd3 100644
|
|
--- a/mcp6x_spi.c
|
|
+++ b/mcp6x_spi.c
|
|
@@ -23,8 +23,6 @@
|
|
* created by Michael Karcher.
|
|
*/
|
|
|
|
-#if defined(__i386__) || defined(__x86_64__)
|
|
-
|
|
#include <stdlib.h>
|
|
#include <ctype.h>
|
|
#include "flash.h"
|
|
@@ -164,5 +162,3 @@ int mcp6x_spi_init(int want_spi)
|
|
|
|
return 0;
|
|
}
|
|
-
|
|
-#endif
|
|
diff --git a/nic3com.c b/nic3com.c
|
|
index 4d4702a..1e10325 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 <stdlib.h>
|
|
#include "flash.h"
|
|
#include "programmer.h"
|
|
@@ -142,7 +140,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 ce22c94..3d11f28 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 <stdlib.h>
|
|
#include "flash.h"
|
|
#include "programmer.h"
|
|
@@ -109,7 +107,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 07910a8..1f52c42 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 <stdlib.h>
|
|
#include "flash.h"
|
|
#include "programmer.h"
|
|
@@ -132,7 +130,3 @@ static uint8_t nicrealtek_chip_readb(const struct flashctx *flash, const chipadd
|
|
|
|
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 4f1eee4..f8448eb 100644
|
|
--- a/rayer_spi.c
|
|
+++ b/rayer_spi.c
|
|
@@ -26,7 +26,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 <stdlib.h>
|
|
#include <strings.h>
|
|
@@ -276,7 +275,3 @@ static int dlc5_shutdown(void *data) {
|
|
OUTB(lpt_outbyte, lpt_iobase);
|
|
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 e76d126..ce83c2e 100644
|
|
--- a/satamv.c
|
|
+++ b/satamv.c
|
|
@@ -19,7 +19,6 @@
|
|
*/
|
|
|
|
/* Datasheets are not public (yet?) */
|
|
-#if defined(__i386__) || defined(__x86_64__)
|
|
|
|
#include <stdlib.h>
|
|
#include "flash.h"
|
|
@@ -191,7 +190,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 69fad65..f909aec 100644
|
|
--- a/sb600spi.c
|
|
+++ b/sb600spi.c
|
|
@@ -22,8 +22,6 @@
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
-#if defined(__i386__) || defined(__x86_64__)
|
|
-
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include "flash.h"
|
|
@@ -695,5 +693,3 @@ int sb600_probe_spi(struct pci_dev *dev)
|
|
register_spi_master(&spi_master_yangtze);
|
|
return 0;
|
|
}
|
|
-
|
|
-#endif
|
|
diff --git a/wbsio_spi.c b/wbsio_spi.c
|
|
index 0eeeb9b..050e2e7 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"
|
|
@@ -207,5 +205,3 @@ static int wbsio_spi_read(struct flashctx *flash, uint8_t *buf,
|
|
mmio_readn((void *)(flash->virtual_memory + start), buf, len);
|
|
return 0;
|
|
}
|
|
-
|
|
-#endif
|