summaryrefslogtreecommitdiffstats
path: root/spi25.c
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-05-31 15:27:27 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-05-31 15:27:27 +0000
commit71127727dcff4f7e70b318d7a5eb87f0c8fcc4d7 (patch)
treeecd2ba9f67c51b833d22051628b79ccb1dcde0a2 /spi25.c
parenta0020df6309e4536fcb97bd93bc46e2068f0ffe8 (diff)
downloadast2050-flashrom-71127727dcff4f7e70b318d7a5eb87f0c8fcc4d7.zip
ast2050-flashrom-71127727dcff4f7e70b318d7a5eb87f0c8fcc4d7.tar.gz
So far, we have up to 4 different names for the same thing (ignoring capitalization)
CONFIG_FT2232SPI (makefile config option) FT2232_SPI_SUPPORT (#define) ft2232spi (programmer name) ft2232_spi.c (programmer file) Use CONFIG_* with underscores for makefile config options and #defines and kill the useless _SUPPORT idiom. Use lowercase names with underscores for programmer names and programmer files. With this, you can run "grep -i ft2232_spi" and find everything related to the ft2232_spi driver. Same applies to all other programmers. Corresponding to flashrom svn r1023. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
Diffstat (limited to 'spi25.c')
-rw-r--r--spi25.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/spi25.c b/spi25.c
index 72940c1..c6b5119 100644
--- a/spi25.c
+++ b/spi25.c
@@ -171,7 +171,7 @@ int probe_spi_rdid4(struct flashchip *flash)
{
/* only some SPI chipsets support 4 bytes commands */
switch (spi_controller) {
-#if INTERNAL_SUPPORT == 1
+#if CONFIG_INTERNAL == 1
#if defined(__i386__) || defined(__x86_64__)
case SPI_CONTROLLER_ICH7:
case SPI_CONTROLLER_ICH9:
@@ -180,16 +180,16 @@ int probe_spi_rdid4(struct flashchip *flash)
case SPI_CONTROLLER_WBSIO:
#endif
#endif
-#if FT2232_SPI_SUPPORT == 1
+#if CONFIG_FT2232_SPI == 1
case SPI_CONTROLLER_FT2232:
#endif
-#if DUMMY_SUPPORT == 1
+#if CONFIG_DUMMY == 1
case SPI_CONTROLLER_DUMMY:
#endif
-#if BUSPIRATE_SPI_SUPPORT == 1
+#if CONFIG_BUSPIRATE_SPI == 1
case SPI_CONTROLLER_BUSPIRATE:
#endif
-#if DEDIPROG_SUPPORT == 1
+#if CONFIG_DEDIPROG == 1
case SPI_CONTROLLER_DEDIPROG:
#endif
return probe_spi_rdid_generic(flash, 4);
@@ -1023,7 +1023,7 @@ int spi_aai_write(struct flashchip *flash, uint8_t *buf)
int result;
switch (spi_controller) {
-#if INTERNAL_SUPPORT == 1
+#if CONFIG_INTERNAL == 1
#if defined(__i386__) || defined(__x86_64__)
case SPI_CONTROLLER_WBSIO:
msg_cerr("%s: impossible with Winbond SPI masters,"
OpenPOWER on IntegriCloud