diff --git a/core/Makefile b/core/Makefile
index 1c029dff5..6a09e8bec 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -20,7 +20,6 @@ CROSS_PORT_OPTS ?=
 PRODUCTION ?= 0
 PYOPT      ?= 1
 BITCOIN_ONLY ?= 0
-SYSTEM_VIEW ?= 0
 TREZOR_MODEL ?= T
 TREZOR_MEMPERF ?= 0
 
@@ -142,7 +141,7 @@ build_reflash: ## build reflash firmware + reflash image
 	dd if=build/bootloader/bootloader.bin of=$(REFLASH_BUILD_DIR)/sdimage.bin bs=1 seek=49152
 
 build_firmware: templates build_cross ## build firmware with frozen modules
-	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" PYOPT="$(PYOPT)" BITCOIN_ONLY="$(BITCOIN_ONLY)" RDI="$(RDI)" SYSTEM_VIEW="$(SYSTEM_VIEW)" $(FIRMWARE_BUILD_DIR)/firmware.bin
+	$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" TREZOR_MODEL="$(TREZOR_MODEL)" PYOPT="$(PYOPT)" BITCOIN_ONLY="$(BITCOIN_ONLY)" $(FIRMWARE_BUILD_DIR)/firmware.bin
 
 build_unix: templates ## build unix port
 	$(SCONS) CFLAGS="$(CFLAGS)" $(UNIX_BUILD_DIR)/trezor-emu-core $(UNIX_PORT_OPTS) TREZOR_MODEL="$(TREZOR_MODEL)" BITCOIN_ONLY="$(BITCOIN_ONLY)"
diff --git a/core/SConscript.firmware b/core/SConscript.firmware
index f5e5cb84b..98eddde38 100644
--- a/core/SConscript.firmware
+++ b/core/SConscript.firmware
@@ -3,13 +3,13 @@
 import os
 
 BITCOIN_ONLY = ARGUMENTS.get('BITCOIN_ONLY', '0')
-SYSTEM_VIEW = ARGUMENTS.get('SYSTEM_VIEW', '0') == '1'
 EVERYTHING = BITCOIN_ONLY != '1'
 TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
 
 FEATURE_FLAGS = {
     "RDI": True,
     "SECP256K1_ZKP": False,
+    "SYSTEM_VIEW": False,
 }
 
 CCFLAGS_MOD = ''
@@ -352,7 +352,7 @@ if FEATURE_FLAGS["RDI"]:
     ]
     CPPDEFINES_MOD += ['RDI']
 
-if SYSTEM_VIEW:
+if FEATURE_FLAGS["SYSTEM_VIEW"]:
     SOURCE_FIRMWARE += [
         'embed/segger/SEGGER/SEGGER_SYSVIEW_Config_NoOS.c',
         'embed/segger/SEGGER/SEGGER_SYSVIEW.c',