Fixes for build targets.

pull/24/head
David Garske 2019-11-11 14:00:17 -08:00
parent c78f0d7026
commit dfbb027bab
3 changed files with 8 additions and 10 deletions

View File

@ -94,7 +94,7 @@ Example partitioning on Nucleo-68 board:
- Sector size: 4KB - Sector size: 4KB
- Wolfboot partition size: 32 KB - Wolfboot partition size: 32 KB
- Applicatiobn partition size: 128 KB - Application partition size: 128 KB
```C ```C
#define WOLFBOOT_SECTOR_SIZE 0x1000 /* 4 KB */ #define WOLFBOOT_SECTOR_SIZE 0x1000 /* 4 KB */
@ -260,7 +260,7 @@ reset
halt halt
``` ```
OpenOCD can be either run in background (to allow remote GDB and monitor terminal connections), or OpenOCD can be either run in background (to allow remote GDB and monitor terminal connections), or
directly from command line, to execute terminal scripts. directly from command line, to execute terminal scripts.
If OpenOCD is running, local TCP port 4444 can be used to access an interactive terminal prompt. If OpenOCD is running, local TCP port 4444 can be used to access an interactive terminal prompt.
@ -293,7 +293,7 @@ Upon reboot, wolfboot will elect the best candidate (version 2 in this case) and
If the accepted candidate image resides on BANK B (like in this case), wolfBoot will perform one bank swap before If the accepted candidate image resides on BANK B (like in this case), wolfBoot will perform one bank swap before
booting. booting.
The bank-swap operation is immediate and a SWAP image is not required in this case. Fallback mechanism can rely on The bank-swap operation is immediate and a SWAP image is not required in this case. Fallback mechanism can rely on
a second choice (older firmware) in the other bank. a second choice (older firmware) in the other bank.
@ -309,5 +309,3 @@ From another console, connect using gdb, e.g.:
arm-none-eabi-gdb arm-none-eabi-gdb
(gdb) target remote:3333 (gdb) target remote:3333
``` ```

View File

@ -30,8 +30,8 @@
/* UART module */ /* UART module */
#define UART1_PIN_AF 7 #define UART1_PIN_AF 7
#define UART1_RX_PIN 10 #define UART1_RX_PIN 10
#define UART1_TX_PIN 9 #define UART1_TX_PIN 9
#define UART1 (0x40011000) #define UART1 (0x40011000)
#define UART1_CR1 (*(volatile uint32_t *)(UART1 + 0x00)) #define UART1_CR1 (*(volatile uint32_t *)(UART1 + 0x00))
#define UART1_CR2 (*(volatile uint32_t *)(UART1 + 0x04)) #define UART1_CR2 (*(volatile uint32_t *)(UART1 + 0x04))
@ -278,7 +278,7 @@ void uart_update_mgr(void)
#define LED_BOOT_PIN (4) #define LED_BOOT_PIN (4)
#define LED_USR_PIN (12) #define LED_USR_PIN (12)
void boot_led_on(void) static void boot_led_on(void)
{ {
uint32_t reg; uint32_t reg;
uint32_t pin = LED_BOOT_PIN; uint32_t pin = LED_BOOT_PIN;
@ -290,7 +290,7 @@ void boot_led_on(void)
GPIOD_BSRR |= (1 << pin); GPIOD_BSRR |= (1 << pin);
} }
void boot_led_off(void) static void boot_led_off(void)
{ {
GPIOD_BSRR |= (1 << (LED_BOOT_PIN + 16)); GPIOD_BSRR |= (1 << (LED_BOOT_PIN + 16));
} }

View File

@ -29,6 +29,7 @@
#ifdef PLATFORM_stm32wb #ifdef PLATFORM_stm32wb
volatile uint32_t time_elapsed = 0;
void main(void) { void main(void) {
boot_led_on(); boot_led_on();
/* Wait for reboot */ /* Wait for reboot */
@ -36,4 +37,3 @@ void main(void) {
; ;
} }
#endif /** PLATFROM_stm32wb **/ #endif /** PLATFROM_stm32wb **/