Merge branch 'master' of github.com:r0ket/r0ket

firmware/filesystem/execute.c

@@ -53,7 +53,7 @@ uint8_t execute_file (const char * fname){
     data = (uint32_t*)dst;
     len = readbytes/4;
 
-    if( readbytes & 0xF ){
+    if( readbytes & 0xF || readbytes <= 0x10){
         lcdClear();
         lcdPrint("!size");
         lcdRefresh();

firmware/l0dable/ram.ld

@@ -30,12 +30,7 @@ SECTIONS
     *(vtable)
     *(.data*)
     _edata = .;
-  } > sram
+                    /* force zero initialized data to be present*/
-
-  /* zero initialized data */
-  .bss :
-  {
-    _bss = .;
     *(.bss*)
     *(COMMON)
     _ebss = .;
@@ -43,6 +38,4 @@ SECTIONS
 
   end = .;
 
-  /* For GDB compatibility we decrease the top with 16 bytes */
-  stack_entry = sram_top - 16;
 }

firmware/main.c

@@ -7,7 +7,28 @@
 #include "lcd/render.h"
 #include "filesystem/ff.h"
 
-__attribute__ ((used, section("crp"))) const uint32_t the_crp=0x87654321;
+
+#ifdef CRP1
+#define CRP_VALUE 0x12345678  // CRP1
+#endif
+
+#ifdef CRP2
+#define CRP_VALUE 0x87654321  // CRP2
+#endif
+
+#ifdef CRP3
+#define CRP_VALUE 0x43218765  // CRP3
+#endif
+
+#ifdef NO_ISP
+#define CRP_VALUE 0x4e697370  // NO_ISP
+#endif
+
+#ifndef CRP_VALUE
+#define CRP_VALUE 0x0  // ANY non-magic value disables CRP
+#endif
+
+__attribute__ ((used, section("crp"))) const uint32_t the_crp=CRP_VALUE;
 
 /**************************************************************************/