bsps/stm32h7: move BSP start hooks into boards subdirectories

The idea here is to prepare for better per-board specialization
of the hooks function code.

Sponsored-By:	Precidata
This commit is contained in:
Karel Gardas
2022-06-03 11:41:52 +02:00
parent d7f3918d13
commit e5e1c00491
14 changed files with 407 additions and 44 deletions

View File

@@ -0,0 +1,78 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/*
* Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <bsp.h>
#include <bsp/bootcard.h>
#include <bsp/linker-symbols.h>
#include <bsp/start.h>
#include <stm32h7/hal.h>
#include <stm32h7/memory.h>
#include <stm32h7/mpu-config.h>
#include <rtems/score/armv7m.h>
#include <string.h>
void bsp_start_hook_0(void)
{
if ((RCC->AHB3ENR & RCC_AHB3ENR_FMCEN) == 0) {
/*
* Only perform the low-level initialization if necessary. An initialized
* FMC indicates that a boot loader already performed the low-level
* initialization.
*/
SystemInit();
stm32h7_init_power();
stm32h7_init_oscillator();
stm32h7_init_clocks();
stm32h7_init_peripheral_clocks();
HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSI, RCC_MCODIV_1);
HAL_Init();
SystemInit_ExtMemCtl();
}
#if __CORTEX_M == 0x07U
if ((SCB->CCR & SCB_CCR_IC_Msk) == 0) {
SCB_EnableICache();
}
if ((SCB->CCR & SCB_CCR_DC_Msk) == 0) {
SCB_EnableDCache();
}
_ARMV7M_MPU_Setup(stm32h7_config_mpu_region, stm32h7_config_mpu_region_count);
#endif
}
void bsp_start_hook_1(void)
{
bsp_start_copy_sections_compact();
#if __CORTEX_M == 0x07U
SCB_CleanDCache();
SCB_InvalidateICache();
#endif
bsp_start_clear_bss();
}

View File

@@ -0,0 +1,78 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/*
* Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <bsp.h>
#include <bsp/bootcard.h>
#include <bsp/linker-symbols.h>
#include <bsp/start.h>
#include <stm32h7/hal.h>
#include <stm32h7/memory.h>
#include <stm32h7/mpu-config.h>
#include <rtems/score/armv7m.h>
#include <string.h>
void bsp_start_hook_0(void)
{
if ((RCC->AHB3ENR & RCC_AHB3ENR_FMCEN) == 0) {
/*
* Only perform the low-level initialization if necessary. An initialized
* FMC indicates that a boot loader already performed the low-level
* initialization.
*/
SystemInit();
stm32h7_init_power();
stm32h7_init_oscillator();
stm32h7_init_clocks();
stm32h7_init_peripheral_clocks();
HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSI, RCC_MCODIV_1);
HAL_Init();
SystemInit_ExtMemCtl();
}
#if __CORTEX_M == 0x07U
if ((SCB->CCR & SCB_CCR_IC_Msk) == 0) {
SCB_EnableICache();
}
if ((SCB->CCR & SCB_CCR_DC_Msk) == 0) {
SCB_EnableDCache();
}
_ARMV7M_MPU_Setup(stm32h7_config_mpu_region, stm32h7_config_mpu_region_count);
#endif
}
void bsp_start_hook_1(void)
{
bsp_start_copy_sections_compact();
#if __CORTEX_M == 0x07U
SCB_CleanDCache();
SCB_InvalidateICache();
#endif
bsp_start_clear_bss();
}

View File

@@ -0,0 +1,78 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/*
* Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <bsp.h>
#include <bsp/bootcard.h>
#include <bsp/linker-symbols.h>
#include <bsp/start.h>
#include <stm32h7/hal.h>
#include <stm32h7/memory.h>
#include <stm32h7/mpu-config.h>
#include <rtems/score/armv7m.h>
#include <string.h>
void bsp_start_hook_0(void)
{
if ((RCC->AHB3ENR & RCC_AHB3ENR_FMCEN) == 0) {
/*
* Only perform the low-level initialization if necessary. An initialized
* FMC indicates that a boot loader already performed the low-level
* initialization.
*/
SystemInit();
stm32h7_init_power();
stm32h7_init_oscillator();
stm32h7_init_clocks();
stm32h7_init_peripheral_clocks();
HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSI, RCC_MCODIV_1);
HAL_Init();
SystemInit_ExtMemCtl();
}
#if __CORTEX_M == 0x07U
if ((SCB->CCR & SCB_CCR_IC_Msk) == 0) {
SCB_EnableICache();
}
if ((SCB->CCR & SCB_CCR_DC_Msk) == 0) {
SCB_EnableDCache();
}
_ARMV7M_MPU_Setup(stm32h7_config_mpu_region, stm32h7_config_mpu_region_count);
#endif
}
void bsp_start_hook_1(void)
{
bsp_start_copy_sections_compact();
#if __CORTEX_M == 0x07U
SCB_CleanDCache();
SCB_InvalidateICache();
#endif
bsp_start_clear_bss();
}

View File

@@ -0,0 +1,78 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/*
* Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <bsp.h>
#include <bsp/bootcard.h>
#include <bsp/linker-symbols.h>
#include <bsp/start.h>
#include <stm32h7/hal.h>
#include <stm32h7/memory.h>
#include <stm32h7/mpu-config.h>
#include <rtems/score/armv7m.h>
#include <string.h>
void bsp_start_hook_0(void)
{
if ((RCC->AHB3ENR & RCC_AHB3ENR_FMCEN) == 0) {
/*
* Only perform the low-level initialization if necessary. An initialized
* FMC indicates that a boot loader already performed the low-level
* initialization.
*/
SystemInit();
stm32h7_init_power();
stm32h7_init_oscillator();
stm32h7_init_clocks();
stm32h7_init_peripheral_clocks();
HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSI, RCC_MCODIV_1);
HAL_Init();
SystemInit_ExtMemCtl();
}
#if __CORTEX_M == 0x07U
if ((SCB->CCR & SCB_CCR_IC_Msk) == 0) {
SCB_EnableICache();
}
if ((SCB->CCR & SCB_CCR_DC_Msk) == 0) {
SCB_EnableDCache();
}
_ARMV7M_MPU_Setup(stm32h7_config_mpu_region, stm32h7_config_mpu_region_count);
#endif
}
void bsp_start_hook_1(void)
{
bsp_start_copy_sections_compact();
#if __CORTEX_M == 0x07U
SCB_CleanDCache();
SCB_InvalidateICache();
#endif
bsp_start_clear_bss();
}

View File

@@ -0,0 +1,78 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/*
* Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <bsp.h>
#include <bsp/bootcard.h>
#include <bsp/linker-symbols.h>
#include <bsp/start.h>
#include <stm32h7/hal.h>
#include <stm32h7/memory.h>
#include <stm32h7/mpu-config.h>
#include <rtems/score/armv7m.h>
#include <string.h>
void bsp_start_hook_0(void)
{
if ((RCC->AHB3ENR & RCC_AHB3ENR_FMCEN) == 0) {
/*
* Only perform the low-level initialization if necessary. An initialized
* FMC indicates that a boot loader already performed the low-level
* initialization.
*/
SystemInit();
stm32h7_init_power();
stm32h7_init_oscillator();
stm32h7_init_clocks();
stm32h7_init_peripheral_clocks();
HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSI, RCC_MCODIV_1);
HAL_Init();
SystemInit_ExtMemCtl();
}
#if __CORTEX_M == 0x07U
if ((SCB->CCR & SCB_CCR_IC_Msk) == 0) {
SCB_EnableICache();
}
if ((SCB->CCR & SCB_CCR_DC_Msk) == 0) {
SCB_EnableDCache();
}
_ARMV7M_MPU_Setup(stm32h7_config_mpu_region, stm32h7_config_mpu_region_count);
#endif
}
void bsp_start_hook_1(void)
{
bsp_start_copy_sections_compact();
#if __CORTEX_M == 0x07U
SCB_CleanDCache();
SCB_InvalidateICache();
#endif
bsp_start_clear_bss();
}

View File

@@ -57,6 +57,12 @@ extern "C" {
uint32_t stm32h7_systick_frequency(void);
/* default functions */
void stm32h7_init_power(void);
void stm32h7_init_oscillator(void);
void stm32h7_init_clocks(void);
void stm32h7_init_peripheral_clocks(void);
/** @} */
#ifdef __cplusplus

View File

@@ -41,7 +41,7 @@ void HAL_MspInit(void)
__HAL_RCC_SYSCFG_CLK_ENABLE();
}
static void init_power(void)
void stm32h7_init_power(void)
{
HAL_PWREx_ConfigSupply(STM32H7_PWR_SUPPLY);
__HAL_PWR_VOLTAGESCALING_CONFIG(stm32h7_config_pwr_regulator_voltagescaling);
@@ -51,7 +51,7 @@ static void init_power(void)
}
}
static void init_oscillator(void)
void stm32h7_init_oscillator(void)
{
HAL_StatusTypeDef status;
@@ -61,7 +61,7 @@ static void init_oscillator(void)
}
}
static void init_clocks(void)
void stm32h7_init_clocks(void)
{
HAL_StatusTypeDef status;
@@ -74,7 +74,7 @@ static void init_clocks(void)
}
}
static void init_peripheral_clocks(void)
void stm32h7_init_peripheral_clocks(void)
{
HAL_StatusTypeDef status;
@@ -84,43 +84,3 @@ static void init_peripheral_clocks(void)
}
}
void bsp_start_hook_0(void)
{
if ((RCC->AHB3ENR & RCC_AHB3ENR_FMCEN) == 0) {
/*
* Only perform the low-level initialization if necessary. An initialized
* FMC indicates that a boot loader already performed the low-level
* initialization.
*/
SystemInit();
init_power();
init_oscillator();
init_clocks();
init_peripheral_clocks();
HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSI, RCC_MCODIV_1);
HAL_Init();
SystemInit_ExtMemCtl();
}
#if __CORTEX_M == 0x07U
if ((SCB->CCR & SCB_CCR_IC_Msk) == 0) {
SCB_EnableICache();
}
if ((SCB->CCR & SCB_CCR_DC_Msk) == 0) {
SCB_EnableDCache();
}
_ARMV7M_MPU_Setup(stm32h7_config_mpu_region, stm32h7_config_mpu_region_count);
#endif
}
void bsp_start_hook_1(void)
{
bsp_start_copy_sections_compact();
#if __CORTEX_M == 0x07U
SCB_CleanDCache();
SCB_InvalidateICache();
#endif
bsp_start_clear_bss();
}

View File

@@ -14,6 +14,7 @@ links:
- role: build-dependency
uid: grp
source:
- bsps/arm/stm32h7/boards/stm/nucleo-h743zi/stm32h7-bspstarthooks.c
- bsps/arm/stm32h7/boards/stm/nucleo-h743zi/stm32h7-config-clk.c
- bsps/arm/stm32h7/boards/stm/nucleo-h743zi/stm32h7-config-osc.c
- bsps/arm/stm32h7/boards/stm/nucleo-h743zi/stm32h7-config-per.c

View File

@@ -14,6 +14,7 @@ links:
- role: build-dependency
uid: grp
source:
- bsps/arm/stm32h7/boards/stm/stm32h743i-eval/stm32h7-bspstarthooks.c
- bsps/arm/stm32h7/boards/stm/stm32h743i-eval/stm32h7-config-clk.c
- bsps/arm/stm32h7/boards/stm/stm32h743i-eval/stm32h7-config-osc.c
- bsps/arm/stm32h7/boards/stm/stm32h743i-eval/stm32h7-config-per.c

View File

@@ -16,6 +16,7 @@ links:
- role: build-dependency
uid: tststm32h757i-eval
source:
- bsps/arm/stm32h7/boards/stm/stm32h747i-disco/stm32h7-bspstarthooks.c
- bsps/arm/stm32h7/boards/stm/stm32h747i-disco/stm32h7-config-clk.c
- bsps/arm/stm32h7/boards/stm/stm32h747i-disco/stm32h7-config-osc.c
- bsps/arm/stm32h7/boards/stm/stm32h747i-disco/stm32h7-config-per.c

View File

@@ -16,6 +16,7 @@ links:
- role: build-dependency
uid: tststm32h757i-eval
source:
- bsps/arm/stm32h7/boards/stm/stm32h747i-disco/stm32h7-bspstarthooks.c
- bsps/arm/stm32h7/boards/stm/stm32h747i-disco/stm32h7-config-clk.c
- bsps/arm/stm32h7/boards/stm/stm32h747i-disco/stm32h7-config-osc.c
- bsps/arm/stm32h7/boards/stm/stm32h747i-disco/stm32h7-config-per.c

View File

@@ -16,6 +16,7 @@ links:
- role: build-dependency
uid: tststm32h757i-eval
source:
- bsps/arm/stm32h7/boards/stm/stm32h757i-eval/stm32h7-bspstarthooks.c
- bsps/arm/stm32h7/boards/stm/stm32h757i-eval/stm32h7-config-clk.c
- bsps/arm/stm32h7/boards/stm/stm32h757i-eval/stm32h7-config-osc.c
- bsps/arm/stm32h7/boards/stm/stm32h757i-eval/stm32h7-config-per.c

View File

@@ -16,6 +16,7 @@ links:
- role: build-dependency
uid: tststm32h757i-eval
source:
- bsps/arm/stm32h7/boards/stm/stm32h757i-eval/stm32h7-bspstarthooks.c
- bsps/arm/stm32h7/boards/stm/stm32h757i-eval/stm32h7-config-clk.c
- bsps/arm/stm32h7/boards/stm/stm32h757i-eval/stm32h7-config-osc.c
- bsps/arm/stm32h7/boards/stm/stm32h757i-eval/stm32h7-config-per.c

View File

@@ -16,6 +16,7 @@ links:
- role: build-dependency
uid: ../../tstsmallmem
source:
- bsps/arm/stm32h7/boards/stm/stm32h7b3i-dk/stm32h7-bspstarthooks.c
- bsps/arm/stm32h7/boards/stm/stm32h7b3i-dk/stm32h7-config-clk.c
- bsps/arm/stm32h7/boards/stm/stm32h7b3i-dk/stm32h7-config-osc.c
- bsps/arm/stm32h7/boards/stm/stm32h7b3i-dk/stm32h7-config-per.c