bootloader: Import bootloader-final.ld.

This is used to link the final bootloader described in the
previous commit.

diff --git a/SConscript.target b/SConscript.target
index 8ee82a3463fac66ea6569bc29a62f3f515dd72c8..b5eb085628154436ba9ed7dae9d4239dc0ffd62d 100644 (file)
--- a/SConscript.target
+++ b/SConscript.target
@@ -51,22 +51,35 @@ libbootloader_source_files = [
     'src/bootloader/flash.rs',
 ]
 
-libbootloader = env.Rustc('libbootloader.a', libbootloader_source_files[0])
+start_o = env.Object('src/bootloader/start.c')
 
-for f in libbootloader_source_files:
-    Depends(libbootloader, f)
+for s in ['intermediate', 'final']:
+    libbootloader_env = env.Clone()
 
-Depends(libbootloader, 'libcommon.rlib')
-Depends(libbootloader, 'libcommon.a')
+    libbootloader_env.Append(RUSTCFLAGS = [
+        '--cfg',
+        'bootloader_type=\\"{}\\"'.format(s)
+    ])
 
-bootloader_env = env.Clone()
+    libbootloader = libbootloader_env.Rustc('libbootloader-{}.a'.format(s),
+                                            libbootloader_source_files[0])
 
-bootloader_env.Append(LINKFLAGS = [
-    '-Tsrc/bootloader/bootloader-intermediate.ld',
-])
+    for f in libbootloader_source_files:
+        Depends(libbootloader, f)
+
+    Depends(libbootloader, 'libcommon.rlib')
+    Depends(libbootloader, 'libcommon.a')
+
+    bootloader_env = env.Clone()
+
+    bootloader_env.Append(LINKFLAGS = [
+        '-Tsrc/bootloader/bootloader-{}.ld'.format(s),
+    ])
 
-bootloader_elf = bootloader_env.Program('gps-watch-bootloader.elf', 'src/bootloader/start.c', LIBS = ['bootloader', 'common'])
+    bootloader_elf = \
+        bootloader_env.Program('gps-watch-bootloader-{}.elf'.format(s),
+                               start_o, LIBS = ['bootloader-{}'.format(s), 'common'])
 
-bootloader_bin = bootloader_env.Objcopy(bootloader_elf)
+    bootloader_bin = bootloader_env.Objcopy(bootloader_elf)
 
-Default(bootloader_bin)
+    Default(bootloader_bin)

diff --git a/src/bootloader/bootloader-final.ld b/src/bootloader/bootloader-final.ld
new file mode 100644 (file)
index 0000000..56f20cc
--- /dev/null
+++ b/src/bootloader/bootloader-final.ld
@@ -0,0 +1,174 @@
+/* This is a copy of
+ *   CMSIS/Device/ARM/ARMCM0plus/Source/GCC/gcc_arm.ld
+ * taken from
+ *   git://github.com/ARM-software/CMSIS
+ */
+
+/* Linker script to configure memory regions. */
+MEMORY
+{
+  FLASH (rx)
+    : ORIGIN = 0x00000000, LENGTH = 0x08000
+
+  RAM (rwx)
+    : ORIGIN = 0x1fffe000, LENGTH = 0x08000
+}
+
+/* Library configurations */
+GROUP(libgcc.a libc.a libm.a libnosys.a)
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+       .text :
+       {
+               KEEP(*(.vectors))
+               __end__ = .;
+
+               /* The flash configuration field: */
+               . = ALIGN(0x400);
+               LONG(0x001a0933);
+               LONG(0xffffffff);
+               LONG(0xffffffff);
+               LONG(0xfffffb7e);
+
+               /* Don't put any other code in there so we may avoid
+                * erasing and re-programming it.
+                */
+               . = ALIGN(0x800);
+
+               *(.text*)
+
+               KEEP(*(.init))
+               KEEP(*(.fini))
+
+               /* .ctors */
+               *crtbegin.o(.ctors)
+               *crtbegin?.o(.ctors)
+               *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+               *(SORT(.ctors.*))
+               *(.ctors)
+
+               /* .dtors */
+               *crtbegin.o(.dtors)
+               *crtbegin?.o(.dtors)
+               *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+               *(SORT(.dtors.*))
+               *(.dtors)
+
+               *(.rodata*)
+
+               KEEP(*(.eh_frame*))
+       } > FLASH =0xff
+
+       .ARM.extab :
+       {
+               *(.ARM.extab* .gnu.linkonce.armextab.*)
+       } > FLASH
+
+       __exidx_start = .;
+       .ARM.exidx :
+       {
+               *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+       } > FLASH
+       __exidx_end = .;
+
+       __etext = .;
+
+       .data : AT (__etext)
+       {
+               __data_start__ = .;
+               *(vtable)
+               *(.data*)
+
+               . = ALIGN(4);
+               /* preinit data */
+               PROVIDE_HIDDEN (__preinit_array_start = .);
+               KEEP(*(.preinit_array))
+               PROVIDE_HIDDEN (__preinit_array_end = .);
+
+               . = ALIGN(4);
+               /* init data */
+               PROVIDE_HIDDEN (__init_array_start = .);
+               KEEP(*(SORT(.init_array.*)))
+               KEEP(*(.init_array))
+               PROVIDE_HIDDEN (__init_array_end = .);
+
+
+               . = ALIGN(4);
+               /* finit data */
+               PROVIDE_HIDDEN (__fini_array_start = .);
+               KEEP(*(SORT(.fini_array.*)))
+               KEEP(*(.fini_array))
+               PROVIDE_HIDDEN (__fini_array_end = .);
+
+               KEEP(*(.jcr*))
+               . = ALIGN(4);
+               /* All data end */
+               __data_end__ = .;
+
+       } > RAM
+
+       .bss :
+       {
+               . = ALIGN(4);
+               __bss_start__ = .;
+               *(.bss*)
+               *(COMMON)
+               . = ALIGN(4);
+               __bss_end__ = .;
+       } > RAM
+
+       .heap (COPY):
+       {
+               __HeapBase = .;
+               __end__ = .;
+               end = __end__;
+               KEEP(*(.heap*))
+               __HeapLimit = .;
+       } > RAM
+
+       /* .stack_dummy section doesn't contains any symbols. It is only
+        * used for linker to calculate size of stack sections, and assign
+        * values to stack symbols later */
+       .stack_dummy (COPY):
+       {
+               KEEP(*(.stack*))
+       } > RAM
+
+       /* Set stack top to end of RAM, and stack limit move down by
+        * size of stack_dummy section */
+       __StackTop = ORIGIN(RAM) + LENGTH(RAM);
+       __StackLimit = __StackTop - SIZEOF(.stack_dummy);
+       PROVIDE(__stack = __StackTop);
+
+       /* Check if data + heap + stack exceeds RAM limit */
+       ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}

diff --git a/src/bootloader/main.rs b/src/bootloader/main.rs
index d81da1532baa5b0b41f3a05f5f1adc7e1cf3d084..0d2954909572a02f26432aef8147c5894dfaff47 100644 (file)
--- a/src/bootloader/main.rs
+++ b/src/bootloader/main.rs
@@ -40,8 +40,12 @@ extern {
     fn jump_to_application(address: u32);
 }
 
+#[cfg(bootloader_type = "intermediate")]
 const APPLICATION_ADDR: u32 = 0x0;
 
+#[cfg(bootloader_type = "final")]
+const APPLICATION_ADDR: u32 = 0x8000;
+
 fn bootloader_requested() -> bool {
     let start_ticks = systick::now();