arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 06:48:16 +00:00
Code Issues Releases Wiki Activity

boardloader, bootloader, firmware: only call periph_init in boardloader (#54)

Browse Source
This commit is contained in:
mcudev 2017-10-17 05:42:57 -04:00 committed by Pavol Rusnak
parent ac89203e7c
commit 45a4a944d0
5 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
embed/boardloader/main.c
View File

@ -1,3 +1,5 @@
#include STM32_HAL_H
#include <string.h> #include <string.h>
#include "common.h" #include "common.h"
@ -147,6 +149,31 @@ static const uint8_t * const BOARDLOADER_KEYS[] = {
#endif #endif
}; };
void periph_init(void)
{
// STM32F4xx HAL library initialization:
// - configure the Flash prefetch, instruction and data caches
// - configure the Systick to generate an interrupt each 1 msec
// - set NVIC Group Priority to 4
// - global MSP (MCU Support Package) initialization
HAL_Init();
// Enable GPIO clocks
__HAL_RCC_GPIOA_CLK_ENABLE();
__HAL_RCC_GPIOB_CLK_ENABLE();
__HAL_RCC_GPIOC_CLK_ENABLE();
__HAL_RCC_GPIOD_CLK_ENABLE();
// Clear the reset flags
PWR->CR |= PWR_CR_CSBF;
RCC->CSR |= RCC_CSR_RMVF;
// Enable CPU ticks
CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk; // Enable DWT
DWT->CYCCNT = 0; // Reset Cycle Count Register
DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk; // Enable Cycle Count Register
}
int main(void) int main(void)
{ {

2
embed/bootloader/main.c
View File

@ -212,8 +212,6 @@ int main(void)
check_bootloader_version(); check_bootloader_version();
#endif #endif
periph_init();
display_orientation(0); display_orientation(0);
ensure(0 == touch_init(), NULL); ensure(0 == touch_init(), NULL);

2
embed/firmware/main.c
View File

@ -24,8 +24,6 @@
int main(void) int main(void)
{ {
periph_init();
pendsv_init(); pendsv_init();
display_orientation(0); display_orientation(0);

25
embed/trezorhal/common.c
View File

@ -43,31 +43,6 @@ void __assert_func(const char *file, int line, const char *func, const char *exp
} }
#endif #endif
void periph_init(void) {
// STM32F4xx HAL library initialization:
// - configure the Flash prefetch, instruction and data caches
// - configure the Systick to generate an interrupt each 1 msec
// - set NVIC Group Priority to 4
// - global MSP (MCU Support Package) initialization
HAL_Init();
// Enable GPIO clocks
__HAL_RCC_GPIOA_CLK_ENABLE();
__HAL_RCC_GPIOB_CLK_ENABLE();
__HAL_RCC_GPIOC_CLK_ENABLE();
__HAL_RCC_GPIOD_CLK_ENABLE();
// Clear the reset flags
PWR->CR |= PWR_CR_CSBF;
RCC->CSR |= RCC_CSR_RMVF;
// Enable CPU ticks
CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk; // Enable DWT
DWT->CYCCNT = 0; // Reset Cycle Count Register
DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk; // Enable Cycle Count Register
}
void hal_delay(uint32_t ms) void hal_delay(uint32_t ms)
{ {
HAL_Delay(ms); HAL_Delay(ms);

2
embed/trezorhal/common.h
View File

@ -12,8 +12,6 @@ extern void memset_reg(volatile void *start, volatile void *stop, uint32_t val);
void clear_otg_hs_memory(void); void clear_otg_hs_memory(void);
void periph_init(void);
void __attribute__((noreturn)) __fatal_error(const char *expr, const char *msg, const char *file, int line, const char *func); void __attribute__((noreturn)) __fatal_error(const char *expr, const char *msg, const char *file, int line, const char *func);
#define ensure(expr, msg) ((expr) ? (void)0 : __fatal_error(#expr, msg, __FILE__, __LINE__, __func__)) #define ensure(expr, msg) ((expr) ? (void)0 : __fatal_error(#expr, msg, __FILE__, __LINE__, __func__))