diff --git a/firmware/target/arm/s5l8702/boot.lds b/firmware/target/arm/s5l8702/boot.lds
index 61f23b9c22..54a4d4d1ae 100644
--- a/firmware/target/arm/s5l8702/boot.lds
+++ b/firmware/target/arm/s5l8702/boot.lds
@@ -1,6 +1,7 @@
 #define ASM
 #include "config.h"
 #include "cpu.h"
+#include "crypto-s5l8702.h"     /* IM3HDR_SZ */
 
 ENTRY(start)
 #ifdef ROCKBOX_LITTLE_ENDIAN
@@ -13,42 +14,25 @@ STARTUP(target/arm/s5l8702/crt0.o)
 
 #define MAX_LOADSIZE 8M  /* reserved for loading Rockbox binary */
 
-#ifdef IPOD_NANO2G
-#define DRAMORIG 0x08000000 + ((MEMORYSIZE - 1) * 0x100000)
-#define DRAMSIZE 0x00100000
-
-#define IRAMORIG 0x22000000
-#define IRAMSIZE 256K
-
-MEMORY
-{
-    DRAM  : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
-    IRAM  : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
-}
-#define LOAD_AREA IRAM
-#define VECT_AREA IRAM
-#define BSS_AREA  DRAM
-
-#elif defined(IPOD_6G)
+#if defined(IPOD_6G) || defined(IPOD_NANO3G) || defined(IPOD_NANO4G)
 MEMORY
 {
     DRAM  : ORIGIN = DRAM_ORIG, LENGTH = DRAM_SIZE
     IRAM  : ORIGIN = IRAM_ORIG, LENGTH = IRAM_SIZE
 
-    /* s5l8702 maps address 0 to ROM, IRAM or DRAM */
+    /* s5l8702/s5l8720 maps address 0 to ROM, IRAM or DRAM */
     VECT_AREA : ORIGIN = 0, LENGTH = 1K
 
     /* IRAM region where loaded IM3 body will be moved and executed,
-       preserving the loaded IM3 header (0x800 bytes) at IRAM1_ORIG */
-    MOVE_AREA : ORIGIN = IRAM1_ORIG + 0x800,
-                LENGTH = IRAM1_SIZE - 0x800
+       preserving the loaded IM3 header (0x600 or 0x800 bytes) at IRAM1_ORIG */
+    MOVE_AREA : ORIGIN = IRAM1_ORIG + IM3HDR_SZ,
+                LENGTH = IRAM1_SIZE - IM3HDR_SZ
 
     /* DRAM region for BSS */
     BSS_AREA  : ORIGIN = DRAM_ORIG + MAX_LOADSIZE,
                 LENGTH = DRAM_SIZE - MAX_LOADSIZE - TTB_SIZE
 }
 #define LOAD_AREA   MOVE_AREA
-
 #else
 #error No target defined!
 #endif
@@ -56,7 +40,6 @@ MEMORY
 
 SECTIONS
 {
-  _dfuloadaddr = IRAM0_ORIG ;
   _movestart = LOADADDR(.text) ;
   _moveend = LOADADDR(.data) + SIZEOF(.data) ;