Changeset 554 for trunk/softs/tsar_boot/src

Timestamp:

Oct 22, 2013, 8:15:05 PM (11 years ago)

Author:

bouyer

Message:

Make sure the boot loader won't try to write to the ROM.
Store read-write data in BSS along with the stack at seg_stack_base.

Location:

trunk/softs/tsar_boot/src

Files:

• boot_elf_loader.c (modified) (1 diff)
• boot_ioc.c (modified) (1 diff)
• reset.S (modified) (2 diffs)

trunk/softs/tsar_boot/src/boot_elf_loader.c

@@ -17 +17 @@
 
 #if (BOOT_DEBUG == 1)
-static char* init_state_str[] = {
+static char const * const init_state_str[] = {
     "ELF_HEADER_STATE",
     "ELF_PROGRAM_HEADER_STATE",

trunk/softs/tsar_boot/src/boot_ioc.c

@@ -4 +4 @@
 
 static struct sdcard_dev  _sdcard_device;
-static struct spi_dev   * _spi_device   = ( struct spi_dev * )IOC_BASE;
+static struct spi_dev   *const  _spi_device   = ( struct spi_dev * )IOC_BASE;
 
 #endif // end ifndef SOCLIB_IOC

trunk/softs/tsar_boot/src/reset.S

@@ -139 +139 @@
     /* Initializes stack pointer */
 
-    la      k1,     seg_stack_base
-    li      k0,     BOOT_STACK_SIZE
-    addu    sp,     k1,     k0      /* sp <= seg_stack_base + BOOT_STACK_SIZE */
+    la      sp,     stk
 
     la      a0,     versionstr
@@ -220 +218 @@
     .set reorder
 
+    .section .data
+    .space BOOT_STACK_SIZE
+stk:
+    .space 1
+
 /*
  * vim: tabstop=4 : shiftwidth=4 : expandtab