}
}
+#if HAS_BOOT_LOADER
+
+#include <ao_boot.h>
+
+static void
+ao_loader(void)
+{
+ flush();
+ ao_boot_loader();
+}
+#endif
+
__xdata struct ao_task ao_cmd_task;
__code struct ao_cmds ao_base_cmds[] = {
{ ao_reboot, "r eboot\0Reboot" },
#if HAS_VERSION
{ version, "v\0Version" },
+#endif
+#if HAS_BOOT_LOADER
+ { ao_loader, "X\0Switch to boot loader" },
#endif
{ 0, NULL },
};
#STACK_GUARD_DEF=-DHAS_STACK_GUARD=1
ALTOS_SRC = \
+ ao_boot_chain.c \
ao_interrupt.c \
ao_product.c \
ao_romconfig.c \
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
}
-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" },
{ 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 }
};
#define AO_BOOT_APPLICATION_PIN 0
#define AO_BOOT_APPLICATION_VALUE 1
#define AO_BOOT_APPLICATION_MODE 0
-#define AO_BOOT_APPLICATION_BASE ((uint32_t *) 0x1000)
#endif /* _AO_PINS_H_ */
+++ /dev/null
-/*
- * Copyright © 2012 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.
- */
-
-MEMORY {
- rom (rx) : ORIGIN = 0x08001000, LENGTH = 124K
- ram (!w) : ORIGIN = 0x20000000, LENGTH = 16K
-}
-
-INCLUDE registers.ld
-
-EXTERN (stm_interrupt_vector)
-
-SECTIONS {
- /*
- * Rom contents
- */
-
- .text ORIGIN(rom) : {
- __text_start__ = .;
- *(.interrupt) /* Interrupt vectors */
-
- . = ORIGIN(rom) + 0x100;
-
-
- /* Ick. What I want is to specify the
- * addresses of some global constants so
- * that I can find them across versions
- * of the application. I can't figure out
- * how to make gnu ld do that, so instead
- * we just load the two files that include
- * these defines in the right order here and
- * expect things to 'just work'. Don't change
- * the contents of those files, ok?
- */
- ao_romconfig.o(.romconfig*)
- ao_product.o(.romconfig*)
- *(.text*) /* Executable code */
- *(.rodata*) /* Constants */
-
- } > rom
-
- .ARM.exidx : {
- *(.ARM.exidx* .gnu.linkonce.armexidx.*)
- } > rom
- __text_end__ = .;
-
- /* Boot data which must live at the start of ram so that
- * the application and bootloader share the same addresses.
- * This must be all uninitialized data
- */
- .boot (NOLOAD) : {
- __boot_start__ = .;
- *(.boot)
- . = ALIGN(4);
- __boot_end__ = .;
- } >ram
-
- /* Data -- relocated to RAM, but written to ROM
- */
- .data : {
- __data_start__ = .;
- *(.data) /* initialized data */
- . = ALIGN(4);
- __data_end__ = .;
- } >ram AT>rom
-
- .bss : {
- __bss_start__ = .;
- *(.bss)
- *(COMMON)
- . = ALIGN(4);
- __bss_end__ = .;
- } >ram
-
- PROVIDE(__stack__ = ORIGIN(ram) + LENGTH(ram));
- PROVIDE(end = .);
-}
-
-ENTRY(start);
-
-
*/
MEMORY {
- rom (rx) : ORIGIN = 0x08000000, LENGTH = 128K
+ rom (rx) : ORIGIN = 0x08001000, LENGTH = 124K
ram (!w) : ORIGIN = 0x20000000, LENGTH = 15872
stack (!w) : ORIGIN = 0x20003e00, LENGTH = 512
}
. = ORIGIN(rom) + 0x100;
+
+ /* Ick. What I want is to specify the
+ * addresses of some global constants so
+ * that I can find them across versions
+ * of the application. I can't figure out
+ * how to make gnu ld do that, so instead
+ * we just load the two files that include
+ * these defines in the right order here and
+ * expect things to 'just work'. Don't change
+ * the contents of those files, ok?
+ */
ao_romconfig.o(.romconfig*)
ao_product.o(.romconfig*)
-
*(.text*) /* Executable code */
*(.rodata*) /* Constants */
.ARM.exidx : {
*(.ARM.exidx* .gnu.linkonce.armexidx.*)
- __text_end__ = .;
} > rom
+ __text_end__ = .;
+
+ /* Boot data which must live at the start of ram so that
+ * the application and bootloader share the same addresses.
+ * This must be all uninitialized data
+ */
+ .boot (NOLOAD) : {
+ __boot_start__ = .;
+ *(.boot)
+ . = ALIGN(4);
+ __boot_end__ = .;
+ } >ram
/* Data -- relocated to RAM, but written to ROM
*/
- .data ORIGIN(ram) : AT (ADDR(.ARM.exidx) + SIZEOF (.ARM.exidx)) {
+ .data : {
__data_start__ = .;
*(.data) /* initialized data */
+ . = ALIGN(4);
__data_end__ = .;
- __bss_start__ = .;
- } >ram
+ } >ram AT>rom
.bss : {
+ __bss_start__ = .;
*(.bss)
*(COMMON)
+ . = ALIGN(4);
__bss_end__ = .;
} >ram
void
ao_adc_init();
+#define AO_BOOT_APPLICATION_BASE ((uint32_t *) 0x1000)
+#define AO_BOOT_LOADER_BASE ((uint32_t *) 0x0)
+#define HAS_BOOT_LOADER 1
+
#endif /* _AO_ARCH_H_ */
+
void
ao_boot_reboot(uint32_t *base);
+static inline void
+ao_boot_loader(void) {
+ ao_boot_reboot(AO_BOOT_LOADER_BASE);
+}
+
#endif /* _AO_BOOT_H_ */
#STACK_GUARD_DEF=-DHAS_STACK_GUARD=1
ALTOS_SRC = \
+ ao_boot_chain.c \
ao_interrupt.c \
ao_product.c \
ao_romconfig.c \
#PROFILE_DEF=-DAO_PROFILE=1
ALTOS_SRC = \
+ ao_boot_chain.c \
ao_interrupt.c \
ao_product.c \
ao_romconfig.c \
#STACK_GUARD_DEF=-DHAS_STACK_GUARD=1
ALTOS_SRC = \
+ ao_boot_chain.c \
ao_interrupt.c \
ao_product.c \
ao_romconfig.c \
#STACK_GUARD_DEF=-DHAS_STACK_GUARD=1
ALTOS_SRC = \
+ ao_boot_chain.c \
ao_interrupt.c \
ao_product.c \
ao_romconfig.c \
projects / fw / altos / commitdiff