Add STM self-flashing loader

This allows the real application to get loaded at 0x2000 and jumps to
that at startup time if the boot pin is set appropriately

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/stm-flash/Makefile b/src/stm-flash/Makefile
new file mode 100644 (file)
index 0000000..fbc6603
--- /dev/null
+++ b/src/stm-flash/Makefile
@@ -0,0 +1,60 @@
+#
+# AltOS build
+#
+#
+
+include ../stm/Makefile.defs
+
+INC = \
+       ao.h \
+       ao_arch.h \
+       ao_arch_funcs.h \
+       ao_pins.h \
+       ao_product.h
+
+#
+# Common AltOS sources
+#
+ALTOS_SRC = \
+       ao_interrupt.c \
+       ao_product.c \
+       ao_romconfig.c \
+       ao_task.c \
+       ao_timer.c \
+       ao_mutex.c \
+       ao_usb_stm.c \
+       ao_stdio.c \
+       ao_cmd.c
+
+PRODUCT=StmFlash-v0.0
+PRODUCT_DEF=-DSTM_FLASH
+IDPRODUCT=0x000a
+
+CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -Os
+
+PROG=stm-flash
+
+SRC=$(ALTOS_SRC) ao_stm_flash.c
+OBJ=$(SRC:.c=.o)
+
+all: $(PROG)
+
+LDFLAGS=-L../stm -Wl,-Taltos-loader.ld
+
+$(PROG): Makefile $(OBJ)
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+
+ao_product.h: ao-make-product.5c ../Version
+       $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
+
+$(OBJ): $(INC)
+
+distclean:     clean
+
+clean:
+       rm -f *.o $(PROG)
+       rm -f ao_product.h
+
+install:
+
+uninstall:

diff --git a/src/stm-flash/ao_pins.h b/src/stm-flash/ao_pins.h
new file mode 100644 (file)
index 0000000..b232f37
--- /dev/null
+++ b/src/stm-flash/ao_pins.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.com>
+ *
+ * This program 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; version 2 of the License.
+ *
+ * This program 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.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_PINS_H_
+#define _AO_PINS_H_
+
+#define HAS_TASK_QUEUE         0
+
+#define AO_HSE                 8000000
+
+/* PLLVCO = 96MHz (so that USB will work) */
+#define AO_PLLMUL              12
+#define AO_RCC_CFGR_PLLMUL     (STM_RCC_CFGR_PLLMUL_12)
+
+/* SYSCLK = 32MHz */
+#define AO_PLLDIV              3
+#define AO_RCC_CFGR_PLLDIV     (STM_RCC_CFGR_PLLDIV_3)
+
+/* HCLK = 32MHZ (CPU clock) */
+#define AO_AHB_PRESCALER       1
+#define AO_RCC_CFGR_HPRE_DIV   STM_RCC_CFGR_HPRE_DIV_1
+
+/* Run APB1 at HCLK/1 */
+#define AO_APB1_PRESCALER      1
+#define AO_RCC_CFGR_PPRE1_DIV  STM_RCC_CFGR_PPRE2_DIV_1
+
+/* Run APB2 at HCLK/1 */
+#define AO_APB2_PRESCALER              1
+#define AO_RCC_CFGR_PPRE2_DIV  STM_RCC_CFGR_PPRE2_DIV_1
+
+#define HAS_USB                        1
+#define USE_USB_STDIN          1
+#define HAS_BEEP               0
+
+#define PACKET_HAS_SLAVE       0
+
+#define LED_PORT_ENABLE                STM_RCC_AHBENR_GPIOCEN
+#define LED_PORT               (&stm_gpioc)
+#define LED_PIN_RED            8
+#define LED_PIN_GREEN          9
+#define AO_LED_RED             (1 << LED_PIN_RED)
+#define AO_LED_GREEN           (1 << LED_PIN_GREEN)
+
+#define LEDS_AVAILABLE         (AO_LED_RED | AO_LED_GREEN)
+
+#define AO_TICK_TYPE           uint32_t
+#define AO_TICK_SIGNED         int32_t
+
+#define HAS_TASK_INFO          0
+
+#define AO_BOOT_APPLICATION_GPIO       stm_gpiob
+#define AO_BOOT_APPLICATION_PIN                5
+#define AO_BOOT_APPLICATION_VALUE      0
+#define AO_BOOT_APPLICATION_MODE       AO_EXTI_MODE_PULL_UP
+#define AO_BOOT_APPLICATION_BASE       0x2000
+
+#endif /* _AO_PINS_H_ */

diff --git a/src/stm-flash/ao_stm_flash.c b/src/stm-flash/ao_stm_flash.c
index df466d8553de86eb9c0d342071f85801732c42c5..81ae86df2523acdd9b9bd7c44ea311b041d8d506 100644 (file)
--- a/src/stm-flash/ao_stm_flash.c
+++ b/src/stm-flash/ao_stm_flash.c
@@ -17,6 +17,7 @@
 
 #include "ao.h"
 #include <ao_exti.h>
+<<<<<<< HEAD
 #include <ao_boot.h>
 #include <ao_flash_stm.h>
 
@@ -117,21 +118,48 @@ __code struct ao_cmds ao_flash_cmds[] = {
        { ao_block_read, "R <addr>\0Read block. Returns 256 bytes" },
        { 0, NULL },
 };
+=======
+
+void
+ao_panic(uint8_t c)
+{
+}
+
+void
+ao_test(void)
+{
+       char    c;
+
+       for (;;) {
+               c = ao_usb_getchar();
+               ao_usb_putchar(c);
+               ao_usb_flush();
+       }
+}
+
+struct ao_task ao_test_task;
+>>>>>>> 5187bb4... Add STM self-flashing loader
 
 int
 main(void)
 {
        ao_clock_init();
+<<<<<<< HEAD
 
        ao_task_init();
 
+=======
+>>>>>>> 5187bb4... Add STM self-flashing loader
        ao_timer_init();
 //     ao_dma_init();
        ao_cmd_init();
 //     ao_exti_init();
        ao_usb_init();
 
+<<<<<<< HEAD
        ao_cmd_register(&ao_flash_cmds[0]);
+=======
+>>>>>>> 5187bb4... Add STM self-flashing loader
        ao_start_scheduler();
        return 0;
 }

diff --git a/src/stm/ao_arch_funcs.h b/src/stm/ao_arch_funcs.h
index f3d68202303a1844e180b7b846873999275aa417..2c0f173c3661264a68b7192821370f663a47f010 100644 (file)
--- a/src/stm/ao_arch_funcs.h
+++ b/src/stm/ao_arch_funcs.h
@@ -113,6 +113,19 @@ ao_spi_init(void);
                        stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOEEN); \
        } while (0)
 
+#define ao_disable_port(port) do {                                     \
+               if ((port) == &stm_gpioa)                               \
+                       stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIOAEN); \
+               else if ((port) == &stm_gpiob)                          \
+                       stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIOBEN); \
+               else if ((port) == &stm_gpioc)                          \
+                       stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIOCEN); \
+               else if ((port) == &stm_gpiod)                          \
+                       stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIODEN); \
+               else if ((port) == &stm_gpioe)                          \
+                       stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIOEEN); \
+       } while (0)
+
 
 #define ao_gpio_set(port, bit, pin, v) stm_gpio_set(port, bit, v)
 
@@ -124,9 +137,7 @@ ao_spi_init(void);
                stm_moder_set(port, bit, STM_MODER_OUTPUT);\
        } while (0)
 
-#define ao_enable_input(port,bit,mode) do {                            \
-               ao_enable_port(port);                                   \
-               stm_moder_set(port, bit, STM_MODER_INPUT);              \
+#define ao_gpio_set_mode(port,bit,mode) do {                           \
                if (mode == AO_EXTI_MODE_PULL_UP)                       \
                        stm_pupdr_set(port, bit, STM_PUPDR_PULL_UP);    \
                else if (mode == AO_EXTI_MODE_PULL_DOWN)                \
@@ -134,6 +145,12 @@ ao_spi_init(void);
                else                                                    \
                        stm_pupdr_set(port, bit, STM_PUPDR_NONE);       \
        } while (0)
+       
+#define ao_enable_input(port,bit,mode) do {                            \
+               ao_enable_port(port);                                   \
+               stm_moder_set(port, bit, STM_MODER_INPUT);              \
+               ao_gpio_set_mode(port, bit, mode);                      \
+       } while (0)
 
 #define ao_enable_cs(port,bit) do {                            \
                stm_gpio_set((port), bit, 1);                   \

diff --git a/src/stm/ao_interrupt.c b/src/stm/ao_interrupt.c
index a423d8b13b1f76ad4ab2524602da956e8a74eadb..12763a305737623de75ad2c61757cbb9f445567e 100644 (file)
--- a/src/stm/ao_interrupt.c
+++ b/src/stm/ao_interrupt.c
@@ -36,7 +36,47 @@ void stm_ignore_isr(void)
 {
 }
 
+const void *stm_interrupt_vector[];
+
+#define BOOT_FETCH(o)  (*((uint32_t *) (AO_BOOT_APPLICATION_BASE + (o))))
+
+#ifdef AO_BOOT_APPLICATION_PIN
+#include <ao_exti.h>
+#endif
+
 void start(void) {
+#ifdef AO_BOOT_APPLICATION_PIN
+       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);
+
+       /* Read the value */
+       v = stm_gpio_get(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN);
+
+       /* 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)
+       {
+               uint32_t        sp;
+               uint32_t        pc;
+
+               sp = BOOT_FETCH(0);
+               pc = BOOT_FETCH(4);
+               asm ("mov sp, %0" : : "r" (sp));
+               asm ("mov lr, %0" : : "r" (pc));
+               asm ("bx lr");
+       }
+#endif
+
+       /* Set interrupt vector table offset */
+       stm_nvic.vto = (uint32_t) &stm_interrupt_vector;
        memcpy(&__data_start__, &__text_end__, &__data_end__ - &__data_start__);
        memset(&__bss_start__, '\0', &__bss_end__ - &__bss_start__);
        main();