arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-29 12:18:51 +00:00
Code Issues Releases Wiki Activity

refactor(core): add flexible HSE settings

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2023-09-14 11:16:04 +02:00 committed by TychoVrahe
parent 2fa69c3c0d
commit d15ee71279
8 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/embed/trezorhal/boards/stm32f429i-disc1.h
View File

@ -1,6 +1,8 @@
#ifndef _STM32F429I_DISC1_H #ifndef _STM32F429I_DISC1_H
#define _STM32F429I_DISC1_H #define _STM32F429I_DISC1_H
#define HSE_8MHZ
#define MAX_DISPLAY_RESX 240 #define MAX_DISPLAY_RESX 240
#define MAX_DISPLAY_RESY 320 #define MAX_DISPLAY_RESY 320
#define DISPLAY_RESX 240 #define DISPLAY_RESX 240

2
core/embed/trezorhal/boards/trezor_1.h
View File

@ -1,6 +1,8 @@
#ifndef _TREZOR_1_H #ifndef _TREZOR_1_H
#define _TREZOR_1_H #define _TREZOR_1_H
#define HSE_8MHZ
#define USE_BUTTON 1 #define USE_BUTTON 1
#include "displays/vg-2864ksweg01.h" #include "displays/vg-2864ksweg01.h"

2
core/embed/trezorhal/boards/trezor_r_v10.h
View File

@ -1,6 +1,8 @@
#ifndef _TREZOR_R_V10_H #ifndef _TREZOR_R_V10_H
#define _TREZOR_R_V10_H #define _TREZOR_R_V10_H
#define HSE_8MHZ
#define USE_BUTTON 1 #define USE_BUTTON 1
#define USE_SBU 1 #define USE_SBU 1
#define USE_I2C 1 #define USE_I2C 1

2
core/embed/trezorhal/boards/trezor_r_v3.h
View File

@ -1,6 +1,8 @@
#ifndef _TREZOR_R_V3_H #ifndef _TREZOR_R_V3_H
#define _TREZOR_R_V3_H #define _TREZOR_R_V3_H
#define HSE_8MHZ
#define USE_BUTTON 1 #define USE_BUTTON 1
#define USE_SBU 1 #define USE_SBU 1

2
core/embed/trezorhal/boards/trezor_r_v4.h
View File

@ -1,6 +1,8 @@
#ifndef _TREZOR_R_V4_H #ifndef _TREZOR_R_V4_H
#define _TREZOR_R_V4_H #define _TREZOR_R_V4_H
#define HSE_8MHZ
#define USE_BUTTON 1 #define USE_BUTTON 1
#define USE_SBU 1 #define USE_SBU 1

2
core/embed/trezorhal/boards/trezor_r_v6.h
View File

@ -1,6 +1,8 @@
#ifndef _TREZOR_R_V6_H #ifndef _TREZOR_R_V6_H
#define _TREZOR_R_V6_H #define _TREZOR_R_V6_H
#define HSE_8MHZ
#define USE_BUTTON 1 #define USE_BUTTON 1
#define USE_SBU 1 #define USE_SBU 1

2
core/embed/trezorhal/boards/trezor_t.h
View File

@ -1,6 +1,8 @@
#ifndef _TREZOR_T_H #ifndef _TREZOR_T_H
#define _TREZOR_T_H #define _TREZOR_T_H
#define HSE_8MHZ
#define DISPLAY_RESX 240 #define DISPLAY_RESX 240
#define DISPLAY_RESY 240 #define DISPLAY_RESY 240

20
core/embed/trezorhal/stm32f4/platform.c
View File

@ -35,25 +35,33 @@ typedef struct {
uint32_t plln; uint32_t plln;
} clock_conf_t; } clock_conf_t;
#ifdef HSE_16MHZ
#define PLLM_COEF 2U
#elif defined HSE_8MHZ
#define PLLM_COEF 1U
#else
#error Unsupported HSE frequency
#endif
#if defined STM32F427xx || defined STM32F429xx #if defined STM32F427xx || defined STM32F429xx
#ifdef TREZOR_MODEL_T #ifdef TREZOR_MODEL_T
#define DEFAULT_FREQ 168U #define DEFAULT_FREQ 168U
#define DEFAULT_PLLQ 7U #define DEFAULT_PLLQ 7U
#define DEFAULT_PLLP 0U // P = 2 (two bits, 00 means PLLP = 2) #define DEFAULT_PLLP 0U // P = 2 (two bits, 00 means PLLP = 2)
#define DEFAULT_PLLM 4U #define DEFAULT_PLLM (4U * PLLM_COEF)
#define DEFAULT_PLLN 168U #define DEFAULT_PLLN 168U
#else #else
#define DEFAULT_FREQ 180U #define DEFAULT_FREQ 180U
#define DEFAULT_PLLQ 15U #define DEFAULT_PLLQ 15U
#define DEFAULT_PLLP 1U // P = 4 (two bits, 01 means PLLP = 4) #define DEFAULT_PLLP 1U // P = 4 (two bits, 01 means PLLP = 4)
#define DEFAULT_PLLM 4U #define DEFAULT_PLLM (4U * PLLM_COEF)
#define DEFAULT_PLLN 360U #define DEFAULT_PLLN 360U
#endif #endif
#elif STM32F405xx #elif STM32F405xx
#define DEFAULT_FREQ 120U #define DEFAULT_FREQ 120U
#define DEFAULT_PLLQ 5U #define DEFAULT_PLLQ 5U
#define DEFAULT_PLLP 0U // P = 2 (two bits, 00 means PLLP = 2) #define DEFAULT_PLLP 0U // P = 2 (two bits, 00 means PLLP = 2)
#define DEFAULT_PLLM 8U #define DEFAULT_PLLM (8U * PLLM_COEF)
#define DEFAULT_PLLN 240U #define DEFAULT_PLLN 240U
#else #else
#error Unsupported MCU #error Unsupported MCU
@ -70,7 +78,7 @@ clock_conf_t clock_conf[3] = {
180, 180,
15, 15,
1, 1,
4, 4 * PLLM_COEF,
360, 360,
}, },
{ {
@ -80,7 +88,7 @@ clock_conf_t clock_conf[3] = {
168, 168,
7, 7,
0, 0,
4, 4 * PLLM_COEF,
168, 168,
}, },
{ {
@ -90,7 +98,7 @@ clock_conf_t clock_conf[3] = {
120, 120,
5, 5,
0, 0,
8, 8 * PLLM_COEF,
240, 240,
}, },
}; };