From 350e006fe37b764db1dab343001a633477faa195 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Thu, 27 Aug 2009 12:59:21 +0000
Subject: [PATCH] Add flashing interface variables.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2795 38d2e660-2303-0410-9eaa-f027e97ec537
---
 examples/at91sam7/at91sam7s.mk |  1 +
 examples/at91sam7/at91sam7x.mk |  1 +
 examples/triface/triface.mk    |  4 ++++
 wizard/mktemplates/template.mk | 30 ++++++++++++++++++------------
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/examples/at91sam7/at91sam7s.mk b/examples/at91sam7/at91sam7s.mk
index 3dc9b6b6..406eece8 100644
--- a/examples/at91sam7/at91sam7s.mk
+++ b/examples/at91sam7/at91sam7s.mk
@@ -47,4 +47,5 @@ at91sam7s_LDFLAGS = -nostartfiles -T bertos/cpu/arm/scripts/at91sam7_256_rom.ld
 at91sam7s_CPU = arm7tdmi
 
 at91sam7s_PROGRAMMER_CPU = at91sam7
+at91sam7s_PROGRAMMER_TYPE = jtag-tiny
 at91sam7s_FLASH_SCRIPT = bertos/cpu/arm/scripts/flash.sh
diff --git a/examples/at91sam7/at91sam7x.mk b/examples/at91sam7/at91sam7x.mk
index 63081d04..2017977e 100644
--- a/examples/at91sam7/at91sam7x.mk
+++ b/examples/at91sam7/at91sam7x.mk
@@ -47,4 +47,5 @@ at91sam7x_LDFLAGS = -nostartfiles -T bertos/cpu/arm/scripts/at91sam7_256_rom.ld
 at91sam7x_CPU = arm7tdmi
 
 at91sam7x_PROGRAMMER_CPU = at91sam7
+at91sam7x_PROGRAMMER_TYPE = jtag-tiny
 at91sam7x_FLASH_SCRIPT = bertos/cpu/arm/scripts/flash.sh
diff --git a/examples/triface/triface.mk b/examples/triface/triface.mk
index 6061be8c..1ab39681 100644
--- a/examples/triface/triface.mk
+++ b/examples/triface/triface.mk
@@ -59,6 +59,8 @@ triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -D'CPU_FREQ=(14745600UL)'  -D'WIZ_A
 triface_LDFLAGS = -Wl
 
 triface_PROGRAMMER_CPU = atmega1281
+triface_PROGRAMMER_TYPE = stk500v2
+triface_PROGRAMMER_PORT = /dev/ttyS1
 triface_FLASH_SCRIPT = bertos/cpu/avr/scripts/flash.sh
 
 # Set to 1 for debug builds
@@ -89,4 +91,6 @@ boot_LDFLAGS = -Wl,--relax -Wl,--section-start=.text=$(BOOT_ADDR_START)
 
 
 boot_PROGRAMMER_CPU = atmega1281
+boot_PROGRAMMER_TYPE = stk500v2
+boot_PROGRAMMER_PORT = /dev/ttyS1
 boot_FLASH_SCRIPT = bertos/cpu/avr/scripts/flash.sh
diff --git a/wizard/mktemplates/template.mk b/wizard/mktemplates/template.mk
index fc81e51c..155b8f95 100644
--- a/wizard/mktemplates/template.mk
+++ b/wizard/mktemplates/template.mk
@@ -16,34 +16,40 @@ $pname_USER_CSRC = \
 	$main \
 	#
 
-# Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_CSRC = $($pname_WIZARD_CSRC) $($pname_USER_CSRC)
-
 # Files included by the user.
 $pname_USER_PCSRC = \
 	#
 
-# Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_PCSRC = $($pname_WIZARD_PCSRC) $($pname_USER_PCSRC)
-
 # Files included by the user.
 $pname_USER_CPPASRC = \
 	#
 
-# Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_CPPASRC = $($pname_WIZARD_CPPASRC) $($pname_USER_CPPASRC)
-
 # Files included by the user.
 $pname_USER_CXXSRC = \
 	#
 
-# Automatically generated by the wizard. PLEASE DO NOT EDIT!
-$pname_CXXSRC = $($pname_WIZARD_CXXSRC) $($pname_USER_CXXSRC)
-
 # Files included by the user.
 $pname_USER_ASRC = \
 	#
 
+# Programmer interface configuration, see http://dev.bertos.org/wiki/ProgrammerInterface for help
+$pname_PROGRAMMER_TYPE = none
+$pname_PROGRAMMER_PORT = none
+
+####### End of configurable section, do not edit the lines below! #######
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_CSRC = $($pname_WIZARD_CSRC) $($pname_USER_CSRC)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_PCSRC = $($pname_WIZARD_PCSRC) $($pname_USER_PCSRC)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_CPPASRC = $($pname_WIZARD_CPPASRC) $($pname_USER_CPPASRC)
+
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$pname_CXXSRC = $($pname_WIZARD_CXXSRC) $($pname_USER_CXXSRC)
+
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
 $pname_ASRC = $($pname_WIZARD_ASRC) $($pname_USER_ASRC)
 
-- 
2.25.1