From 18c830433922690cc9b793b1ee63675eb5e4a63d Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 28 Apr 2022 15:52:09 +0200 Subject: [PATCH] fix(core): leftover TREZOR_MODEL defines [no changelog] --- core/embed/rust/build.rs | 2 +- storage/tests/c/Makefile | 2 +- storage/tests/c/norcow_config.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/embed/rust/build.rs b/core/embed/rust/build.rs index 0a1c5360e..fe75fab62 100644 --- a/core/embed/rust/build.rs +++ b/core/embed/rust/build.rs @@ -139,7 +139,7 @@ fn generate_micropython_bindings() { "-I../../vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc", "-I../../vendor/micropython/lib/stm32lib/CMSIS/STM32F4xx/Include", "-I../../vendor/micropython/lib/cmsis/inc", - "-DTREZOR_MODEL=T", + "-DTREZOR_MODEL_T", "-DSTM32F405xx", "-DUSE_HAL_DRIVER", "-DSTM32_HAL_H=", diff --git a/storage/tests/c/Makefile b/storage/tests/c/Makefile index 6dd4dc358..7566a00f2 100644 --- a/storage/tests/c/Makefile +++ b/storage/tests/c/Makefile @@ -1,5 +1,5 @@ CC = cc -CFLAGS = -Wall -Wshadow -Wextra -Wpedantic -Werror -Wno-missing-braces -fPIC -fsanitize=address,undefined +CFLAGS = -Wall -Wshadow -Wextra -Wpedantic -Werror -Wno-missing-braces -fPIC -fsanitize=address,undefined -DTREZOR_MODEL_T LIBS = INC = -I ../../../crypto -I ../.. -I . BASE = ../../../ diff --git a/storage/tests/c/norcow_config.h b/storage/tests/c/norcow_config.h index 257c5291c..1e28339b3 100644 --- a/storage/tests/c/norcow_config.h +++ b/storage/tests/c/norcow_config.h @@ -31,9 +31,9 @@ * The length of the sector header in bytes. The header is preserved between * sector erasures. */ -#if defined MODEL_T +#if defined TREZOR_MODEL_T #define NORCOW_HEADER_LEN 0 -#elif defined MODEL_1 +#elif defined TREZOR_MODEL_1 #define NORCOW_HEADER_LEN (0x100) #else #error Unknown Trezor model