From 16348790c4015046fbda7b5bd00ce5681335f90d Mon Sep 17 00:00:00 2001 From: batt Date: Fri, 4 Sep 2009 15:41:04 +0000 Subject: [PATCH] Refactor for clarity. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2881 38d2e660-2303-0410-9eaa-f027e97ec537 --- wizard/mktemplates/template.mk | 13 +++++-------- wizard/mktemplates/template_wiz.mk | 4 ++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/wizard/mktemplates/template.mk b/wizard/mktemplates/template.mk index 35896c47..96e6928e 100644 --- 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 67e37ad8..f2d34621 100644 --- 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 -- 2.25.1