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 5666e558b3d7587d267e53c91f0d47df2cebed82..5478cf154a6b69bc7d799aa84bba327a6cee42c4 100644 (file)
--- 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 454a76e44d3eb36362b3ca005d95ce00d435fde9..716f0b51cd807dd102a3d506da30008ab441ba40 100644 (file)
--- 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 3efbaa0c4e7c83d159aac335bfb9ed856aaa561a..b42dd097c37b34655acc5eeaa7049d1df187c925 100644 (file)
--- 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 = \