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

2 files changed, 3 insertions, 267 deletions

diff --git a/firmware/target/arm/sandisk/app.lds b/firmware/target/arm/sandisk/app.lds
index a4b68ba994..856cc52bb0 100644
--- a/firmware/target/arm/sandisk/app.lds
+++ b/firmware/target/arm/sandisk/app.lds
@@ -1,193 +1,2 @@
 #include "config.h"
-
-ENTRY(start)
-
-OUTPUT_FORMAT(elf32-littlearm)
-OUTPUT_ARCH(arm)
-STARTUP(target/arm/pp/crt0-pp.o)
-
-#define PLUGINSIZE PLUGIN_BUFFER_SIZE
-#define CODECSIZE CODEC_SIZE
-
-#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - CODECSIZE
-
-#define DRAMORIG 0x00000000
-#define IRAMORIG 0x40000000
-#define IRAMSIZE 0xc000
-
-#ifdef CPU_PP502x
-#define NOCACHE_BASE 	0x10000000
-#else
-#define NOCACHE_BASE 	0x28000000
-#endif
-
-#define CACHEALIGN_SIZE 16
-
-/* End of the audio buffer, where the codec buffer starts */
-#define ENDAUDIOADDR  (DRAMORIG + DRAMSIZE)
-
-/* Where the codec buffer ends, and the plugin buffer starts */
-#define ENDADDR (ENDAUDIOADDR + CODECSIZE)
-
-MEMORY
-{
-    DRAM : ORIGIN = DRAMORIG,     LENGTH = DRAMSIZE
-    IRAM : ORIGIN = IRAMORIG,     LENGTH = IRAMSIZE
-}
-
-SECTIONS
-{
-    .text :
-    {
-        loadaddress = .;
-        _loadaddress = .;
-        . = ALIGN(0x200);
-        *(.init.text)
-        *(.text*)
-        *(.glue_7)
-        *(.glue_7t)
-        . = ALIGN(0x4);
-    } > DRAM
-
-    .rodata :
-    {
-        *(.rodata*)
-        . = ALIGN(0x4);
-    } > DRAM
-
-    .data :
-    {
-        *(.data*)
-        . = ALIGN(0x4);
-    } > DRAM
-
-#if NOCACHE_BASE != 0
-    /* .ncdata section is placed at uncached physical alias address and is
-     * loaded at the proper cached virtual address - no copying is
-     * performed in the init code */
-    .ncdata . + NOCACHE_BASE :
-    {
-        . = ALIGN(CACHEALIGN_SIZE);
-        *(.ncdata*)
-        . = ALIGN(CACHEALIGN_SIZE);
-    } AT> DRAM
-#endif
-    
-    /DISCARD/ :
-    {
-        *(.eh_frame)
-    }
-
-    .vectors 0x0 :
-    {
-        _vectorsstart = .;
-        KEEP(*(.vectors));
-        _vectorsend = .;
-    } AT> DRAM
-
-    _vectorscopy = LOADADDR(.vectors);
-    _noloaddram  = LOADADDR(.vectors);
-
-    .ibss IRAMORIG (NOLOAD) :
-    {
-        _iedata = .;
-        *(.qharray)
-        *(.ibss*)
-        . = ALIGN(0x4);
-        _iend = .;
-    } > IRAM
-
-    .iram _iend :
-    {
-        _iramstart = .;
-        *(.icode*)
-        *(.irodata*)
-        *(.idata*)
-        . = ALIGN(0x4);
-        _iramend = .;
-    } > IRAM AT> DRAM
-
-    _iramcopy = LOADADDR(.iram);
-
-
-    .init ENDAUDIOADDR : 
-    {
-        . = ALIGN(4);
-        _initstart = .;
-        *(.init*)
-        _initend = .;
-    } AT> DRAM
-
-    _initcopy = LOADADDR(.init);
-
-    .idle_stacks (NOLOAD) :
-    {
-       *(.idle_stacks)
-#if NUM_CORES > 1
-       cpu_idlestackbegin = .;
-       . += IDLE_STACK_SIZE;
-       cpu_idlestackend = .;
-#endif
-       cop_idlestackbegin = .;
-       . += IDLE_STACK_SIZE;
-       cop_idlestackend = .;
-    } > IRAM
-
-    .stack (NOLOAD) :
-    {
-       *(.stack)
-       stackbegin = .;
-       . += 0x2000;
-       stackend = .;
-    } > IRAM
-    
-    /* .bss and .ncbss are treated as a single section to use one init loop to
-     * zero it - note "_edata" and "_end" */
-    .bss _noloaddram (NOLOAD) :
-    {
-       _edata = .;
-        *(.bss*)
-        *(COMMON)
-        . = ALIGN(0x4);
-    } > DRAM
-
-#if NOCACHE_BASE != 0
-    .ncbss . + NOCACHE_BASE (NOLOAD):
-    {
-    	. = ALIGN(CACHEALIGN_SIZE);
-        *(.ncbss*)
-    	. = ALIGN(CACHEALIGN_SIZE);
-    } AT> DRAM
-#endif
-
-    /* This will be aligned by preceding alignments */
-    .endaddr . - NOCACHE_BASE (NOLOAD) :
-    {
-        _end = .;
-    } > DRAM
-
-    .audiobuf (NOLOAD) :
-    {
-        _audiobuffer = .;
-        . = ALIGN(0x4);
-        audiobuffer = .;
-    } > DRAM
-    
-    .audiobufend ENDAUDIOADDR (NOLOAD) :
-    {
-        audiobufend = .;
-        _audiobufend = .;
-    } > DRAM
-
-    .codec ENDAUDIOADDR (NOLOAD) :
-    {
-        codecbuf = .;
-        _codecbuf = .;
-    }
-
-    .plugin ENDADDR (NOLOAD) :
-    {
-        _pluginbuf = .;
-        pluginbuf = .;
-    }
-}
+#include "../pp/app-pp.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