Merge needed define.

[bertos.git] / config.mk

diff --git a/config.mk b/config.mk
index e41cc6b049dbef9cca5cc34bda3f061d6f623946..5ace0dbdf4c0f90ac29b5b1553ecadb5ca9090d4 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -3,13 +3,8 @@
 # Copyright 2002,2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
 # All rights reserved.
 #
-# Based on:
-#   GCC-AVR standard Makefile part 1
-#   Volker Oth 1/2000
-#
 # Author: Bernardo Innocenti <bernie@develer.com>
-#
-# $Log$
+# Based on: GCC-AVR standard Makefile part 1, Volker Oth 1/2000
 #
 
 #
@@ -18,20 +13,6 @@
 -include pgm_config.mk
 DPROG ?= -V -c stk500 -P /dev/ttyS0
 
-# AVR ISP dongle that blows up easily
-#DPROG = -V -c stk500 -P /dev/ttyS0
-#DPROG = -V -c jtag2slow
-#-P /dev/ttyUSB0
-
-# STK200 parallel cable
-#DPROG = -c stk200 -E noreset
-
-# JTAG ICE mkII
-#DPROG = avarice --mkII -j usb -l
-
-# PonyProg serial programmer
-#DPROG = -c dasa2
-
 # Set to 1 to build for embedded devices.
 # e.g. produce target.elf instead of target and target_nostrip
 EMBEDDED_TARGET = 1