diff --git a/epicardium/main.c b/epicardium/main.c index 384ee3dbe98c3d0d8073a72028bcb7c737f23c29..269cf1d0e26bf460673f95be59801005799c41f5 100644 --- a/epicardium/main.c +++ b/epicardium/main.c @@ -118,8 +118,8 @@ int main(void) core1_start(info.isr_vector); } } else { - LOG_INFO("startup", "Starting pycardium on core1 ..."); - core1_start((void *)0x10080000); + LOG_INFO("startup", "Starting pycardium on core1 ..."); + core1_start((void *)0x10080000); } diff --git a/l0dables/lib/hardware.c b/l0dables/lib/hardware.c index 1e08e5ed5c5381bc9eebf7567bc43e35b120fe5f..7a481aface29f2f88fff24fc6c53e28131aed676 100644 --- a/l0dables/lib/hardware.c +++ b/l0dables/lib/hardware.c @@ -19,56 +19,56 @@ uint32_t SystemCoreClock = HIRC_FREQ >> 1; void SystemCoreClockUpdate(void) { - uint32_t base_freq, div, clk_src; + uint32_t base_freq, div, clk_src; - // Determine the clock source and frequency - clk_src = (MXC_GCR->clkcn & MXC_F_GCR_CLKCN_CLKSEL); - switch (clk_src) - { - case MXC_S_GCR_CLKCN_CLKSEL_HIRC: - base_freq = HIRC_FREQ; - break; - case MXC_S_GCR_CLKCN_CLKSEL_XTAL32M: - base_freq = XTAL32M_FREQ; - break; - case MXC_S_GCR_CLKCN_CLKSEL_LIRC8: - base_freq = LIRC8_FREQ; - break; - case MXC_S_GCR_CLKCN_CLKSEL_HIRC96: - base_freq = HIRC96_FREQ; - break; - case MXC_S_GCR_CLKCN_CLKSEL_HIRC8: - base_freq = HIRC8_FREQ; - break; - case MXC_S_GCR_CLKCN_CLKSEL_XTAL32K: - base_freq = XTAL32K_FREQ; - break; - default: - // Values 001 and 111 are reserved, and should never be encountered. - base_freq = HIRC_FREQ; - break; - } - // Clock divider is retrieved to compute system clock - div = (MXC_GCR->clkcn & MXC_F_GCR_CLKCN_PSC) >> MXC_F_GCR_CLKCN_PSC_POS; + // Determine the clock source and frequency + clk_src = (MXC_GCR->clkcn & MXC_F_GCR_CLKCN_CLKSEL); + switch (clk_src) + { + case MXC_S_GCR_CLKCN_CLKSEL_HIRC: + base_freq = HIRC_FREQ; + break; + case MXC_S_GCR_CLKCN_CLKSEL_XTAL32M: + base_freq = XTAL32M_FREQ; + break; + case MXC_S_GCR_CLKCN_CLKSEL_LIRC8: + base_freq = LIRC8_FREQ; + break; + case MXC_S_GCR_CLKCN_CLKSEL_HIRC96: + base_freq = HIRC96_FREQ; + break; + case MXC_S_GCR_CLKCN_CLKSEL_HIRC8: + base_freq = HIRC8_FREQ; + break; + case MXC_S_GCR_CLKCN_CLKSEL_XTAL32K: + base_freq = XTAL32K_FREQ; + break; + default: + // Values 001 and 111 are reserved, and should never be encountered. + base_freq = HIRC_FREQ; + break; + } + // Clock divider is retrieved to compute system clock + div = (MXC_GCR->clkcn & MXC_F_GCR_CLKCN_PSC) >> MXC_F_GCR_CLKCN_PSC_POS; - SystemCoreClock = base_freq >> div; + SystemCoreClock = base_freq >> div; } __weak void SystemInit() { - // Enable FPU. - SCB->CPACR |= SCB_CPACR_CP10_Msk | SCB_CPACR_CP11_Msk; - __DSB(); - __ISB(); + // Enable FPU. + SCB->CPACR |= SCB_CPACR_CP10_Msk | SCB_CPACR_CP11_Msk; + __DSB(); + __ISB(); - // Enable ICache1 Clock - MXC_GCR->perckcn1 &= ~(1 << 22); + // Enable ICache1 Clock + MXC_GCR->perckcn1 &= ~(1 << 22); - // Invalidate cache and wait until ready - MXC_ICC1->invalidate = 1; - while (!(MXC_ICC1->cache_ctrl & MXC_F_ICC_CACHE_CTRL_CACHE_RDY)); + // Invalidate cache and wait until ready + MXC_ICC1->invalidate = 1; + while (!(MXC_ICC1->cache_ctrl & MXC_F_ICC_CACHE_CTRL_CACHE_RDY)); - // Enable Cache - MXC_ICC1->cache_ctrl |= MXC_F_ICC_CACHE_CTRL_CACHE_EN; + // Enable Cache + MXC_ICC1->cache_ctrl |= MXC_F_ICC_CACHE_CTRL_CACHE_EN; - SystemCoreClockUpdate(); + SystemCoreClockUpdate(); } diff --git a/l0dables/lib/l0dable.ld b/l0dables/lib/l0dable.ld index 8c96d669000692d7446555b604863daf555d29bf..f09e39f6ba93637bde76d025c1914611a62b0179 100644 --- a/l0dables/lib/l0dable.ld +++ b/l0dables/lib/l0dable.ld @@ -45,10 +45,10 @@ SECTIONS { . = ALIGN(4); *(.data*) - . = ALIGN(4); - PROVIDE_HIDDEN (__preinit_array_start = .); - KEEP(*(.preinit_array)) - PROVIDE_HIDDEN (__preinit_array_end = .); + . = ALIGN(4); + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP(*(.preinit_array)) + PROVIDE_HIDDEN (__preinit_array_end = .); . = ALIGN(4); @@ -79,7 +79,7 @@ SECTIONS { CARD10_STACK_LIMIT = .; } :data - /* Limit based on current limitations of l0dable setup - only uses core1 RAM. */ + /* Limit based on current limitations of l0dable setup - only uses core1 RAM. */ ASSERT(. < 0x40000, "Exceeded available RAM") /DISCARD/ : @@ -90,7 +90,7 @@ SECTIONS { *(.ARM.attributes) /* Original interpreter path from gcc/ld - nuke. */ *(.interp) - /* Dynamic linking section - nuke, we're not a .so and nothing is going to link against us. */ - *(.dynamic) + /* Dynamic linking section - nuke, we're not a .so and nothing is going to link against us. */ + *(.dynamic) } }