From: duplo Date: Fri, 10 Apr 2009 14:15:08 +0000 (+0000) Subject: Add the cpu flag name in the template X-Git-Tag: 2.1.0~198 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=722fd5cd013661a095b485dab5565222a1d30ac7;p=bertos.git Add the cpu flag name in the template git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2484 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 5666e558..5478cf15 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -85,6 +85,7 @@ def mkGenerator(project_info, makefile): """ mk_data = {} mk_data["$pname"] = os.path.basename(project_info.info("PROJECT_PATH")) + mk_data["$cpuflag"] = project_info.info("CPU_INFOS")["CPU_FLAG_NAME"] mk_data["$cpuname"] = project_info.info("CPU_INFOS")["CORE_CPU"] mk_data["$cflags"] = " ".join(project_info.info("CPU_INFOS")["C_FLAGS"]) mk_data["$ldflags"] = " ".join(project_info.info("CPU_INFOS")["LD_FLAGS"]) diff --git a/wizard/const.py b/wizard/const.py index 454a76e4..716f0b51 100644 --- a/wizard/const.py +++ b/wizard/const.py @@ -15,6 +15,7 @@ CPU_DEF = { "DEFINITION_PATH": "", "TOOLCHAIN": "", "CPU_TAGS": [], + "CPU_FLAG_NAME": "", "CORE_CPU": "", "SCRIPT_DIR": "", "HW_DIR": "", diff --git a/wizard/mktemplates/template.mk b/wizard/mktemplates/template.mk index 3efbaa0c..b42dd097 100644 --- a/wizard/mktemplates/template.mk +++ b/wizard/mktemplates/template.mk @@ -18,7 +18,7 @@ $pname_PREFIX = $prefix $pname_SUFFIX = $suffix -$pname_MCU = $cpuname +$pname_$cpuflag = $cpuname # Files automatically generated by the wizard. DO NOT EDIT, USE $pname_USER_CSRC INSTEAD! $pname_WIZARD_CSRC = \