From 1175ff63f2a8c4762692551403862f9f0789aef8 Mon Sep 17 00:00:00 2001 From: Paul Selkirk Date: Tue, 2 May 2017 17:10:02 -0400 Subject: Merge branch 'init_cleanup' into no-rtos Clean up Makefiles and initialization code. --- stm-init.c | 214 +++++++++---------------------------------------------------- 1 file changed, 31 insertions(+), 183 deletions(-) (limited to 'stm-init.c') diff --git a/stm-init.c b/stm-init.c index 51b2ae7..d36bdff 100644 --- a/stm-init.c +++ b/stm-init.c @@ -33,7 +33,6 @@ */ /* Includes ------------------------------------------------------------------*/ -#include "stm32f4xx_hal.h" #include "stm-init.h" #ifdef HAL_GPIO_MODULE_ENABLED #include "stm-led.h" @@ -48,6 +47,12 @@ #include "stm-fpgacfg.h" #include "stm-keystore.h" #endif +#ifdef HAL_SRAM_MODULE_ENABLED +#include "stm-fmc.h" +#endif +#ifdef HAL_SDRAM_MODULE_ENABLED +#include "stm-sdram.h" +#endif /* Private variables ---------------------------------------------------------*/ @@ -55,20 +60,6 @@ #ifdef HAL_GPIO_MODULE_ENABLED static void MX_GPIO_Init(void); #endif -#ifdef HAL_UART_MODULE_ENABLED -static void MX_USART1_UART_Init(void); -static void MX_USART2_UART_Init(void); -#endif -#ifdef HAL_DMA_MODULE_ENABLED -static void MX_DMA_Init(void); -#endif -#ifdef HAL_I2C_MODULE_ENABLED -static void MX_I2C2_Init(void); -#endif -#ifdef HAL_SPI_MODULE_ENABLED -static void MX_SPI1_Init(void); -static void MX_SPI2_Init(void); -#endif void stm_init(void) { @@ -82,74 +73,34 @@ void stm_init(void) /* Initialize all configured peripherals */ #ifdef HAL_GPIO_MODULE_ENABLED MX_GPIO_Init(); - #ifdef HAL_SPI_MODULE_ENABLED - /* Give the FPGA access to it's bitstream ASAP (maybe this should actually - * be done in the application, before calling stm_init()). - */ - fpgacfg_access_control(ALLOW_FPGA); - #endif -#endif -#ifdef HAL_DMA_MODULE_ENABLED - MX_DMA_Init(); #endif #ifdef HAL_UART_MODULE_ENABLED - MX_USART1_UART_Init(); - MX_USART2_UART_Init(); + uart_init(); #endif #ifdef HAL_I2C_MODULE_ENABLED - MX_I2C2_Init(); + rtc_init(); #endif #ifdef HAL_SPI_MODULE_ENABLED - MX_SPI1_Init(); - MX_SPI2_Init(); + fpgacfg_init(); + keystore_init(); +#endif +#ifdef TARGET_CRYPTECH_DEV_BRIDGE + // Blink blue LED for six seconds to not upset the Novena at boot. + led_on(LED_BLUE); + for (int i = 0; i < 12; i++) { + HAL_Delay(500); + led_toggle(LED_BLUE); + } + led_off(LED_BLUE); #endif -} - - -#ifdef HAL_UART_MODULE_ENABLED -/* USART1 init function */ -static void MX_USART1_UART_Init(void) -{ - huart_mgmt.Instance = USART1; - huart_mgmt.Init.BaudRate = USART_MGMT_BAUD_RATE; - huart_mgmt.Init.WordLength = UART_WORDLENGTH_8B; - huart_mgmt.Init.StopBits = UART_STOPBITS_1; - huart_mgmt.Init.Parity = UART_PARITY_NONE; - huart_mgmt.Init.Mode = UART_MODE_TX_RX; - huart_mgmt.Init.HwFlowCtl = UART_HWCONTROL_RTS_CTS; - huart_mgmt.Init.OverSampling = UART_OVERSAMPLING_16; - -#ifdef HAL_DMA_MODULE_ENABLED - __HAL_LINKDMA(&huart_mgmt, hdmarx, hdma_usart_mgmt_rx); +#ifdef HAL_SRAM_MODULE_ENABLED + fmc_init(); #endif - - if (HAL_UART_Init(&huart_mgmt) != HAL_OK) { - /* Initialization Error */ - Error_Handler(); - } -} -/* USART2 init function */ -static void MX_USART2_UART_Init(void) -{ - huart_user.Instance = USART2; - huart_user.Init.BaudRate = USART_USER_BAUD_RATE; - huart_user.Init.WordLength = UART_WORDLENGTH_8B; - huart_user.Init.StopBits = UART_STOPBITS_1; - huart_user.Init.Parity = UART_PARITY_NONE; - huart_user.Init.Mode = UART_MODE_TX_RX; - huart_user.Init.HwFlowCtl = UART_HWCONTROL_RTS_CTS; - huart_user.Init.OverSampling = UART_OVERSAMPLING_16; - -#ifdef HAL_DMA_MODULE_ENABLED - __HAL_LINKDMA(&huart_user, hdmarx, hdma_usart_user_rx); +#ifdef HAL_SDRAM_MODULE_ENABLED + sdram_init(); #endif - - if (HAL_UART_Init(&huart_user) != HAL_OK) { - /* Initialization Error */ - Error_Handler(); - } } -#endif + #ifdef HAL_GPIO_MODULE_ENABLED @@ -161,101 +112,13 @@ static void MX_GPIO_Init(void) /* Configure LED GPIO pins */ gpio_output(LED_PORT, LED_RED | LED_YELLOW | LED_GREEN | LED_BLUE, GPIO_PIN_RESET); - -#ifdef HAL_SPI_MODULE_ENABLED - /* Set up GPIOs to manage access to the FPGA config memory. - * FPGACFG_GPIO_INIT is defined in stm-fpgacfg.h. - */ - FPGACFG_GPIO_INIT(); - /* Set up GPIOs for the keystore memory. - * KEYSTORE_GPIO_INIT is defined in stm-keystore.h. - */ - KEYSTORE_GPIO_INIT(); -#endif /* HAL_SPI_MODULE_ENABLED */ } -#undef gpio_output #endif - -#ifdef HAL_DMA_MODULE_ENABLED -/** - * Enable DMA controller clock - */ -static void MX_DMA_Init(void) -{ - /* DMA controller clock enable */ - __HAL_RCC_DMA2_CLK_ENABLE(); - __HAL_RCC_DMA1_CLK_ENABLE(); - - /* DMA interrupt init */ - - /* USER UART RX */ - HAL_NVIC_SetPriority(DMA1_Stream5_IRQn, 0, 0); - HAL_NVIC_EnableIRQ(DMA1_Stream5_IRQn); - /* MGMT UART RX */ - HAL_NVIC_SetPriority(DMA2_Stream2_IRQn, 0, 0); - HAL_NVIC_EnableIRQ(DMA2_Stream2_IRQn); -} -#endif /* HAL_DMA_MODULE_ENABLED */ - - -#ifdef HAL_I2C_MODULE_ENABLED -/* I2C2 init function (external RTC chip) */ -void MX_I2C2_Init(void) -{ - hi2c_rtc.Instance = I2C2; - hi2c_rtc.Init.ClockSpeed = 10000; - hi2c_rtc.Init.DutyCycle = I2C_DUTYCYCLE_2; - hi2c_rtc.Init.OwnAddress1 = 0; /* Will operate as Master */ - hi2c_rtc.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; - hi2c_rtc.Init.DualAddressMode = I2C_DUALADDRESS_DISABLED; - hi2c_rtc.Init.OwnAddress2 = 0; - hi2c_rtc.Init.GeneralCallMode = I2C_GENERALCALL_DISABLED; - hi2c_rtc.Init.NoStretchMode = I2C_NOSTRETCH_DISABLED; - - if (HAL_I2C_Init(&hi2c_rtc) != HAL_OK) { - Error_Handler(); - } -} +#ifdef CMSIS_RTOS +#include "cmsis_os.h" #endif -#ifdef HAL_SPI_MODULE_ENABLED -/* SPI1 (keystore memory) init function */ -void MX_SPI1_Init(void) -{ - hspi_keystore.Instance = SPI1; - hspi_keystore.Init.Mode = SPI_MODE_MASTER; - hspi_keystore.Init.Direction = SPI_DIRECTION_2LINES; - hspi_keystore.Init.DataSize = SPI_DATASIZE_8BIT; - hspi_keystore.Init.CLKPolarity = SPI_POLARITY_LOW; - hspi_keystore.Init.CLKPhase = SPI_PHASE_1EDGE; - hspi_keystore.Init.NSS = SPI_NSS_SOFT; - hspi_keystore.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2; - hspi_keystore.Init.FirstBit = SPI_FIRSTBIT_MSB; - hspi_keystore.Init.TIMode = SPI_TIMODE_DISABLE; - hspi_keystore.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE; - hspi_keystore.Init.CRCPolynomial = 10; - HAL_SPI_Init(&hspi_keystore); -} -/* SPI2 (FPGA config memory) init function */ -void MX_SPI2_Init(void) -{ - hspi_fpgacfg.Instance = SPI2; - hspi_fpgacfg.Init.Mode = SPI_MODE_MASTER; - hspi_fpgacfg.Init.Direction = SPI_DIRECTION_2LINES; - hspi_fpgacfg.Init.DataSize = SPI_DATASIZE_8BIT; - hspi_fpgacfg.Init.CLKPolarity = SPI_POLARITY_LOW; - hspi_fpgacfg.Init.CLKPhase = SPI_PHASE_1EDGE; - hspi_fpgacfg.Init.NSS = SPI_NSS_SOFT; - hspi_fpgacfg.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2; - hspi_fpgacfg.Init.FirstBit = SPI_FIRSTBIT_MSB; - hspi_fpgacfg.Init.TIMode = SPI_TIMODE_DISABLE; - hspi_fpgacfg.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE; - hspi_fpgacfg.Init.CRCPolynomial = 10; - HAL_SPI_Init(&hspi_fpgacfg); -} -#endif /* HAL_SPI_MODULE_ENABLED */ - /** * @brief This function is executed in case of error occurrence. * @param None @@ -266,29 +129,14 @@ void Error_Handler(void) #ifdef HAL_GPIO_MODULE_ENABLED HAL_GPIO_WritePin(LED_PORT, LED_RED, GPIO_PIN_SET); #endif - while (1) { ; } -} - -#ifdef USE_FULL_ASSERT - -/** - * @brief Reports the name of the source file and the source line number - * where the assert_param error has occurred. - * @param file: pointer to the source file name - * @param line: assert_param error line source number - * @retval None - */ -void assert_failed(uint8_t* file, uint32_t line) -{ - /* USER CODE BEGIN 6 */ - /* User can add his own implementation to report the file name and line number, - ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ - /* USER CODE END 6 */ +#ifdef CMSIS_RTOS + //osThreadSetPriority(osThreadGetId(), osPriorityIdle); + osThreadTerminate(osThreadGetId()); +#endif + while (1) { ; } } -#endif - /** * @} */ -- cgit v1.2.3