4 files changed, 228 insertions, 0 deletions

diff --git a/rbutil/mkimxboot/dualboot/Makefile b/rbutil/mkimxboot/dualboot/Makefile
new file mode 100644
index 0000000000..fa5f341b6d
--- /dev/null
+++ b/rbutil/mkimxboot/dualboot/Makefile
@@ -0,0 +1,33 @@
+CC=gcc
+CROSS_PREFIX=arm-elf-eabi
+# Edit the following variables (plus copy/paste another set of rules) when
+# adding a new target.  mkimxboot.c also needs to be edited to refer to these
+# new images.
+
+BOOTOBJS = dualboot_fuzeplus.o
+BOOTBINS = dualboot_fuzeplus.arm-bin
+
+all: ../dualboot.h ../dualboot.c
+
+# Dualboot bootloaders
+
+dualboot_fuzeplus.o: dualboot.S
+        $(CROSS_PREFIX)-$(CC) -mcpu=arm926ej-s -DSANSA_FUZEPLUS -c -o dualboot_fuzeplus.o dualboot.S
+
+# Rules for the ARM code embedded in mkamsboot - assemble, link, then extract
+# the binary code and finally convert to .h for building in mkamsboot
+
+%.arm-elf: %.o
+        $(CROSS_PREFIX)-ld -Tdualboot.lds -o $@ $<
+
+%.arm-bin: %.arm-elf
+        $(CROSS_PREFIX)-objcopy -O binary $< $@
+
+../dualboot.c ../dualboot.h: $(BOOTBINS) bin2c
+        ./bin2c ../dualboot $(BOOTBINS)
+
+bin2c: bin2c.c
+        $(CC) -o bin2c bin2c.c
+
+clean:
+        rm -f *~ bin2c $(BOOTBINS) $(BOOTOBJS)
diff --git a/rbutil/mkimxboot/dualboot/bin2c.c b/rbutil/mkimxboot/dualboot/bin2c.c
new file mode 100644
index 0000000000..b02af88a4d
--- /dev/null
+++ b/rbutil/mkimxboot/dualboot/bin2c.c
@@ -0,0 +1,140 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2007 Dave Chapman
+ *
+ * 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; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <libgen.h>
+
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+static off_t filesize(int fd)
+{
+    struct stat buf;
+
+    fstat(fd,&buf);
+    return buf.st_size;
+}
+
+static void write_cfile(const unsigned char* buf, off_t len, FILE* fp, const char *name)
+{
+    int i;
+
+    fprintf(fp,"unsigned char %s[%ld] = {",name,len);
+
+    for (i=0;i<len;i++) {
+        if ((i % 16) == 0) {
+           fprintf(fp,"\n    ");
+        }
+        if (i == (len-1)) {
+            fprintf(fp,"0x%02x",buf[i]);
+        } else if ((i % 16) == 15) {
+            fprintf(fp,"0x%02x,",buf[i]);
+        } else {
+            fprintf(fp,"0x%02x, ",buf[i]);
+        }
+    }
+    fprintf(fp,"\n};\n");
+}
+
+int main (int argc, char* argv[])
+{
+    char* cname;
+    int i;
+    FILE *cfile, *hfile;
+    char cfilename[256], hfilename[256];
+
+    if (argc < 3) {
+        fprintf(stderr,"Usage: bin2c cname file1 [file2 [file3 ...]]\n");
+        return 1;
+    }
+
+    cname=argv[1];
+
+    snprintf(cfilename,256,"%s.c",cname);
+    cfile = fopen(cfilename,"w+");
+    if (cfile == NULL) {
+        fprintf(stderr,"Couldn't open %s\n",cfilename);
+        return 2;
+    }
+
+    snprintf(hfilename,256,"%s.h",cname);
+    hfile = fopen(hfilename,"w+");
+    if (hfile == NULL) {
+        fprintf(stderr,"Couldn't open %s\n",hfilename);
+        fclose(cfile);
+        return 3;
+    }
+
+    fprintf(cfile,"/* Generated by bin2c */\n\n");
+    fprintf(cfile,"#include \"%s\"\n\n", basename(hfilename));
+    fprintf(hfile,"/* Generated by bin2c */\n\n");
+
+    for(i=0; i < argc - 2; i++) {
+        unsigned char* buf;
+        off_t len;
+        off_t orig_len;
+        char *ext;
+        char *array = argv[2+i];
+
+        int fd = open(array,O_RDONLY|O_BINARY);
+        if (fd < 0) {
+            fprintf(stderr,"Can not open %s\n",argv[2+i]);
+            fclose(cfile);
+            fclose(hfile);
+            return 4;
+        }
+
+        orig_len = filesize(fd);
+        /* pad to 32bit */
+        len = (orig_len + 3) & ~3;
+
+        buf = malloc(len);
+        if (read(fd,buf,orig_len) < orig_len) {
+            fprintf(stderr,"Short read, aborting\n");
+            return 5;
+        }
+
+        /* pad to 32bit with zeros */
+        if (len > orig_len)
+            memset(buf+orig_len, 0, len-orig_len);
+        
+        /* remove file extension */
+        ext = strchr (array, '.');
+        if (ext != NULL)
+            *ext = '\0';
+        write_cfile (buf, len, cfile, array);
+        fprintf(hfile,"extern unsigned char %s[%ld];\n",array,len);
+
+        close(fd);
+    }
+
+    fclose(cfile);
+    fclose(hfile);
+
+    return 0;
+}
diff --git a/rbutil/mkimxboot/dualboot/dualboot.S b/rbutil/mkimxboot/dualboot/dualboot.S
new file mode 100644
index 0000000000..8302829a81
--- /dev/null
+++ b/rbutil/mkimxboot/dualboot/dualboot.S
@@ -0,0 +1,39 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2011 by Amaury Pouly
+ *
+ * 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; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+.text
+.global start
+@ int start(uint32_t arg, uint32_t *result_id)
+start:
+#if defined(SANSA_FUZEPLUS)
+    /* If volume down key is hold, return so that the OF can boot */
+    ldr     r2, =0x80018610 @ HW_PINCTRL_DIN1
+    ldr     r2, [r2]
+    tst     r2, #0x40000000 @ bit 30, active low
+    moveq   r0, #0 @ return 0, continue boot
+    bxeq    lr
+    /* otherwise jump to section given as argument */
+    str     r0, [r1]
+    mov     r0, #1
+    bx      lr
+#else
+#error No target defined !
+#endif
diff --git a/rbutil/mkimxboot/dualboot/dualboot.lds b/rbutil/mkimxboot/dualboot/dualboot.lds
new file mode 100644
index 0000000000..caaff1a41d
--- /dev/null
+++ b/rbutil/mkimxboot/dualboot/dualboot.lds
@@ -0,0 +1,16 @@
+ENTRY(start)
+OUTPUT_FORMAT(elf32-littlearm)
+OUTPUT_ARCH(arm)
+
+MEMORY
+{
+    OCRAM : ORIGIN = 0, LENGTH = 0x8000
+}
+
+SECTIONS
+{
+    .text 0 :
+    {
+        *(.text*)
+    } > OCRAM
+}