feat(core): introduce DBG_CONSOLE build argument

[no changelog]

Author: cepetr

core/Makefile

@@ -49,6 +49,7 @@ QUIET_MODE ?= 0
 TREZOR_DISABLE_ANIMATION ?= $(if $(filter 0,$(PYOPT)),1,0)
 STORAGE_INSECURE_TESTING_MODE ?= 0
 UI_PERFORMANCE_OVERLAY ?= 0
+DBG_CONSOLE ?=
 
 # If set, VCP writes will be blocking, in order to allow reliable debug data transmission over VCP.
 # Disabled by default, to prevent debug firmware from getting stuck while writing log messages (if the host is not reading them).
@@ -145,7 +146,8 @@ SCONS_VARS = \
 	TREZOR_MEMPERF="$(TREZOR_MEMPERF)" \
 	TREZOR_MODEL="$(TREZOR_MODEL)" \
 	UI_PERFORMANCE_OVERLAY="$(UI_PERFORMANCE_OVERLAY)" \
-	BLOCK_ON_VCP="$(BLOCK_ON_VCP)"
+	BLOCK_ON_VCP="$(BLOCK_ON_VCP)" \
+	DBG_CONSOLE="$(DBG_CONSOLE)"
 
 SCONS_OPTS = -Q -j $(JOBS)
 ifeq ($(QUIET_MODE),1)

core/SConscript.boardloader

@@ -6,6 +6,7 @@ import tools, models
 TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T2T1')
 CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 HW_REVISION = ARGUMENTS.get('HW_REVISION', None)
+DBG_CONSOLE = ARGUMENTS.get('DBG_CONSOLE', '')
 
 FEATURES_WANTED = [
     "boot_ucb",
@@ -26,6 +27,17 @@ CPPDEFINES_HAL = []
 SOURCE_HAL = []
 PATH_HAL = []
 
+if DBG_CONSOLE == "SWO":
+    CPPDEFINES_MOD += ["USE_DBG_CONSOLE_SWO"]
+elif DBG_CONSOLE == "SYSTEM_VIEW":
+    FEATURES_WANTED += ["system_view"]
+    CPPDEFINES_MOD += ["USE_DBG_CONSOLE_SYSTEM_VIEW"]
+elif DBG_CONSOLE == "" or DBG_CONSOLE == "VCP":
+    pass
+else:
+    raise RuntimeError("DBG_CONSOLE argument is invalid")
+
+
 env = Environment(ENV=os.environ,
     CFLAGS='%s -DPRODUCTION=%s' % (ARGUMENTS.get('CFLAGS', ''), ARGUMENTS.get('PRODUCTION', '0')),
     CPPDEFINES_IMPLICIT=[],

core/SConscript.bootloader

@@ -10,6 +10,7 @@ BOOTLOADER_QA = ARGUMENTS.get('BOOTLOADER_QA', '0') == '1'
 PRODUCTION = 0 if BOOTLOADER_QA else ARGUMENTS.get('PRODUCTION', '0') == '1'
 HW_REVISION = ARGUMENTS.get('HW_REVISION', None)
 UI_PERFORMANCE_OVERLAY = ARGUMENTS.get('UI_PERFORMANCE_OVERLAY', '0') == '1'
+DBG_CONSOLE = ARGUMENTS.get('DBG_CONSOLE', '')
 
 FEATURES_WANTED = [
     "ble",
@@ -43,6 +44,20 @@ SOURCE_HAL = []
 PATH_HAL = []
 RUST_UI_FEATURES = []
 
+if DBG_CONSOLE == "VCP":
+    FEATURES_WANTED += ["usb_iface_vcp"]
+    CPPDEFINES_MOD += ["USE_DBG_CONSOLE_VCP"]
+elif DBG_CONSOLE == "SWO":
+    CPPDEFINES_MOD += ["USE_DBG_CONSOLE_SWO"]
+elif DBG_CONSOLE == "SYSTEM_VIEW":
+    FEATURES_WANTED += ["system_view"]
+    CPPDEFINES_MOD += ["USE_DBG_CONSOLE_SYSTEM_VIEW"]
+elif DBG_CONSOLE == "":
+    pass
+else:
+    raise RuntimeError("DBG_CONSOLE argument is invalid")
+
+
 env = Environment(
     ENV=os.environ,
     CFLAGS=f"{ARGUMENTS.get('CFLAGS', '')} -DPRODUCTION={int(PRODUCTION)} -DBOOTLOADER_QA={int(BOOTLOADER_QA)}",

core/SConscript.kernel

@@ -16,6 +16,7 @@ PYOPT = ARGUMENTS.get('PYOPT', '1')
 DISABLE_OPTIGA = ARGUMENTS.get('DISABLE_OPTIGA', '0') == '1'
 HW_REVISION = ARGUMENTS.get('HW_REVISION', None)
 THP = ARGUMENTS.get('THP', '0') == '1' # Trezor-Host Protocol
+DBG_CONSOLE = ARGUMENTS.get('DBG_CONSOLE', '')
 
 STORAGE_INSECURE_TESTING_MODE = ARGUMENTS.get('STORAGE_INSECURE_TESTING_MODE', '0') == '1'
 if STORAGE_INSECURE_TESTING_MODE and PRODUCTION:
@@ -24,6 +25,15 @@ if STORAGE_INSECURE_TESTING_MODE:
     DISABLE_OPTIGA = True
     PYOPT = "0"
 
+CCFLAGS_MOD = ''
+CPPPATH_MOD = []
+CPPDEFINES_MOD = []
+SOURCE_MOD = []
+SOURCE_MOD_CRYPTO = []
+CPPDEFINES_HAL = []
+SOURCE_HAL = []
+PATH_HAL = []
+
 FEATURE_FLAGS = {
     "RDI": True,
     "SECP256K1_ZKP": True,  # required for trezor.crypto.curve.bip340 (BIP340/Taproot)
@@ -61,8 +71,22 @@ if BITCOIN_ONLY == '0':
 if PYOPT == '0':
     FEATURES_WANTED += [
         "usb_iface_debug",
-        "usb_iface_vcp",
     ]
+    DBG_CONSOLE = DBG_CONSOLE or "VCP"
+
+if DBG_CONSOLE == "VCP":
+    FEATURES_WANTED += ["usb_iface_vcp"]
+    CPPDEFINES_MOD += ["USE_DBG_CONSOLE_VCP"]
+elif DBG_CONSOLE == "SWO":
+    CPPDEFINES_MOD += ["USE_DBG_CONSOLE_SWO"]
+elif DBG_CONSOLE == "SYSTEM_VIEW":
+    FEATURES_WANTED += ["system_view"]
+    CPPDEFINES_MOD += ["USE_DBG_CONSOLE_SYSTEM_VIEW"]
+elif DBG_CONSOLE == "":
+    pass
+else:
+    raise RuntimeError("DBG_CONSOLE argument is invalid")
+
 
 if not TREZOR_MODEL in ['T3W1', 'D002']:
     FEATURES_WANTED += ["secure_mode"]
@@ -73,15 +97,6 @@ if DISABLE_OPTIGA:
         raise RuntimeError("DISABLE_OPTIGA requires non-production build")
     FEATURES_WANTED.remove("optiga")
 
-CCFLAGS_MOD = ''
-CPPPATH_MOD = []
-CPPDEFINES_MOD = []
-SOURCE_MOD = []
-SOURCE_MOD_CRYPTO = []
-CPPDEFINES_HAL = []
-SOURCE_HAL = []
-PATH_HAL = []
-
 FROZEN = True
 
 # modtrezorcrypto

core/SConscript.prodtest

@@ -9,6 +9,7 @@ PRODUCTION = ARGUMENTS.get('PRODUCTION', '0') == '1'
 BOOTLOADER_DEVEL = ARGUMENTS.get('BOOTLOADER_DEVEL', '0') == '1'
 HW_REVISION = ARGUMENTS.get('HW_REVISION', None)
 UI_PERFORMANCE_OVERLAY = ARGUMENTS.get('UI_PERFORMANCE_OVERLAY', '0') == '1'
+DBG_CONSOLE = ARGUMENTS.get('DBG_CONSOLE', '')
 
 FEATURE_FLAGS = {
     "AES_GCM": True,
@@ -58,6 +59,16 @@ SOURCE_HAL = []
 PATH_HAL = []
 RUST_UI_FEATURES = []
 
+if DBG_CONSOLE == "SWO":
+    CPPDEFINES_MOD += ["USE_DBG_CONSOLE_SWO"]
+elif DBG_CONSOLE == "SYSTEM_VIEW":
+    FEATURES_WANTED += ["system_view"]
+    CPPDEFINES_MOD += ["USE_DBG_CONSOLE_SYSTEM_VIEW"]
+elif DBG_CONSOLE == "" or DBG_CONSOLE == "VCP":
+    pass
+else:
+    raise RuntimeError("DBG_CONSOLE argument is invalid")
+
 env = Environment(
     ENV=os.environ,
     CFLAGS='%s -DPRODUCTION=%s' % (ARGUMENTS.get('CFLAGS', ''), ARGUMENTS.get('PRODUCTION', '0')),

core/SConscript.secmon

@@ -16,6 +16,7 @@ PYOPT = ARGUMENTS.get('PYOPT', '1')
 DISABLE_OPTIGA = ARGUMENTS.get('DISABLE_OPTIGA', '0') == '1'
 HW_REVISION = ARGUMENTS.get('HW_REVISION', None)
 THP = ARGUMENTS.get('THP', '0') == '1' # Trezor-Host Protocol
+DBG_CONSOLE = ARGUMENTS.get('DBG_CONSOLE', '')
 
 STORAGE_INSECURE_TESTING_MODE = ARGUMENTS.get('STORAGE_INSECURE_TESTING_MODE', '0') == '1'
 if STORAGE_INSECURE_TESTING_MODE and PRODUCTION:
@@ -58,6 +59,16 @@ CPPDEFINES_HAL = []
 SOURCE_HAL = []
 PATH_HAL = []
 
+if DBG_CONSOLE == "SWO":
+    CPPDEFINES_MOD += ["USE_DBG_CONSOLE_SWO"]
+elif DBG_CONSOLE == "SYSTEM_VIEW":
+    FEATURES_WANTED += ["system_view"]
+    CPPDEFINES_MOD += ["USE_DBG_CONSOLE_SYSTEM_VIEW"]
+elif DBG_CONSOLE == "" or DBG_CONSOLE == "VCP":
+    pass
+else:
+    raise RuntimeError("DBG_CONSOLE argument is invalid")
+
 FROZEN = True
 
 env = Environment(