refactor(core): get rid of platform.h

[no changelog]
trezor · Oct 7, 2024 · 91c5ea3 · 91c5ea3
1 parent b43a9f1
commit 91c5ea3
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 71 deletions.
diff --git a/core/embed/boardloader/main.c b/core/embed/boardloader/main.c
@@ -32,7 +32,6 @@
 #include "image.h"
 #include "model.h"
 #include "mpu.h"
-#include "platform.h"
 #include "pvd.h"
 #include "reset_flags.h"
 #include "rng.h"

diff --git a/core/embed/bootloader/main.c b/core/embed/bootloader/main.c
@@ -85,7 +85,6 @@
 #else
 #include "compiler_traits.h"
 #include "mpu.h"
-#include "platform.h"
 #endif
 
 #define USB_IFACE_NUM 0

diff --git a/core/embed/kernel/main.c b/core/embed/kernel/main.c
@@ -37,7 +37,7 @@
 #include "mpu.h"
 #include "optiga_commands.h"
 #include "optiga_transport.h"
-#include "platform.h"
+#include "option_bytes.h"
 #include "pvd.h"
 #include "random_delays.h"
 #include "rsod.h"

diff --git a/core/embed/trezorhal/bootutils.h b/core/embed/trezorhal/bootutils.h
@@ -46,4 +46,18 @@ void __attribute__((noreturn)) reboot_and_upgrade(const uint8_t hash[32]);
 // unrecoverable error state.
 void __attribute__((noreturn)) secure_shutdown(void);
 
+// Alternative memset with slightly different arguments
+//
+// This function writes a 32-bit value to a range of memory addresses.
+// The range is defined by the start and stop pointers and must
+// be aligned to 4 bytes.
+void memset_reg(volatile void *start, volatile void *stop, uint32_t val);
+
+// Jumps to the next booting stage (e.g. bootloader to firmware).
+// `address` points to the flash at the vector table of the next stage.
+//
+// Before jumping, the function disables all interrupts and clears the
+// memory and registers that could contain sensitive information.
+void jump_to(uint32_t address);
+
 #endif  // TREZORHAL_BOOTUTILS_H
diff --git a/core/embed/trezorhal/option_bytes.h b/core/embed/trezorhal/option_bytes.h
@@ -30,6 +30,8 @@ void flash_unlock_option_bytes(void);
 uint32_t flash_set_option_bytes(void);
 secbool flash_configure_option_bytes(void);
 
+void check_oem_keys(void);
+
 #endif  // KERNEL_MODE
 
 #endif  // TREZORHAL_OPTION_BYTES_H
diff --git a/core/embed/trezorhal/stm32f4/bootutils.c b/core/embed/trezorhal/stm32f4/bootutils.c
@@ -27,7 +27,6 @@
 #include "irq.h"
 #include "model.h"
 #include "mpu.h"
-#include "platform.h"
 
 #ifdef KERNEL_MODE
 
@@ -160,6 +159,8 @@ reboot_with_args(boot_command_t command, const void* args, size_t args_size) {
 
   ensure_thread_mode();
 
+  // from util.s
+  extern void jump_to_with_flag(uint32_t address, uint32_t reset_flag);
   jump_to_with_flag(BOOTLOADER_START + IMAGE_HEADER_SIZE, g_boot_command);
   for (;;)
     ;

diff --git a/core/embed/trezorhal/stm32f4/platform.h b/core/embed/trezorhal/stm32f4/platform.h
diff --git a/core/embed/trezorhal/stm32f4/startup_init.c b/core/embed/trezorhal/stm32f4/startup_init.c
@@ -18,12 +18,12 @@
  */
 
 #include STM32_HAL_H
+#include TREZOR_BOARD
 
 #include "startup_init.h"
-#include "platform.h"
+#include "bootutils.h"
 #include "rng.h"
 #include "systick.h"
-#include TREZOR_BOARD
 
 #ifdef KERNEL_MODE
 

diff --git a/core/embed/trezorhal/stm32f4/system.c b/core/embed/trezorhal/stm32f4/system.c
@@ -23,7 +23,6 @@
 
 #include "bootutils.h"
 #include "mpu.h"
-#include "platform.h"
 #include "systask.h"
 #include "system.h"
 #include "systick.h"

diff --git a/core/embed/trezorhal/stm32u5/platform.h b/core/embed/trezorhal/stm32u5/platform.h
diff --git a/core/embed/trezorhal/stm32u5/startup_init.c b/core/embed/trezorhal/stm32u5/startup_init.c
@@ -17,11 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include TREZOR_BOARD
 #include STM32_HAL_H
 
-#include "platform.h"
 #include "rng.h"
-#include TREZOR_BOARD
 
 #ifdef KERNEL_MODE