From f7c7838968a9a628894815a4a119c904690b2175 Mon Sep 17 00:00:00 2001 From: bkleiner Date: Tue, 12 Sep 2023 09:28:30 +0200 Subject: [PATCH] use MCU_NAME for display --- boards/AT32F435RM.json | 2 +- script/pre_script.py | 2 +- src/core/target.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boards/AT32F435RM.json b/boards/AT32F435RM.json index 954807ec7..d02046bdb 100644 --- a/boards/AT32F435RM.json +++ b/boards/AT32F435RM.json @@ -2,7 +2,7 @@ "build": { "core": "ArteryTek AT32", "cpu": "cortex-m4", - "extra_flags": "-DAT32F4xx -DAT32F435 -DAT32F4 -DAT32 -DMCU_NAME=at32f435", + "extra_flags": "-DAT32F4xx -DAT32F435 -DAT32F4 -DAT32 -DMCU_NAME=at32f435m", "f_cpu": "288000000L", "mcu": "at32f435", "product_line": "AT32F435xM", diff --git a/script/pre_script.py b/script/pre_script.py index b1567269a..19a8e5b53 100644 --- a/script/pre_script.py +++ b/script/pre_script.py @@ -50,7 +50,7 @@ BUILD_UNFLAGS=["-Og", "-Os", "-DDEBUG"], ASFLAGS=system_flags + common_flags, CCFLAGS=system_flags + common_flags, - CPPDEFINES=[("TARGET_MCU", env["BOARD_MCU"]), ("GIT_VERSION", git_version)], + CPPDEFINES=[("GIT_VERSION", git_version)], LINKFLAGS=system_flags + common_flags, ) diff --git a/src/core/target.c b/src/core/target.c index 5f40b186f..637c52dd3 100644 --- a/src/core/target.c +++ b/src/core/target.c @@ -15,7 +15,7 @@ target_t target = { #define MACRO_STR(name) _MACRO_STR(name) target_info_t target_info = { - .mcu = MACRO_STR(TARGET_MCU), + .mcu = MACRO_STR(MCU_NAME), .git_version = MACRO_STR(GIT_VERSION), .quic_protocol_version = QUIC_PROTOCOL_VERSION,