config: add new programmers supported by avrdude and avarice

Signed-off-by: Gregor Riepl <onitake@gmail.com>

diff --git a/config/config.in b/config/config.in
index 500f69d3e8de29e6a600e339a7c007bdab0d62c4..f9e3ea08d0ac594c4755302afbf7a3f6bcb7164d 100644 (file)
--- a/config/config.in
+++ b/config/config.in
@@ -526,27 +526,100 @@ choice 'Programmer' "avrdude CONFIG_AVRDUDE\
 mainmenu_option next_comment
 comment 'Avrdude'
 
-choice 'Programmer type' "futurlec CONFIG_AVRDUDE_PROG_FUTURELEC\
+choice 'Programmer type' "2232HIO CONFIG_AVRDUDE_PROG_2232HIO\
+ 4232h CONFIG_AVRDUDE_PROG_4232H\
+ 89isp CONFIG_AVRDUDE_PROG_89ISP\
  abcmini CONFIG_AVRDUDE_PROG_ABCMINI\
- picoweb CONFIG_AVRDUDE_PROG_PICOWEB\
- sp12 CONFIG_AVRDUDE_PROG_SP12\
  alf CONFIG_AVRDUDE_PROG_ALF\
- bascom CONFIG_AVRDUDE_PROG_BASCOM\
- dt006 CONFIG_AVRDUDE_PROG_DT006\
- pony-stk200 CONFIG_AVRDUDE_PROG_PONY_STK200\
- stk200 CONFIG_AVRDUDE_PROG_STK200\
- pavr CONFIG_AVRDUDE_PROG_PAVR\
- butterfly CONFIG_AVRDUDE_PROG_BUTTERFLY\
+ arduino CONFIG_AVRDUDE_PROG_ARDUINO\
+ arduino-ft232r CONFIG_AVRDUDE_PROG_ARDUINO_FT232R\
+ atisp CONFIG_AVRDUDE_PROG_ATISP\
+ atmelice CONFIG_AVRDUDE_PROG_ATMELICE\
+ atmelice_dw CONFIG_AVRDUDE_PROG_ATMELICE_DW\
+ atmelice_isp CONFIG_AVRDUDE_PROG_ATMELICE_ISP\
+ atmelice_pdi CONFIG_AVRDUDE_PROG_ATMELICE_PDI\
+ avr109 CONFIG_AVRDUDE_PROG_AVR109\
  avr910 CONFIG_AVRDUDE_PROG_AVR910\
  avr911 CONFIG_AVRDUDE_PROG_AVR911\
- stk500 CONFIG_AVRDUDE_PROG_STK500\
+ avrftdi CONFIG_AVRDUDE_PROG_AVRFTDI\
  avrisp CONFIG_AVRDUDE_PROG_AVRISP\
+ avrisp2 CONFIG_AVRDUDE_PROG_AVRISP2\
+ avrispmkII CONFIG_AVRDUDE_PROG_AVRISPMKII\
+ avrispv2 CONFIG_AVRDUDE_PROG_AVRISPV2\
+ bascom CONFIG_AVRDUDE_PROG_BASCOM\
+ blaster CONFIG_AVRDUDE_PROG_BLASTER\
  bsd CONFIG_AVRDUDE_PROG_BSD\
+ buspirate CONFIG_AVRDUDE_PROG_BUSPIRATE\
+ buspirate_bb CONFIG_AVRDUDE_PROG_BUSPIRATE_BB\
+ butterfly CONFIG_AVRDUDE_PROG_BUTTERFLY\
+ butterfly_mk CONFIG_AVRDUDE_PROG_BUTTERFLY_MK\
+ bwmega CONFIG_AVRDUDE_PROG_BWMEGA\
+ C232HM CONFIG_AVRDUDE_PROG_C232HM\
+ c2n232i CONFIG_AVRDUDE_PROG_C2N232I\
  dapa CONFIG_AVRDUDE_PROG_DAPA\
+ dasa CONFIG_AVRDUDE_PROG_DASA\
+ dasa3 CONFIG_AVRDUDE_PROG_DASA3\
+ diecimila CONFIG_AVRDUDE_PROG_DIECIMILA\
+ dragon_dw CONFIG_AVRDUDE_PROG_DRAGON_DW\
+ dragon_hvsp CONFIG_AVRDUDE_PROG_DRAGON_HVSP\
+ dragon_isp CONFIG_AVRDUDE_PROG_DRAGON_ISP\
+ dragon_jtag CONFIG_AVRDUDE_PROG_DRAGON_JTAG\
+ dragon_pdi CONFIG_AVRDUDE_PROG_DRAGON_PDI\
+ dragon_pp CONFIG_AVRDUDE_PROG_DRAGON_PP\
+ dt006 CONFIG_AVRDUDE_PROG_DT006\
+ ere-isp-avr CONFIG_AVRDUDE_PROG_ERE_ISP-AVR\
+ flip1 CONFIG_AVRDUDE_PROG_FLIP1\
+ flip2 CONFIG_AVRDUDE_PROG_FLIP2\
+ frank-stk200 CONFIG_AVRDUDE_PROG_FRANK_STK200\
+ ft232r CONFIG_AVRDUDE_PROG_FT232R\
+ ft245r CONFIG_AVRDUDE_PROG_FT245R\
+ futurlec CONFIG_AVRDUDE_PROG_FUTURELEC\
  jtag1 CONFIG_AVRDUDE_PROG_JTAG1\
- avr109 CONFIG_AVRDUDE_PROG_AVR109\
- avrispmkii CONFIG_AVRDUDE_PROG_AVRISPMKII\
- arduino CONFIG_AVRDUDE_PROG_ARDUINO\
+ jtag1slow CONFIG_AVRDUDE_PROG_JTAG1SLOW\
+ jtag2 CONFIG_AVRDUDE_PROG_JTAG2\
+ jtag2avr32 CONFIG_AVRDUDE_PROG_JTAG2AVR32\
+ jtag2dw CONFIG_AVRDUDE_PROG_JTAG2DW\
+ jtag2fast CONFIG_AVRDUDE_PROG_JTAG2FAST\
+ jtag2isp CONFIG_AVRDUDE_PROG_JTAG2ISP\
+ jtag2pdi CONFIG_AVRDUDE_PROG_JTAG2PDI\
+ jtag2slow CONFIG_AVRDUDE_PROG_JTAG2SLOW\
+ jtag3 CONFIG_AVRDUDE_PROG_JTAG3\
+ jtag3dw CONFIG_AVRDUDE_PROG_JTAG3DW\
+ jtag3isp CONFIG_AVRDUDE_PROG_JTAG3ISP\
+ jtag3pdi CONFIG_AVRDUDE_PROG_JTAG3PDI\
+ jtagkey CONFIG_AVRDUDE_PROG_JTAGKEY\
+ jtagmkI CONFIG_AVRDUDE_PROG_JTAGMKI\
+ jtagmkII CONFIG_AVRDUDE_PROG_JTAGMKII\
+ jtagmkII_avr32 CONFIG_AVRDUDE_PROG_JTAGMKII_AVR32\
+ lm3s811 CONFIG_AVRDUDE_PROG_LM3S811\
+ mib510 CONFIG_AVRDUDE_PROG_MIB510\
+ mkbutterfly CONFIG_AVRDUDE_PROG_MKBUTTERFLY\
+ nibobee CONFIG_AVRDUDE_PROG_NIBOBEE\
+ o-link CONFIG_AVRDUDE_PROG_O_LINK\
+ openmoko CONFIG_AVRDUDE_PROG_OPENMOKO\
+ pavr CONFIG_AVRDUDE_PROG_PAVR\
+ pickit2 CONFIG_AVRDUDE_PROG_PICKIT2\
+ picoweb CONFIG_AVRDUDE_PROG_PICOWEB\
+ pony-stk200 CONFIG_AVRDUDE_PROG_PONY_STK200\
+ ponyser CONFIG_AVRDUDE_PROG_PONYSER\
+ siprog CONFIG_AVRDUDE_PROG_SIPROG\
+ sp12 CONFIG_AVRDUDE_PROG_SP12\
+ stk200 CONFIG_AVRDUDE_PROG_STK200\
+ stk500 CONFIG_AVRDUDE_PROG_STK500\
+ stk500hvsp CONFIG_AVRDUDE_PROG_STK500HVSP\
+ stk500pp CONFIG_AVRDUDE_PROG_STK500PP\
+ stk500v1 CONFIG_AVRDUDE_PROG_STK500V1\
+ stk500v2 CONFIG_AVRDUDE_PROG_STK500V2\
+ stk600 CONFIG_AVRDUDE_PROG_STK600\
+ stk600hvsp CONFIG_AVRDUDE_PROG_STK600HVSP\
+ stk600pp CONFIG_AVRDUDE_PROG_STK600PP\
+ UM232H CONFIG_AVRDUDE_PROG_UM232H\
+ usbasp CONFIG_AVRDUDE_PROG_USBASP\
+ usbasp-clone CONFIG_AVRDUDE_PROG_USBASP_CLONE\
+ usbtiny CONFIG_AVRDUDE_PROG_USBTINY\
+ wiring CONFIG_AVRDUDE_PROG_WIRING\
+ xil CONFIG_AVRDUDE_PROG_XIL\
+ xplainedpro CONFIG_AVRDUDE_PROG_XPLAINEDPRO\
 " stk200
 
 string 'Port device' CONFIG_AVRDUDE_PORT '/dev/parport0'
@@ -563,7 +636,8 @@ string 'Port device' CONFIG_AVARICE_PORT '/dev/ttyS0'
 int 'Debug TCP Port' CONFIG_AVARICE_DEBUG_PORT '1234'
 
 choice 'Programmer type' "mkI CONFIG_AVARICE_PROG_MKI\
- mkII CONFIG_AVARICE_PROG_MKII
+ mkII CONFIG_AVARICE_PROG_MKII\
+ dragon CONFIG_AVARICE_PROG_DRAGON
 " mkI
 
 endmenu

diff --git a/config/generate_aversive_config b/config/generate_aversive_config
index 564ba37abbbe80760ffecf15474d8c468bc0f0fa..873e60f23e80c1de44e4bff7d485ab3fb2aed393 100755 (executable)
--- a/config/generate_aversive_config
+++ b/config/generate_aversive_config
@@ -181,6 +181,11 @@ if grep "CONFIG_AVARICE_PROG_MKII=y" $1 > /dev/null 2> /dev/null
     echo "AVARICE_PROGRAMMER = mkII" >> $2
 fi
 
+if grep "CONFIG_AVARICE_PROG_DRAGON=y" $1 > /dev/null 2> /dev/null
+    then
+    echo "AVARICE_PROGRAMMER = dragon" >> $2
+fi
+
 echo -n "AVARICE_PORT = " >> $2
 echo `grep "CONFIG_AVARICE_PORT" $1 | sed s,CONFIG_AVARICE_PORT=,,` >> $2