WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Minor cleanups. Add the required Cube HAL to app Makefile.

pull/143/head
David Garske 2021-08-24 09:31:43 -07:00 committed by Daniele Lacamera
parent 17a3d5c476
commit ff28cec38a
6 changed files with 104 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch.mk
View File

@ -78,11 +78,6 @@ ifeq ($(ARCH),ARM)
endif
endif
ifeq ($(TARGET),stm32l4)
ARCH_FLASH_OFFSET=0x08000000
SPI_TARGET=stm32
endif
## Cortex-M CPU
ifeq ($(CORTEX_M33),1)
CFLAGS+=-mcpu=cortex-m33
@ -274,11 +269,14 @@ endif
ifeq ($(TARGET),stm32l4)
SPI_TARGET=stm32
ARCH_FLASH_OFFSET=0x08000000
OBJS+=$(STM32CUBE)/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.o
OBJS+=$(STM32CUBE)/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.o
CFLAGS+=-DSTM32L4A6xx -DUSE_HAL_DRIVER -I$(STM32CUBE)/Drivers/STM32L4xx_HAL_Driver/Inc/ \
-Isrc -I$(STM32CUBE)/Drivers/BSP/STM32L4xx_Nucleo_144/ -I$(STM32CUBE)/Drivers/CMSIS/Device/ST/STM32L4xx/Include/ \
-I$(STM32CUBE)/Drivers/CMSIS/Include/
CFLAGS+=-DSTM32L4A6xx -DUSE_HAL_DRIVER -Isrc -Ihal \
-I$(STM32CUBE)/Drivers/STM32L4xx_HAL_Driver/Inc/ \
-I$(STM32CUBE)/Drivers/BSP/STM32L4xx_Nucleo_144/ \
-I$(STM32CUBE)/Drivers/CMSIS/Device/ST/STM32L4xx/Include/ \
-I$(STM32CUBE)/Drivers/CMSIS/Include/
endif
CFLAGS+=-DARCH_FLASH_OFFSET=$(ARCH_FLASH_OFFSET)

62
hal/stm32l4.c
View File

@ -27,26 +27,21 @@
#define DMB() asm volatile ("dmb")
/*** RCC ***/
#define RCC_PRESCALER_DIV_NONE 0
static uint32_t Address = 0, PAGEError = 0;
static FLASH_EraseInitTypeDef EraseInitStruct;
static uint32_t RAMFUNCTION GetPage(uint32_t Addr)
{
uint32_t page = 0;
if (Addr < (FLASH_BASE + FLASH_BANK_SIZE))
page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
else
page = (Addr - (FLASH_BASE + FLASH_BANK_SIZE)) / FLASH_PAGE_SIZE;
return page;
}
@ -54,7 +49,7 @@ static uint32_t RAMFUNCTION GetPage(uint32_t Addr)
static uint32_t RAMFUNCTION GetBank(uint32_t Addr)
{
uint32_t bank = 0;
if (READ_BIT(SYSCFG->MEMRMP, SYSCFG_MEMRMP_FB_MODE) == 0) {
if (Addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
bank = FLASH_BANK_1;
@ -68,7 +63,7 @@ static uint32_t RAMFUNCTION GetBank(uint32_t Addr)
bank = FLASH_BANK_1;
}
}
return bank;
}
@ -100,34 +95,34 @@ int RAMFUNCTION hal_flash_erase(uint32_t address,int len)
hal_flash_unlock();
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
FirstPage = GetPage((uint32_t) address);
NbOfPages = GetPage((uint32_t) address) - FirstPage + 1;
BankNumber = GetBank((uint32_t) address);
EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
EraseInitStruct.Banks = BankNumber;
EraseInitStruct.Page = FirstPage;
EraseInitStruct.NbPages = NbOfPages;
end_address = address + len - 1;
for (uint32_t p = address; p < end_address; p += FLASH_PAGE_SIZE) {
if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK) {
break;
}
}
hal_flash_lock();
return 0;
}
static void RAMFUNCTION flash_set_waitstates(int waitstates)
{
FLASH->ACR |= waitstates | FLASH_ACR_DCEN | FLASH_ACR_ICEN;
FLASH->ACR |= (waitstates | FLASH_ACR_DCEN | FLASH_ACR_ICEN);
}
static RAMFUNCTION void flash_wait_complete(void)
@ -141,7 +136,7 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
int i = 0;
uint32_t *dst;
uint32_t reg;
int ret=-1;
int ret = -1;
hal_flash_clear_errors();
reg = FLASH->CR & (~FLASH_CR_FSTPG);
@ -153,7 +148,7 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
int off = (address + i) - (((address + i) >> 3) << 3);
uint32_t base_addr = address & (~0x07); /* aligned to 64 bit */
int u32_idx = (i >> 2);
hal_flash_clear_errors();
dst = (uint32_t *)(base_addr);
val[0] = dst[u32_idx];
@ -165,23 +160,25 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
flash_wait_complete();
}
if ((FLASH->SR &FLASH_SR_PROGERR)!= FLASH_SR_PROGERR) {
ret=0;
}
ret=0;
}
if ((FLASH->SR & FLASH_SR_EOP) == FLASH_SR_EOP) {
FLASH->SR |= FLASH_SR_EOP;
}
}
FLASH->CR &= ~FLASH_CR_PG;
return ret;
return ret;
}
static void clock_pll_off(void)
{
uint32_t reg32;
/* Enable internal multi-speed oscillator. */
RCC->CR |= RCC_CR_HSION;
DMB();
while ((RCC->CR & RCC_CR_HSIRDY) == 0) {};
/* Select HSI as SYSCLK source. */
reg32 = RCC->CFGR;
reg32 &= ~((1 << 1) | (1 << 0));
@ -196,11 +193,12 @@ static void clock_pll_off(void)
static void clockconfig(int powersave)
{
uint32_t reg32;
uint32_t hpre,ppre1,ppre2,flash_waitstates;
/* Enable Power controller */
RCC->APB1ENR1 |= RCC_APB1ENR1_PWREN;
/* Select clock parameters */
/*cpu_freq=16000000;*/
hpre= RCC_PRESCALER_DIV_NONE;
@ -208,17 +206,19 @@ static void clockconfig(int powersave)
ppre2=RCC_PRESCALER_DIV_NONE;
flash_waitstates = 3;
flash_set_waitstates(flash_waitstates);
/* Enable internal high-speed oscillator. */
RCC->CR |=RCC_CR_HSION;
DMB();
while ((RCC->CR & RCC_CR_HSIRDY)==0);
/* select HSI as SYSCLK source*/
reg32 = RCC->CFGR;
reg32 &= ~((1 << 1) | (1 << 0));
RCC->CFGR = (reg32 | RCC_CFGR_SW_HSI);
DMB();
/* Set prescalers for AHB, ADC, ABP1, ABP2.
*/
/* Set prescalers for AHB, ADC, ABP1, ABP2 */
reg32 = RCC->CFGR;
reg32 &= ~(0xF0);
RCC->CFGR = (reg32 | (hpre << 4));
@ -231,7 +231,7 @@ static void clockconfig(int powersave)
reg32 &= ~(0x07 << 11);
RCC->CFGR = (reg32 | (ppre2 << 11));
DMB();
/* Disable internal high-speed oscillator. */
RCC->CR &= ~RCC_CR_HSION;

24
hal/stm32l4xx_hal_conf.h
View File

@ -1,9 +1,33 @@
/* stm32-4xx_hal_conf.h
*
* Copyright (C) 2021 wolfSSL Inc.
*
* This file is part of wolfBoot.
*
* wolfBoot is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* wolfBoot is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
*/
#ifndef __STM32L4xx_HAL_CONF_H
#define __STM32L4xx_HAL_CONF_H
#define HAL_MODULE_ENABLED
#define HAL_FLASH_MODULE_ENABLED
#define HAL_RCC_MODULE_ENABLED
#include "stm32l4xx_hal_flash.h"
#include "stm32l4xx_hal_rcc.h"
#define assert_param(expr) ((void)0U)
#endif /* __STM32L4xx_HAL_CONF_H */

10
test-app/Makefile
View File

@ -79,6 +79,16 @@ ifeq ($(TARGET),stm32h7)
LSCRIPT_TEMPLATE=ARM-stm32h7.ld
endif
ifeq ($(TARGET),stm32l4)
APP_OBJS+=$(STM32CUBE)/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.o
APP_OBJS+=$(STM32CUBE)/Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.o
CFLAGS+=-DSTM32L4A6xx -DUSE_HAL_DRIVER -Isrc -Ihal \
-I$(STM32CUBE)/Drivers/STM32L4xx_HAL_Driver/Inc/ \
-I$(STM32CUBE)/Drivers/BSP/STM32L4xx_Nucleo_144/ \
-I$(STM32CUBE)/Drivers/CMSIS/Device/ST/STM32L4xx/Include/ \
-I$(STM32CUBE)/Drivers/CMSIS/Include/
endif
ifeq ($(TARGET),stm32l5)
ifeq ($(TZEN),1)
LSCRIPT_TEMPLATE=ARM-stm32l5-ns.ld

34
test-app/app_stm32l4.c
View File

@ -1,3 +1,27 @@
/* app_stm32l4.c
*
* Test bare-metal boot-led-on application
*
* Copyright (C) 2020 wolfSSL Inc.
*
* This file is part of wolfBoot.
*
* wolfBoot is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* wolfBoot is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
*/
#include "led.h"
#include "hal.h"
#include "wolfboot/wolfboot.h"
@ -10,17 +34,19 @@ void main(void)
hal_init();
boot_led_on();
boot_version = wolfBoot_current_firmware_version();
if(boot_version == 1) {
if (boot_version == 1) {
/* Turn on Blue LED */
boot_led_on();
wolfBoot_update_trigger();
} else if(boot_version >= 2) {
} else if (boot_version >= 2) {
/* Turn on Red LED */
led_on();
wolfBoot_success();
}
/* Wait for reboot */
while(1) {
}
while(1) {
}
}
#endif /* PLATFORM_stm32l4 */

6
test-app/led.c
View File

@ -180,7 +180,7 @@ void boot_led_off(void)
#endif /* PLATFORM_stm32wb */
#ifdef PLATFORM_stm32l4
#define AHB2_CLOCK_ER (*(volatile uint32_t *)(0x4002104C)) // RCC_AHB2ENR
#define AHB2_CLOCK_ER (*(volatile uint32_t *)(0x4002104C)) /* RCC_AHB2ENR */
#define GPIOB_AHB2_CLOCK_ER (1 << 1)
#define GPIOB_BASE 0x48000400
@ -200,7 +200,7 @@ void boot_led_off(void)
void boot_led_on(void)
{
uint32_t reg;
uint32_t pin = LED_BOOT_PIN;
uint32_t pin = LED_BOOT_PIN;
AHB2_CLOCK_ER |= GPIOB_AHB2_CLOCK_ER;
reg = GPIOB_MODE & ~(0x03 << (pin * 2));
GPIOB_MODE = reg | (1 << (pin * 2));
@ -211,7 +211,7 @@ void boot_led_on(void)
void led_on(void)
{
uint32_t reg;
uint32_t pin = LED_PIN;
uint32_t pin = LED_PIN;
AHB2_CLOCK_ER |= GPIOB_AHB2_CLOCK_ER;
reg = GPIOB_MODE & ~(0x03 << (pin * 2));
GPIOB_MODE = reg | (1 << (pin * 2));