3 files changed, 8 insertions, 34 deletions
diff --git a/doc/configs/arm7_ft2232.cfg b/doc/configs/arm7_ft2232.cfg
index 369d09b1..bb302dbd 100644
--- a/doc/configs/arm7_ft2232.cfg
+++ b/doc/configs/arm7_ft2232.cfg
@@ -3,7 +3,10 @@ telnet_port 4444
 gdb_port 3333
 
 #interface
-interface ftdi2232
+interface ft2232
+ft2232 "Amontec JTAGkey A"
+ft2232 jtagkey
+ft2232 0x0403 0xcff8
 jtag_speed 0
 #use combined on interfaces or targets that can't set TRST/SRST separately
 reset_config trst_and_srst srst_pulls_trst
diff --git a/doc/configs/arm7_ftd2xx.cfg b/doc/configs/arm7_ftd2xx.cfg
deleted file mode 100644
index 59dad02f..00000000
--- a/doc/configs/arm7_ftd2xx.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-#daemon configuration
-telnet_port 4444
-gdb_port 3333
-
-#interface
-interface ftd2xx
-ftd2xx_device_desc "Amontec JTAGkey A"
-ftd2xx_layout jtagkey
-ftd2xx_vid_pid 0x0403 0xcff8
-jtag_speed 2
-#use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config trst_and_srst srst_pulls_trst
-
-#jtag scan chain
-#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
-jtag_device 4 0x1 0xf 0xe
-
-#target configuration
-daemon_startup reset
-#target <type> <startup mode>
-#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
-target arm7tdmi little run_and_halt 0 arm7tdmi-s_r4
-target_script 0 reset h2294_init.script
-run_and_halt_time 0 30
-working_area 0 0x40000000 0x40000 nobackup
-
-#flash configuration
-flash bank lpc2000 0x0 0x40000 0 0 lpc2000_v1 0 14765 calc_checksum
-flash bank cfi 0x80000000 0x400000 2 2 0
diff --git a/doc/configs/arm9_ftd2xx.cfg b/doc/configs/arm9_ft2232.cfg
index 84885dd2..2fecc7fe 100644
--- a/doc/configs/arm9_ftd2xx.cfg
+++ b/doc/configs/arm9_ft2232.cfg
@@ -3,10 +3,10 @@ telnet_port 4444
 gdb_port 3333
 
 #interface
-interface ftd2xx
-ftd2xx_device_desc "Amontec JTAGkey A"
-ftd2xx_layout "jtagkey"
-ftd2xx_vid_pid 0x0403 0xcff8
+interface ft2232
+ft2232 "Amontec JTAGkey A"
+ft2232 "jtagkey"
+ft2232 0x0403 0xcff8
 jtag_speed 1
 #use combined on interfaces or targets that can't set TRST/SRST separately
 reset_config trst_and_srst