From 6508d0a3c767712d390dca60a41bf504d1707002 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Wed, 18 Nov 2020 14:33:06 +0100
Subject: [PATCH] refactor(core): turn RDI into a firmware feature flag

---
 core/Makefile            | 1 -
 core/SConscript.firmware | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 35c23c128..37ebd8938 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -20,7 +20,6 @@ CROSS_PORT_OPTS ?=
 PRODUCTION ?= 0
 PYOPT      ?= 1
 BITCOIN_ONLY ?= 0
-RDI        ?= 1
 TREZOR_MODEL ?= T
 TREZOR_MEMPERF ?= 0
 
diff --git a/core/SConscript.firmware b/core/SConscript.firmware
index 33c033d44..7cf7b9298 100644
--- a/core/SConscript.firmware
+++ b/core/SConscript.firmware
@@ -3,10 +3,13 @@
 import os
 
 BITCOIN_ONLY = ARGUMENTS.get('BITCOIN_ONLY', '0')
-RDI = ARGUMENTS.get('RDI', '1') == '1'
 EVERYTHING = BITCOIN_ONLY != '1'
 TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
 
+FEATURE_FLAGS = {
+    "RDI": True,
+}
+
 CCFLAGS_MOD = ''
 CPPPATH_MOD = []
 CPPDEFINES_MOD = []
@@ -343,7 +346,7 @@ SOURCE_TREZORHAL = [
     'embed/trezorhal/vectortable.s',
 ]
 
-if RDI:
+if FEATURE_FLAGS["RDI"]:
     SOURCE_TREZORHAL += [
         'embed/trezorhal/rdi.c',
     ]