8 files changed, 64 insertions, 39 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index e827f964f5..4e6fcbf70c 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -94,14 +94,12 @@ target/hosted/filesystem-unix.c
 target/hosted/filesystem-app.c
 #endif /* APPLICATION */
 
-#if defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1)
+#if (defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1)) && !defined(SIMULATOR)
 target/hosted/kernel-unix.c
 target/hosted/filesystem-unix.c
-#ifndef SIMULATOR
 target/hosted/lc-unix.c
 drivers/lcd-memframe.c
 target/hosted/samsungypr/lcd-ypr.c
-#endif
 target/hosted/samsungypr/gpio-ypr.c
 #if CONFIG_TUNER
 target/hosted/samsungypr/radio-ypr.c
@@ -1568,6 +1566,9 @@ target/arm/s5l8702/clocking-s5l8702.c
 target/arm/s5l8702/ipod6g/lcd-6g.c
 target/arm/s5l8702/ipod6g/lcd-asm-6g.S
 target/arm/s5l8702/ipod6g/piezo-6g.c
+target/arm/s5l8702/spi-s5l8702.c
+target/arm/s5l8702/crypto-s5l8702.c
+target/arm/s5l8702/nor-s5l8702.c
 #if 0 //TODO
 target/arm/s5l8702/postmortemstub.S
 #endif
@@ -1587,10 +1588,6 @@ target/arm/s5l8702/debug-s5l8702.c
 target/arm/s5l8702/pcm-s5l8702.c
 target/arm/s5l8702/ipod6g/audio-6g.c
 target/arm/s5l8702/ipod6g/cscodec-6g.c
-#else
-target/arm/s5l8702/spi-s5l8702.c
-target/arm/s5l8702/crypto-s5l8702.c
-target/arm/s5l8702/nor-s5l8702.c
 #endif /* BOOTLOADER */
 #endif /* IPOD_6G */
 
@@ -1649,9 +1646,9 @@ target/mips/ingenic_jz47xx/kernel-jz4760.c
 target/mips/ingenic_jz47xx/i2c-jz4760.c
 target/mips/ingenic_jz47xx/lcd-jz4760.c
 target/mips/ingenic_jz47xx/system-jz4760.c
-target/mips/ingenic_jz47xx/usb-jz4760.c
 target/mips/ingenic_jz47xx/timer-jz4760.c
 #ifndef BOOTLOADER
+target/mips/ingenic_jz47xx/usb-jz4760.c
 target/mips/ingenic_jz47xx/codec-jz4760.c
 target/mips/ingenic_jz47xx/pcm-jz4760.c
 #endif /* BOOTLOADER */
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index b245cbc09e..d82fb173cc 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -962,8 +962,8 @@ static int perform_soft_reset(void)
     if (identify())
         return -5;
 
-    if (set_features())
-        return -2;
+    if ((ret = set_features()))
+        return -60 + ret;
 
     if (set_multiple_mode(multisectors))
         return -3;
@@ -1013,7 +1013,7 @@ static int ata_power_on(void)
 
     rc = set_features();
     if (rc)
-        return rc * 10 - 2;
+        return -60 + rc;
 
     if (set_multiple_mode(multisectors))
         return -3;
@@ -1284,7 +1284,7 @@ int STORAGE_INIT_ATTR ata_init(void)
             goto error;
         }
 
-        rc = set_features();
+        rc = set_features(); // rror codes are between -1 and -49
         if (rc) {
             rc = -60 + rc;
             goto error;
@@ -1321,7 +1321,7 @@ int STORAGE_INIT_ATTR ata_init(void)
     }
     rc = set_multiple_mode(multisectors);
     if (rc)
-        rc = -70 + rc;
+        rc = -100 + rc;
 
 error:
     mutex_unlock(&ata_mtx);
diff --git a/firmware/export/config/xduoox3.h b/firmware/export/config/xduoox3.h
index 46e1a61712..0d413ad372 100644
--- a/firmware/export/config/xduoox3.h
+++ b/firmware/export/config/xduoox3.h
@@ -174,6 +174,7 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_XDUOOX3
 
+#ifndef BOOTLOADER
 /* USB On-the-go */
 #define CONFIG_USBOTG     USBOTG_JZ4760
 
@@ -189,6 +190,7 @@
 
 #define USB_NUM_ENDPOINTS  3
 #define USB_DEVBSS_ATTR    IBSS_ATTR
+#endif /* !BOOTLOADER */
 
 #define BOOTFILE_EXT "x3"
 #define BOOTFILE     "rockbox." BOOTFILE_EXT
@@ -198,7 +200,7 @@
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
-#endif /* SIMULATOR */
+#endif /* !SIMULATOR */
 
 /** Port-specific settings **/
 
diff --git a/firmware/target/arm/s5l8702/nor-target.h b/firmware/target/arm/s5l8702/nor-target.h
index 4ebe1d58d4..3d2790d123 100644
--- a/firmware/target/arm/s5l8702/nor-target.h
+++ b/firmware/target/arm/s5l8702/nor-target.h
@@ -87,6 +87,34 @@ int bootflash_compare(int port, int offset, void* addr, int size);
 void bootflash_erase_blocks(int port, int first, int n);
 void bootflash_close(int port);
 
+/*
+ * SysCfg
+ */
+struct SysCfgHeader {
+    uint32_t magic; // always 'SCfg'
+    uint32_t size;
+    uint32_t unknown1; // 0x00000200 on iPod classic
+    uint32_t version; // maybe? 0x00010001 on iPod classic
+    uint32_t unknown2; // 0x00000000 on iPod classic
+    uint32_t num_entries;
+}; // 0x18
+
+struct SysCfgEntry {
+    uint32_t tag;
+    uint8_t data[0x10];
+};
+
+#define SYSCFG_MAGIC 0x53436667 // SCfg
+
+#define SYSCFG_TAG_SRNM 0x53724e6d // SrNm
+#define SYSCFG_TAG_FWID 0x46774964 // FwId
+#define SYSCFG_TAG_HWID 0x48774964 // HwId
+#define SYSCFG_TAG_HWVR 0x48775672 // HwVr
+#define SYSCFG_TAG_CODC 0x436f6463 // Codc
+#define SYSCFG_TAG_SWVR 0x53775672 // SwVr
+#define SYSCFG_TAG_MLBN 0x4d4c424e // MLBN
+#define SYSCFG_TAG_MODN 0x4d6f6423 // Mod#
+#define SYSCFG_TAG_REGN 0x5265676e // Regn
 
 /*
  * IM3
diff --git a/firmware/target/hosted/lcd-linuxfb.c b/firmware/target/hosted/lcd-linuxfb.c
index 14c8c30f89..5dda5cf1cc 100644
--- a/firmware/target/hosted/lcd-linuxfb.c
+++ b/firmware/target/hosted/lcd-linuxfb.c
@@ -59,14 +59,21 @@ void lcd_init_device(void)
         panicf("Cannot read framebuffer fixed information");
     }
 
-#if 0
-    /* check resolution and framebuffer size */
-    if(vinfo.xres != LCD_WIDTH || vinfo.yres != LCD_HEIGHT || vinfo.bits_per_pixel != LCD_DEPTH)
+    if(ioctl(fd, FBIOGET_VSCREENINFO, &vinfo) < 0)
     {
-        panicf("Unexpected framebuffer resolution: %dx%dx%d\n", vinfo.xres,
-            vinfo.yres, vinfo.bits_per_pixel);
+        panicf("Cannot read framebuffer variable information");
+    }
+
+    /* Make sure we match our desired bitdepth */
+    if (vinfo.bits_per_pixel != LCD_DEPTH || vinfo.xres != LCD_WIDTH || vinfo.yres != LCD_HEIGHT) {
+        vinfo.bits_per_pixel = LCD_DEPTH;
+        vinfo.xres = LCD_WIDTH;
+        vinfo.yres = LCD_HEIGHT;
+        if (ioctl(fd, FBIOPUT_VSCREENINFO, &vinfo)) {
+            panicf("Cannot set framebuffer to %dx%dx%d",
+               vinfo.xres, vinfo.yres, vinfo.bits_per_pixel);
+        }
     }
-#endif
     /* Note: we use a framebuffer size of width*height*bbp. We cannot trust the
      * values returned by the driver for line_length */
 
@@ -77,11 +84,6 @@ void lcd_init_device(void)
         panicf("Cannot map framebuffer");
     }
 
-    if(ioctl(fd, FBIOGET_VSCREENINFO, &vinfo) < 0)
-    {
-        panicf("Cannot read framebuffer variable information");
-    }
-
     memset(framebuffer, 0, finfo.smem_len);
 
 #ifdef HAVE_LCD_ENABLE
diff --git a/firmware/target/hosted/samsungypr/lcd-ypr.c b/firmware/target/hosted/samsungypr/lcd-ypr.c
index b8db2eedd1..035abaeba7 100644
--- a/firmware/target/hosted/samsungypr/lcd-ypr.c
+++ b/firmware/target/hosted/samsungypr/lcd-ypr.c
@@ -66,17 +66,17 @@ void lcd_init_device(void)
         exit(2);
     }
 
-    /* Now we get the settable settings, and we set 16 bit bpp */
+    /* Now we get the settable settings */
     if (ioctl(dev_fd, FBIOGET_VSCREENINFO, &vinfo) == -1) {
         perror("Error reading variable information");
         exit(3);
     }
 
-    vinfo.bits_per_pixel = LCD_DEPTH;
+    vinfo.bits_per_pixel = LCD_DEPTH; /* Explicitly set our desired depth */
 
     if (ioctl(dev_fd, FBIOPUT_VSCREENINFO, &vinfo)) {
-            perror("fbset(ioctl)");
-            exit(4);
+        perror("fbset(ioctl)");
+        exit(4);
     }
 
     printf("%dx%d, %dbpp\n", vinfo.xres, vinfo.yres, vinfo.bits_per_pixel);
@@ -84,17 +84,17 @@ void lcd_init_device(void)
     /* Figure out the size of the screen in bytes */
     screensize = vinfo.xres * vinfo.yres * vinfo.bits_per_pixel / 8;
     if (screensize != FRAMEBUFFER_SIZE) {
-        exit(4);
         perror("Display and framebuffer mismatch!\n");
+        exit(5);
     }
 
     /* Map the device to memory */
     dev_fb = mmap(0, screensize, PROT_READ | PROT_WRITE, MAP_SHARED, dev_fd, 0);
     if ((int)dev_fb == -1) {
         perror("Error: failed to map framebuffer device to memory");
-        exit(4);
+        exit(6);
     }
-    printf("The framebuffer device was mapped to memory successfully.\n");
+    printf("Framebuffer device successfully mapped into memory.\n");
 
     /* Be sure to turn on display at startup */
     ioctl(dev_fd, FBIOBLANK, VESA_NO_BLANKING);
diff --git a/firmware/target/mips/ingenic_jz47xx/app.lds b/firmware/target/mips/ingenic_jz47xx/app.lds
index 1d300fed82..29a973a0ca 100644
--- a/firmware/target/mips/ingenic_jz47xx/app.lds
+++ b/firmware/target/mips/ingenic_jz47xx/app.lds
@@ -37,15 +37,11 @@ SECTIONS
 {
     . = DRAMORIG;
 
-    .startup :
+    .text :
     {
         loadaddress = .;
         _loadaddress = .;
-        *(.startup.text);
-    } > DRAM
-
-    .text :
-    {
+        *(.init.text);
         *(.text*);
 #ifndef HAVE_INIT_ATTR
         *(.init*);
diff --git a/firmware/target/mips/ingenic_jz47xx/crt0.S b/firmware/target/mips/ingenic_jz47xx/crt0.S
index b73a43d8f2..ee203b3b4d 100644
--- a/firmware/target/mips/ingenic_jz47xx/crt0.S
+++ b/firmware/target/mips/ingenic_jz47xx/crt0.S
@@ -44,7 +44,7 @@
     .extern main
     .global _start
 
-    .section .startup.text,"ax",%progbits
+    .section .init.text
     .set    push
     .set    mips32
     .set    noreorder