setup the loader, blink in the boot section

Author: cedricbompart

.gitignore

@@ -22,6 +22,8 @@ lib/lang/lang_str.h
 modules/exportlist.inc
 modules/module_exportlist.h
 modules/module_hashlist.c
+doc/camnotes.txt
+doc/readme.txt
 
 tools/finsig_thumb2
 tools/code_gen

loader/m6/main.c

@@ -1,11 +1,56 @@
 #include "../generic/check_compat.c"
 
+#define LED 0xD20801E0
+
 extern long *blob_chdk_core;
 extern long blob_chdk_core_size;
 
+typedef struct {
+	const char *str;
+	const char *fw_str;
+	void (*dcc_by_mva)(void *addr, long len);
+	void (*ici_by_mva)(void *addr, long len);
+	void (*core_unblock)(unsigned coreid);
+} ld_ver_t;
+
+ld_ver_t fw = { "GM1.01A",  //
+		(void*) 0xE03CFDF0, //
+		(void*) 0xE036BA79, // dcache_clean_range
+		(void*) 0xE036BB4D, // icache_flush_range
+		(void*) 0xE0523D73  //
+		};
+
+int __attribute__((naked)) get_core_id() {
+	asm volatile (
+			"mrc     p15, #0, r0, c0, c0, #5\n"
+			"ands    r0, #0xf\n"
+			"bx      lr\n"
+	);
+}
+
+/**
+ * @see loader entry
+ */
 void __attribute__((noreturn)) my_restart() {
-	check_compat();
+	void (*cont)(int coreid) = (void*)(MEMISOSTART | 1);
+	int coreid = get_core_id();
+
+	if (!coreid) { /* core 0 only */
+		check_compat();
+
+		long *dst = (long*)MEMISOSTART;
+		const long *src = blob_chdk_core;
+		long length = (blob_chdk_core_size + 3) >> 2;
+
+		core_copy(src, dst, length);
+
+		set_led(LED, 1, LEDCNTRL_NEW4); /* green LED on */
+
+		fw.dcc_by_mva(dst, length<<2);
+		fw.ici_by_mva(dst, length<<2);
+		fw.core_unblock(1); /* core 1 */
+	}
 
-	while (1)
-		;
+	cont(coreid);
+	while(1);
 }

platform/m6/main.c

@@ -3,27 +3,27 @@
 #include "core.h"
 #include "keyboard.h"
 
+extern int _GetLensCurrentFocalLength(void);
+extern int _GetLensWideFocalLength(void);
 extern long link_bss_start;
 extern long link_bss_end;
 extern void boot();
 
-void startup() {
-	long *bss = &link_bss_start;
-	// sanity check
-	if ((long) &link_bss_end > (MEMISOSTART + MEMISOSIZE)) {
-		started();
-		shutdown();
+void startup(int core) {
+	if (!core) { // core 0 only
+		long *bss = &link_bss_start;
+		// sanity check
+		if ((long) &link_bss_end > (MEMISOSTART + MEMISOSIZE)) {
+			while (1)
+				;
+		}
+		// initialize .bss segment
+		while (bss < &link_bss_end)
+			*bss++ = 0;
 	}
-	// initialize .bss senment
-	while (bss < &link_bss_end)
-		*bss++ = 0;
 	boot();
 }
 
-const int zoom_points = 1;
-extern int _GetLensCurrentFocalLength(void);
-extern int _GetLensWideFocalLength(void);
-
 /**
  * @header shooting.h
  */
@@ -43,7 +43,8 @@ int get_focal_length(__attribute__ ((unused))int zp) {
  */
 int get_zoom_x(__attribute__ ((unused))int zp) {
 	// TODO: why the 100 ?
-	return _GetLensCurrentFocalLength() * 100/ (_GetLensWideFocalLength() * 100);
+	return _GetLensCurrentFocalLength() * 100
+			/ (_GetLensWideFocalLength() * 100);
 }
 
 /**

platform/m6/sub/101a/boot.c

@@ -1,6 +1,26 @@
+#define LED 0xD20801E0
+
+void sleep(int duration) {
+	int i;
+	for (i = 0; i < duration; i++) {
+		asm volatile( "nop\n" );
+	}
+}
+
+void blink() {
+	volatile long *led = (long*) LED;
+
+	while (1) {
+		*led = 0x24D0002; /* on */
+		sleep(10000000);
+		*led = 0x24C0003; /* off */
+		sleep(10000000);
+	}
+}
+
 /**
  * @see main startup
  */
 void __attribute__((naked,noinline)) boot() {
-
+	blink();
 }