aarch64: reset fixes

[fw/openocd] / src / jtag / interfaces.c

diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index 64fdd71d615bf7b8af55738942b2e343155f1b12..ad656a84b1a6ee716298d203a389a8557023b434 100644 (file)
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -51,16 +51,10 @@ extern struct jtag_interface parport_interface;
 #if BUILD_DUMMY == 1
 extern struct jtag_interface dummy_interface;
 #endif
-#if BUILD_FT2232_FTD2XX == 1
-extern struct jtag_interface ft2232_interface;
-#endif
-#if BUILD_FT2232_LIBFTDI == 1
-extern struct jtag_interface ft2232_interface;
-#endif
 #if BUILD_FTDI == 1
 extern struct jtag_interface ftdi_interface;
 #endif
-#if BUILD_USB_BLASTER_LIBFTDI == 1 || BUILD_USB_BLASTER_FTD2XX == 1 || BUILD_USB_BLASTER_2 == 1
+#if BUILD_USB_BLASTER == 1 || BUILD_USB_BLASTER_2 == 1
 extern struct jtag_interface usb_blaster_interface;
 #endif
 #if BUILD_JTAG_VPI == 1
@@ -78,7 +72,7 @@ extern struct jtag_interface at91rm9200_interface;
 #if BUILD_GW16012 == 1
 extern struct jtag_interface gw16012_interface;
 #endif
-#if BUILD_PRESTO_LIBFTDI == 1 || BUILD_PRESTO_FTD2XX == 1
+#if BUILD_PRESTO
 extern struct jtag_interface presto_interface;
 #endif
 #if BUILD_USBPROG == 1
@@ -150,16 +144,10 @@ struct jtag_interface *jtag_interfaces[] = {
 #if BUILD_DUMMY == 1
                &dummy_interface,
 #endif
-#if BUILD_FT2232_FTD2XX == 1
-               &ft2232_interface,
-#endif
-#if BUILD_FT2232_LIBFTDI == 1
-               &ft2232_interface,
-#endif
 #if BUILD_FTDI == 1
                &ftdi_interface,
 #endif
-#if BUILD_USB_BLASTER_LIBFTDI == 1 || BUILD_USB_BLASTER_FTD2XX == 1 || BUILD_USB_BLASTER_2 == 1
+#if BUILD_USB_BLASTER || BUILD_USB_BLASTER_2 == 1
                &usb_blaster_interface,
 #endif
 #if BUILD_JTAG_VPI == 1
@@ -177,7 +165,7 @@ struct jtag_interface *jtag_interfaces[] = {
 #if BUILD_GW16012 == 1
                &gw16012_interface,
 #endif
-#if BUILD_PRESTO_LIBFTDI == 1 || BUILD_PRESTO_FTD2XX == 1
+#if BUILD_PRESTO
                &presto_interface,
 #endif
 #if BUILD_USBPROG == 1