From a00c7f9720762cabdcfd7995bfbe8669ae1304e8 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 19 Feb 2019 17:52:29 +0100
Subject: [PATCH] mpu: rename mpu_config to mpu_config_firmware

---
 firmware/trezor.c | 2 +-
 setup.c           | 2 +-
 setup.h           | 2 +-
 util.h            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/firmware/trezor.c b/firmware/trezor.c
index ae64082286..7a68329324 100644
--- a/firmware/trezor.c
+++ b/firmware/trezor.c
@@ -130,7 +130,7 @@ int main(void)
 		timer_init();
 #ifdef APPVER
 		// enable MPU (Memory Protection Unit)
-		mpu_config();
+		mpu_config_firmware();
 #endif
 	} else {
 		collect_hw_entropy(false);
diff --git a/setup.c b/setup.c
index d0853db691..e59682b28c 100644
--- a/setup.c
+++ b/setup.c
@@ -162,7 +162,7 @@ void setupApp(void)
 #define SRAM_BASE	(0x20000000U)
 
 // Never use in bootloader! Disables access to PPB (including MPU, NVIC, SCB)
-void mpu_config(void)
+void mpu_config_firmware(void)
 {
 #if MEMORY_PROTECT
 	// Disable MPU
diff --git a/setup.h b/setup.h
index 34b88aae55..f6e3f91f77 100644
--- a/setup.h
+++ b/setup.h
@@ -27,6 +27,6 @@ extern uint32_t __stack_chk_guard;
 void setup(void);
 void setupApp(void);
 
-void mpu_config(void);
+void mpu_config_firmware(void);
 
 #endif
diff --git a/util.h b/util.h
index 384ede0e32..8202a4d04f 100644
--- a/util.h
+++ b/util.h
@@ -64,7 +64,7 @@ static inline void __attribute__((noreturn)) jump_to_firmware(const vector_table
 		// Set stack pointer
 		__asm__ volatile("msr msp, %0" :: "r" (vector_table->initial_sp_value));
 	} else {                                  // untrusted firmware
-		mpu_config();                         // * configure MPU
+		mpu_config_firmware();                // * configure MPU for the firmware
 		__asm__ volatile("msr msp, %0" :: "r" (_stack));
 	}