summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ee00933)
When there's no 'force boot loader' pin, jump to the application
instead of stopping in the boot loader.
Signed-off-by: Keith Packard <keithp@keithp.com>
void
ao_boot_chain(uint32_t *base);
void
ao_boot_chain(uint32_t *base);
+/* Return true to switch to application */
+int
ao_boot_check_pin(void);
/* Return true to switch to application (if present) */
ao_boot_check_pin(void);
/* Return true to switch to application (if present) */
#include <ao_boot.h>
#include <ao_exti.h>
#include <ao_boot.h>
#include <ao_exti.h>
ao_boot_check_pin(void)
{
uint16_t v;
ao_boot_check_pin(void)
{
uint16_t v;
- /* Enable power interface clock */
-// stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_PWREN);
-
/* Enable the input pin */
ao_enable_input(AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN,
AO_BOOT_APPLICATION_MODE);
/* Enable the input pin */
ao_enable_input(AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN,
AO_BOOT_APPLICATION_MODE);
/* Reset the chip to turn off the port and the power interface clock */
ao_gpio_set_mode(AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN, 0);
ao_disable_port(AO_BOOT_APPLICATION_GPIO);
/* Reset the chip to turn off the port and the power interface clock */
ao_gpio_set_mode(AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN, 0);
ao_disable_port(AO_BOOT_APPLICATION_GPIO);
-// stm_rcc.apb1enr &= ~(1 << STM_RCC_APB1ENR_PWREN);
- if (v == AO_BOOT_APPLICATION_VALUE)
- ao_boot_chain(AO_BOOT_APPLICATION_BASE);
+ return v == AO_BOOT_APPLICATION_VALUE;
#ifdef AO_BOOT_CHAIN
if (ao_boot_check_chain()) {
#ifdef AO_BOOT_PIN
#ifdef AO_BOOT_CHAIN
if (ao_boot_check_chain()) {
#ifdef AO_BOOT_PIN
+ if (ao_boot_check_pin())
+ {
+ ao_boot_chain(AO_BOOT_APPLICATION_BASE);
+ }
}
#endif
#if RELOCATE_INTERRUPT
}
#endif
#if RELOCATE_INTERRUPT
#include <ao_boot.h>
#include <ao_exti.h>
#include <ao_boot.h>
#include <ao_exti.h>
ao_boot_check_pin(void)
{
uint16_t v;
ao_boot_check_pin(void)
{
uint16_t v;
ao_gpio_set_mode(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN, 0);
ao_disable_port(&AO_BOOT_APPLICATION_GPIO);
stm_rcc.apb1enr &= ~(1 << STM_RCC_APB1ENR_PWREN);
ao_gpio_set_mode(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN, 0);
ao_disable_port(&AO_BOOT_APPLICATION_GPIO);
stm_rcc.apb1enr &= ~(1 << STM_RCC_APB1ENR_PWREN);
- if (v == AO_BOOT_APPLICATION_VALUE)
- ao_boot_chain(AO_BOOT_APPLICATION_BASE);
+ return v == AO_BOOT_APPLICATION_VALUE;
#ifdef AO_BOOT_CHAIN
if (ao_boot_check_chain()) {
#ifdef AO_BOOT_PIN
#ifdef AO_BOOT_CHAIN
if (ao_boot_check_chain()) {
#ifdef AO_BOOT_PIN
+ if (ao_boot_check_pin())
+ {
+ ao_boot_chain(AO_BOOT_APPLICATION_BASE);
+ }
}
#endif
/* Set interrupt vector table offset */
}
#endif
/* Set interrupt vector table offset */
#include <ao_boot.h>
#include <ao_exti.h>
#include <ao_boot.h>
#include <ao_exti.h>
ao_boot_check_pin(void)
{
uint16_t v;
ao_boot_check_pin(void)
{
uint16_t v;
ao_gpio_set_mode(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN, 0);
ao_disable_port(&AO_BOOT_APPLICATION_GPIO);
stm_rcc.apb1enr &= ~(1 << STM_RCC_APB1ENR_PWREN);
ao_gpio_set_mode(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN, 0);
ao_disable_port(&AO_BOOT_APPLICATION_GPIO);
stm_rcc.apb1enr &= ~(1 << STM_RCC_APB1ENR_PWREN);
- if (v == AO_BOOT_APPLICATION_VALUE)
- ao_boot_chain(AO_BOOT_APPLICATION_BASE);
+ return v == AO_BOOT_APPLICATION_VALUE;
#if AO_BOOT_CHAIN
if (ao_boot_check_chain()) {
#if AO_BOOT_PIN
#if AO_BOOT_CHAIN
if (ao_boot_check_chain()) {
#if AO_BOOT_PIN
+ if (ao_boot_check_pin())
+ {
+ ao_boot_chain(AO_BOOT_APPLICATION_BASE);
+ }
}
#endif
/* Turn on syscfg */
}
#endif
/* Turn on syscfg */