From d2249dce6f4dda8cb71e048ced6562f26515d27f Mon Sep 17 00:00:00 2001
From: Michael Sevakis <jethead71@rockbox.org>
Date: Fri, 19 Jul 2013 08:18:16 -0400
Subject: Combine PortalPlayer .lds files into one for app and boot.

These nearly identical files are multiplying like rabbits as PP targets
are added and make SoC-related changes a PITA. Just include the master
.lds file from the target one as was done for bootloader USB.

Change-Id: I65e9e653030f0688b1728e32ada16abf2932e029
---
 firmware/target/arm/sandisk/boot.lds | 77 +-----------------------------------
 1 file changed, 2 insertions(+), 75 deletions(-)

(limited to 'firmware/target/arm/sandisk/boot.lds')

diff --git a/firmware/target/arm/sandisk/boot.lds b/firmware/target/arm/sandisk/boot.lds
index a4ea28ab8c..4586c09e20 100644
--- a/firmware/target/arm/sandisk/boot.lds
+++ b/firmware/target/arm/sandisk/boot.lds
@@ -3,79 +3,6 @@
 /* Can't link all Sansa PP devices the same way at this time */
 #ifdef HAVE_BOOTLOADER_USB_MODE
 #include "../pp/boot-pp502x-bl-usb.lds"
-#else /* !HAVE_BOOTLOADER_USB_MODE */
-
-ENTRY(start)
-OUTPUT_FORMAT(elf32-littlearm)
-OUTPUT_ARCH(arm)
-STARTUP(target/arm/pp/crt0-pp-bl.o)
-
-#define DRAMSIZE (MEMORYSIZE * 0x100000)
-
-#ifdef SANSA_VIEW
-#define DRAMORIG 0x10f00000
-#else
-#define DRAMORIG 0x10000000
-#endif
-
-#ifndef IRAMORIG
-#define IRAMORIG 0x40000000
-#endif
-#define IRAMSIZE 0x20000
-#define FLASHORIG 0x001f0000
-#define FLASHSIZE 2M
-
-MEMORY
-{
-    DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
-    IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
-}
-
-SECTIONS
-{
-#ifdef SANSA_PP_ERASE
-  . = IRAMORIG+0x4000;
 #else
-  . = IRAMORIG;
-#endif
-
-  .text : {
-    *(.init.text)
-    *(.text*)
-    *(.glue_7)
-    *(.glue_7t)
-  } > IRAM
-
-  .data : {
-    *(.icode)
-    *(.irodata)
-    *(.idata)
-    *(.data*)
-    *(.ncdata*)
-    *(.rodata*)
-    _dataend = . ;
-  } > IRAM
-
-  .stack (NOLOAD) : {
-     *(.stack)
-     _stackbegin = .;
-     stackbegin = .;
-     . += 0x2000;
-     _stackend = .;
-     stackend = .;
-  } > IRAM
-
-  /* The bss section is too large for IRAM - we just move it 16MB into the
-     DRAM */
-
-  . = DRAMORIG;
-  .bss . + (16*1024*1024) (NOLOAD) : {
-     _edata = .;
-     *(.bss*);
-     *(.ibss);
-     *(COMMON)
-     *(.ncbss*);
-     _end = .;
-  } > DRAM
-}
-#endif /* HAVE_BOOTLOADER_USB_MODE */
+#include "../pp/boot-pp.lds"
+#endif
\ No newline at end of file
-- 
cgit v1.2.3