Refactor for clarity.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2881 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/wizard/mktemplates/template.mk b/wizard/mktemplates/template.mk
index 35896c47af8609d14bf8db8d3c939d9e72dde630..96e6928ef5350b972b43a28c6e10ccf62740d557 100644 (file)
--- a/wizard/mktemplates/template.mk
+++ b/wizard/mktemplates/template.mk
@@ -8,8 +8,9 @@
 #
 #
 
-# Include the mk file generated by the wizard
-include $pname/$pname_wiz.mk
+# Programmer interface configuration, see http://dev.bertos.org/wiki/ProgrammerInterface for help
+$pname_PROGRAMMER_TYPE = none
+$pname_PROGRAMMER_PORT = none
 
 # Files included by the user.
 $pname_USER_CSRC = \
@@ -32,9 +33,5 @@ $pname_USER_CXXSRC = \
 $pname_USER_ASRC = \
        #
 
-# Programmer interface configuration, see http://dev.bertos.org/wiki/ProgrammerInterface for help
-$pname_PROGRAMMER_TYPE = none
-$pname_PROGRAMMER_PORT = none
-
-
-$cpuparameters
+# Include the mk file generated by the wizard
+include $pname/$pname_wiz.mk

diff --git a/wizard/mktemplates/template_wiz.mk b/wizard/mktemplates/template_wiz.mk
index 67e37ad8307f33c86680fb11e533571aa48ab051..f2d346216dc0edeafac286509a368748efa43ed3 100644 (file)
--- a/wizard/mktemplates/template_wiz.mk
+++ b/wizard/mktemplates/template_wiz.mk
@@ -65,3 +65,7 @@ $pname_CXXSRC = $($pname_CPU_CXXSRC) $($pname_WIZARD_CXXSRC) $($pname_USER_CXXSR
 
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
 $pname_ASRC = $($pname_CPU_ASRC) $($pname_WIZARD_ASRC) $($pname_USER_ASRC)
+
+# CPU specific flags and options, defined in the CPU definition files.
+# Automatically generated by the wizard. PLEASE DO NOT EDIT!
+$cpuparameters