summaryrefslogtreecommitdiff
path: root/src/stm-demo
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-04-22 20:35:57 -0500
committerKeith Packard <keithp@keithp.com>2013-05-07 21:30:26 -0700
commitdfc268e0021e1cd3045f73339a749d292a6a6300 (patch)
tree3736895bb7debeff7a6363ce263b085d6ec4b531 /src/stm-demo
parent8ded61d59888c79ef1f94e664b5fb770841a801a (diff)
altos: Use flash loader on all STM products
Includes the boot chain stuff Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/stm-demo')
-rw-r--r--src/stm-demo/Makefile2
-rw-r--r--src/stm-demo/ao_demo.c8
2 files changed, 1 insertions, 9 deletions
diff --git a/src/stm-demo/Makefile b/src/stm-demo/Makefile
index e84a7675..d1f825db 100644
--- a/src/stm-demo/Makefile
+++ b/src/stm-demo/Makefile
@@ -56,7 +56,7 @@ OBJ=$(SRC:.c=.o)
all: $(ELF) $(IHX)
-LDFLAGS=-L../stm -Wl,-Taltos-application.ld
+LDFLAGS=-L../stm -Wl,-Taltos.ld
$(ELF): Makefile $(OBJ)
$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJ) $(SAT_CLIB) -lgcc
diff --git a/src/stm-demo/ao_demo.c b/src/stm-demo/ao_demo.c
index ec572fdc..5677cdf4 100644
--- a/src/stm-demo/ao_demo.c
+++ b/src/stm-demo/ao_demo.c
@@ -169,13 +169,6 @@ ao_event(void)
}
-static void
-ao_boot_loader(void)
-{
- flush();
- ao_boot_reboot((uint32_t *) 0);
-}
-
__code struct ao_cmds ao_demo_cmds[] = {
{ ao_dma_test, "D\0DMA test" },
{ ao_spi_write, "W\0SPI write" },
@@ -183,7 +176,6 @@ __code struct ao_cmds ao_demo_cmds[] = {
{ ao_i2c_write, "i\0I2C write" },
{ ao_temp, "t\0Show temp" },
{ ao_event, "e\0Monitor event queue" },
- { ao_boot_loader, "L\0Reboot to boot loader" },
{ 0, NULL }
};