core/Makefile

@@ -348,7 +348,7 @@ else
 endif
 
 flash_combine: $(PRODTEST_BUILD_DIR)/combined.bin ## flash combined using OpenOCD
-	$(OPENOCD) -c "init; reset halt; flash write_image erase $< $(BOARDLOADER_START); exit"
+	$(OPENOCD) -c "init; reset halt; flash write_image erase $< $(FLASH_START); exit"
 
 flash_erase: ## erase all sectors in flash bank 0
 	$(OPENOCD) -c "init; reset halt; flash info 0; flash erase_sector 0 0 last; flash erase_check 0; exit"

core/SConscript.bootloader

@@ -230,6 +230,8 @@ def cargo_build():
     features.append("bootloader")
     features.extend(FEATURES_AVAILABLE)
 
+    env.get("ENV")["BINDGEN_MACROS"] = tools.get_bindgen_defines(env.get("ALLDEFS"), ALLPATHS)
+
     cargo_opts = [
         f'--target={env.get("ENV")["RUST_TARGET"]}',
         f'--target-dir=../../build/bootloader/rust',
@@ -239,9 +241,7 @@ def cargo_build():
         '-Z build-std-features=panic_immediate_abort',
     ]
 
-    bindgen_macros = tools.get_bindgen_defines(env.get("CPPDEFINES"), ALLPATHS)
-
-    return f'export BINDGEN_MACROS=\'{bindgen_macros}\'; cd embed/rust; cargo build {profile} ' + ' '.join(cargo_opts)
+    return f'cd embed/rust; cargo build {profile} ' + ' '.join(cargo_opts)
 
 rust = env.Command(
     target=RUST_LIBPATH,

core/SConscript.bootloader_emu

@@ -209,7 +209,7 @@ ALLPATHS = ['embed/rust',
            'embed/unix',
            'embed/extmod/modtrezorui',
            'vendor/nanopb',
-       ] + CPPPATH_MOD
+       ] + CPPPATH_MOD,
 
 env.Replace(
     COPT=env.get('ENV').get('OPTIMIZE', '-Os'),
@@ -291,6 +291,7 @@ def cargo_build():
     features.append("ui")
     features.append("bootloader")
 
+    env.get("ENV")["BINDGEN_MACROS"] = tools.get_bindgen_defines(env.get("ALLDEFS"), ALLPATHS)
 
     cargo_opts = [
         f'--target={RUST_TARGET}',
@@ -301,9 +302,7 @@ def cargo_build():
         '-Z build-std-features=panic_immediate_abort',
     ]
 
-    bindgen_macros = tools.get_bindgen_defines(env.get("CPPDEFINES"), ALLPATHS)
-
-    return f'export BINDGEN_MACROS=\'{bindgen_macros}\'; cd embed/rust; cargo build {profile} ' + ' '.join(cargo_opts)
+    return f'cd embed/rust; cargo build {profile} ' + ' '.join(cargo_opts)
 
 rust = env.Command(
     target=RUST_LIBPATH,

core/SConscript.firmware

@@ -780,6 +780,8 @@ def cargo_build():
 
     features.extend(FEATURES_AVAILABLE)
 
+    env.get("ENV")["BINDGEN_MACROS"] = tools.get_bindgen_defines(env.get("ALLDEFS"), ALLPATHS)
+
     cargo_opts = [
         f'--target={env.get("ENV")["RUST_TARGET"]}',
         f'--target-dir=../../build/firmware/rust',
@@ -791,9 +793,7 @@ def cargo_build():
 
     env.get('ENV')['TREZOR_MODEL'] = TREZOR_MODEL
 
-    bindgen_macros = tools.get_bindgen_defines(env.get("CPPDEFINES"), ALLPATHS)
-
-    return f'export BINDGEN_MACROS=\'{bindgen_macros}\'; cd embed/rust; cargo build {profile} ' + ' '.join(cargo_opts)
+    return f'cd embed/rust; cargo build {profile} ' + ' '.join(cargo_opts)
 
 rust = env.Command(
     target=RUST_LIBPATH,

core/SConscript.unix

@@ -871,9 +871,9 @@ def cargo_build():
     if TREZOR_MODEL in ('R', '1'):
         features.append('button')
 
-    bindgen_macros = tools.get_bindgen_defines(env.get("CPPDEFINES"), ALLPATHS)
+    env.get("ENV")["BINDGEN_MACROS"] = tools.get_bindgen_defines(env.get("ALLDEFS"), ALLPATHS)
 
-    return f'export BINDGEN_MACROS=\'{bindgen_macros}\'; cd embed/rust; cargo build --profile {RUST_PROFILE} --target-dir=../../build/unix/rust --no-default-features --features "{" ".join(features)}"  --target {TARGET}'
+    return f'cd embed/rust; cargo build --profile {RUST_PROFILE} --target-dir=../../build/unix/rust --no-default-features --features "{" ".join(features)}"  --target {TARGET}'
 
 rust = env.Command(
     target=RUST_LIBPATH,

core/site_scons/tools.py

@@ -153,17 +153,9 @@ def get_bindgen_defines(
 ) -> tuple(str, str):
     rest_defs = []
     for d in defines:
-        if type(d) is tuple:
-            d = f"-D{d[0]}={d[1]}"
-        else:
-            d = f"-D{d}"
-        d = (
-            d.replace('\\"', '"')
-            .replace("'", "'\"'\"'")
-            .replace('"<', "<")
-            .replace('>"', ">")
+        rest_defs.append(
+            f"-D{d}".replace('"<', "<").replace('>"', ">").replace('\\"', '"')
         )
-        rest_defs.append(d)
     for d in paths:
         rest_defs.append(f"-I../../{d}")