diff --git a/setup/system_init.c b/setup/system_init.c index 00304f7..4e8e553 100644 --- a/setup/system_init.c +++ b/setup/system_init.c @@ -4,6 +4,7 @@ const signed char __pll_main_div_q_val[] = {-1, -1, 2, 3, 4, 5, 6, 7, 8 ,9, 10, const signed char __pll_main_div_p_val[] = {-1, -1, 0, -1, 1, -1, 2, -1, 3}; const signed char __mco_div_val[] = {-1, 0, 4, 5, 6, 7}; const signed char __apb_presc_val[] = {-1, 0, 4, -1, 5, -1, -1, -1, 6, -1, -1, -1, -1, -1, -1, -1, 7}; +const signed char *__pll_i2s_div_p_val = __pll_main_div_p_val; #define SYSINIT_MAIN_I2S_PLL_DIV_M_MIN (2) #define SYSINIT_MAIN_I2S_PLL_DIV_M_MAX (63) #define SYSINIT_MAIN_I2S_PLL_MULT_N_MIN (2) @@ -40,13 +41,14 @@ struct clock_config { uint32_t pll_main_on : 1; uint32_t css_on : 1; uint32_t hse_bypass : 1; + uint32_t lse_bypass : 1; uint32_t hsi_trim : 5; /* Main PLL Conf */ uint32_t pll_main_i2s_src : 1; uint32_t pll_main_div_q : 4; /* true value */ uint32_t pll_main_div_p : 3; /* true value */ uint32_t pll_main_mult_n : 9; - uint32_t pll_main_div_m : 6; + uint32_t pll_div_m : 6; /* MCO Outputs */ uint32_t mco2_sel : 2; uint32_t mco2_presc : 3; @@ -55,13 +57,19 @@ struct clock_config { uint32_t i2s_src : 1; /* RTC */ uint32_t rtc_hse_div_1_meg : 5; + uint32_t rtc_clock_en : 1; /* APB */ uint32_t apb1_presc : 5; uint32_t apb2_presc : 5; /* Systemclock */ uint32_t sysclk_src : 2; - - + /* PLLI2S */ + uint32_t pll_i2s_r : 3; + uint32_t pll_i2s_q : 4; + uint32_t pll_i2s_p : 4; /* true value */ + uint32_t pll_i2s_mult : 9; + /* PLLSAI */ + /* AHB */ enum sysinit_ahb_presc ahb_presc; }; diff --git a/stm32f7-template.config b/stm32f7-template.config index 03db85f..9c20b41 100644 --- a/stm32f7-template.config +++ b/stm32f7-template.config @@ -4,3 +4,5 @@ #define STM32F7XX #define ARM_MATH_CM7 +/* This is set by the compiler */ +#define __VFP_FP__ 1