Attention is currently required from: Alan Green, Edward O'Callaghan, Angel Pons, Samir Ibradžić.

Nico Huber would like Alan Green, Edward O'Callaghan, Angel Pons and Samir Ibradžić to review this change.

View Change

Revert "ft2232_spi.c: Generalize GPIOL pin control"

This reverts commit 3207844ec0b5dc16f9ae9ee45294213dbf6d060b.

It used the `cs_bits` variable for its own purpose (not CS) which
was only possible because the `cs_bits` semantics were broken earlier.
It also lacks an update to the manpage.

Change-Id: I4a95317b1cf1fc6df9471d0cfb8a6a8f40964fe3
Signed-off-by: Nico Huber <nico.h@gmx.de>
---
M ft2232_spi.c
1 file changed, 1 insertion(+), 43 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/92/55692/1

diff --git a/ft2232_spi.c b/ft2232_spi.c
index d8f1bc3..2eb735a 100644
--- a/ft2232_spi.c
+++ b/ft2232_spi.c
@@ -459,7 +459,7 @@
 	}
 	free(arg);
 
-	/* Allows setting multiple GPIOL pins to high, for example: csgpiol=012 */
+	/* Allows setting multiple GPIOL states, for example: csgpiol=012 */
 	arg = extract_programmer_param("csgpiol");
 	if (arg) {
 		unsigned int ngpios = strlen(arg);
@@ -480,48 +480,6 @@
 	}
 	free(arg);
 
-	/* Allows setting GPIOL pins high, low or input (high-z) */
-	arg = extract_programmer_param("gpiol");
-	if (arg) {
-		int ok = 0;
-		if (strlen(arg) == 4) {
-			ok = 1;
-			for (int i = 0; i < 4; i++) {
-				unsigned int pin = i + 4;
-				switch (toupper(arg[i])) {
-					case 'H':
-						cs_bits |= 1 << pin;
-						pindir |= 1 << pin;
-						break;
-					case 'L':
-						cs_bits &= ~(1 << pin);
-						pindir |= 1 << pin;
-						break;
-					case 'Z':
-						pindir &= ~(1 << pin);
-						break;
-					case 'X':
-						break;
-					default:
-						ok = 0;
-				}
-			}
-		}
-		if (!ok) {
-			msg_perr("Error: Invalid GPIOLs specified: \"%s\".\n"
-				 "Valid values are 4 character strings of H, L, Z and X.\n"
-				 "    H - Set GPIOL output high\n"
-				 "    L - Set GPIOL output low\n"
-				 "    Z - Set GPIOL as input (high impedance)\n"
-				 "    X - Leave as programmer default\n"
-				 "Example: gpiol=LZXH drives GPIOL 0 low, and GPIOL 3 high, sets GPIOL 1\n"
-				 "to an input and leaves GPIOL 2 set according to the programmer type.\n", arg);
-			free(arg);
-			return -2;
-		}
-	}
-	free(arg);
-
 	msg_pdbg("Using device type %s %s ",
 		 get_ft2232_vendorname(ft2232_vid, ft2232_type),
 		 get_ft2232_devicename(ft2232_vid, ft2232_type));

To view, visit change 55692. To unsubscribe, or for help writing mail filters, visit settings.