e200v1 seems to be ok using USB-enabled bootloader. Also, include the bootloader USB .lds into the boot.lds instead of pasting into every one to keep things sane for now-- commented upon inside.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29062 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis
parent
5bf25bbd4f
commit
76083359e0
5 changed files with 150 additions and 136 deletions
|
|
@ -190,6 +190,9 @@
|
|||
#define USB_VENDOR_ID 0x0781
|
||||
#define USB_PRODUCT_ID 0x7421
|
||||
#define HAVE_USB_HID_MOUSE
|
||||
#ifdef BOOTLOADER
|
||||
#define HAVE_BOOTLOADER_USB_MODE
|
||||
#endif
|
||||
|
||||
/* Define this if you have adjustable CPU frequency */
|
||||
#define HAVE_ADJUSTABLE_CPU_FREQ
|
||||
|
|
|
|||
136
firmware/target/arm/boot-pp502x-bl-usb.lds
Normal file
136
firmware/target/arm/boot-pp502x-bl-usb.lds
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
/* Will have been included from boot.lds */
|
||||
ENTRY(start)
|
||||
OUTPUT_FORMAT(elf32-littlearm)
|
||||
OUTPUT_ARCH(arm)
|
||||
STARTUP(target/arm/crt0-pp502x-bl-usb.o)
|
||||
|
||||
#define DRAMORIG 0x01000000 /* Load at 16 MB */
|
||||
#define DRAMSIZE 0x00100000 /* 1MB for bootloader */
|
||||
#define MEMEND (MEMORYSIZE*0x100000) /* From virtual mapping at 0 */
|
||||
#define NOCACHE_BASE 0x10000000
|
||||
#ifndef IRAMORIG
|
||||
#define IRAMORIG 0x40000000
|
||||
#endif
|
||||
#define IRAMSIZE 0x20000
|
||||
#define FLASHORIG 0x001f0000
|
||||
#define FLASHSIZE 2M
|
||||
|
||||
#define CACHEALIGN_SIZE 16
|
||||
|
||||
MEMORY
|
||||
{
|
||||
DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
|
||||
IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
|
||||
}
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
. = DRAMORIG;
|
||||
_loadaddress = . + NOCACHE_BASE;
|
||||
|
||||
.text :
|
||||
{
|
||||
*(.init.text)
|
||||
*(.text*)
|
||||
*(.glue_7)
|
||||
*(.glue_7t)
|
||||
. = ALIGN(0x4);
|
||||
} > DRAM
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(.rodata) /* problems without this, dunno why */
|
||||
*(.rodata*)
|
||||
*(.rodata.str1.1)
|
||||
*(.rodata.str1.4)
|
||||
. = ALIGN(0x4);
|
||||
} > DRAM
|
||||
|
||||
.data :
|
||||
{
|
||||
*(.data*)
|
||||
. = ALIGN(0x4);
|
||||
} > DRAM
|
||||
|
||||
/* .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
|
||||
|
||||
/DISCARD/ . - NOCACHE_BASE :
|
||||
{
|
||||
*(.eh_frame)
|
||||
} > DRAM
|
||||
|
||||
_noloaddram = .;
|
||||
|
||||
.ibss IRAMORIG (NOLOAD) :
|
||||
{
|
||||
_iedata = .;
|
||||
*(.qharray)
|
||||
*(.ibss)
|
||||
. = ALIGN(0x4);
|
||||
_iend = .;
|
||||
} > IRAM
|
||||
|
||||
.iram _iend :
|
||||
{
|
||||
_iramstart = .;
|
||||
*(.icode)
|
||||
*(.irodata)
|
||||
*(.idata)
|
||||
_iramend = .;
|
||||
} > IRAM AT> DRAM
|
||||
|
||||
_iramcopy = LOADADDR(.iram);
|
||||
|
||||
.loadaddressend :
|
||||
{
|
||||
_loadaddressend = . + NOCACHE_BASE;
|
||||
} AT> DRAM
|
||||
|
||||
.stack (NOLOAD) :
|
||||
{
|
||||
. = ALIGN(8);
|
||||
*(.stack)
|
||||
stackbegin = .;
|
||||
. += 0x2000;
|
||||
stackend = .;
|
||||
} > IRAM
|
||||
|
||||
/* .bss and .ncbss are treated as a single section to use one init loop
|
||||
* to zero them - note "_edata" and "_end" */
|
||||
.bss _noloaddram (NOLOAD) :
|
||||
{
|
||||
_edata = .;
|
||||
*(.bss*)
|
||||
*(COMMON)
|
||||
} > DRAM
|
||||
|
||||
.ncbss . + NOCACHE_BASE (NOLOAD) :
|
||||
{
|
||||
. = ALIGN(CACHEALIGN_SIZE);
|
||||
*(.ncbss*)
|
||||
. = ALIGN(CACHEALIGN_SIZE);
|
||||
} AT> DRAM
|
||||
|
||||
/* This will be aligned by preceding alignments */
|
||||
.endaddr . - NOCACHE_BASE (NOLOAD) :
|
||||
{
|
||||
_end = .;
|
||||
} > DRAM
|
||||
|
||||
/* Reference to all DRAM after loaded bootloader image */
|
||||
.freebuffer _end (NOLOAD) :
|
||||
{
|
||||
. = ALIGN(4);
|
||||
freebuffer = .;
|
||||
. = MEMEND-1;
|
||||
freebufferend = .;
|
||||
}
|
||||
}
|
||||
|
|
@ -2,142 +2,7 @@
|
|||
|
||||
/* Can't link all Philips ARM devices the same way at this time */
|
||||
#ifdef HAVE_BOOTLOADER_USB_MODE
|
||||
ENTRY(start)
|
||||
OUTPUT_FORMAT(elf32-littlearm)
|
||||
OUTPUT_ARCH(arm)
|
||||
STARTUP(target/arm/crt0-pp502x-bl-usb.o)
|
||||
|
||||
#define DRAMORIG 0x01000000 /* Load at 16 MB */
|
||||
#define DRAMSIZE 0x00100000 /* 1MB for bootloader */
|
||||
#define MEMEND (MEMORYSIZE*0x100000) /* From virtual mapping at 0 */
|
||||
#define NOCACHE_BASE 0x10000000
|
||||
#ifndef IRAMORIG
|
||||
#define IRAMORIG 0x40000000
|
||||
#endif
|
||||
#define IRAMSIZE 0x20000
|
||||
#define FLASHORIG 0x001f0000
|
||||
#define FLASHSIZE 2M
|
||||
|
||||
#define CACHEALIGN_SIZE 16
|
||||
|
||||
MEMORY
|
||||
{
|
||||
DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
|
||||
IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
|
||||
}
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
. = DRAMORIG;
|
||||
_loadaddress = . + NOCACHE_BASE;
|
||||
|
||||
.text :
|
||||
{
|
||||
*(.init.text)
|
||||
*(.text*)
|
||||
*(.glue_7)
|
||||
*(.glue_7t)
|
||||
. = ALIGN(0x4);
|
||||
} > DRAM
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(.rodata) /* problems without this, dunno why */
|
||||
*(.rodata*)
|
||||
*(.rodata.str1.1)
|
||||
*(.rodata.str1.4)
|
||||
. = ALIGN(0x4);
|
||||
} > DRAM
|
||||
|
||||
.data :
|
||||
{
|
||||
*(.data*)
|
||||
. = ALIGN(0x4);
|
||||
} > DRAM
|
||||
|
||||
/* .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
|
||||
|
||||
/DISCARD/ . - NOCACHE_BASE :
|
||||
{
|
||||
*(.eh_frame)
|
||||
} > DRAM
|
||||
|
||||
_noloaddram = .;
|
||||
|
||||
.ibss IRAMORIG (NOLOAD) :
|
||||
{
|
||||
_iedata = .;
|
||||
*(.qharray)
|
||||
*(.ibss)
|
||||
. = ALIGN(0x4);
|
||||
_iend = .;
|
||||
} > IRAM
|
||||
|
||||
.iram _iend :
|
||||
{
|
||||
_iramstart = .;
|
||||
*(.icode)
|
||||
*(.irodata)
|
||||
*(.idata)
|
||||
_iramend = .;
|
||||
} > IRAM AT> DRAM
|
||||
|
||||
_iramcopy = LOADADDR(.iram);
|
||||
|
||||
.loadaddressend :
|
||||
{
|
||||
_loadaddressend = . + NOCACHE_BASE;
|
||||
} AT> DRAM
|
||||
|
||||
.stack (NOLOAD) :
|
||||
{
|
||||
. = ALIGN(8);
|
||||
*(.stack)
|
||||
stackbegin = .;
|
||||
. += 0x2000;
|
||||
stackend = .;
|
||||
} > IRAM
|
||||
|
||||
/* .bss and .ncbss are treated as a single section to use one init loop
|
||||
* to zero them - note "_edata" and "_end" */
|
||||
.bss _noloaddram (NOLOAD) :
|
||||
{
|
||||
_edata = .;
|
||||
*(.bss*)
|
||||
*(COMMON)
|
||||
} > DRAM
|
||||
|
||||
.ncbss . + NOCACHE_BASE (NOLOAD) :
|
||||
{
|
||||
. = ALIGN(CACHEALIGN_SIZE);
|
||||
*(.ncbss*)
|
||||
. = ALIGN(CACHEALIGN_SIZE);
|
||||
} AT> DRAM
|
||||
|
||||
/* This will be aligned by preceding alignments */
|
||||
.endaddr . - NOCACHE_BASE (NOLOAD) :
|
||||
{
|
||||
_end = .;
|
||||
} > DRAM
|
||||
|
||||
/* Reference to all DRAM after loaded bootloader image */
|
||||
.freebuffer _end (NOLOAD) :
|
||||
{
|
||||
. = ALIGN(4);
|
||||
freebuffer = .;
|
||||
. = MEMEND-1;
|
||||
freebufferend = .;
|
||||
}
|
||||
}
|
||||
|
||||
#include "../boot-pp502x-bl-usb.lds"
|
||||
#else /* !HAVE_BOOTLOADER_USB_MODE */
|
||||
ENTRY(start)
|
||||
OUTPUT_FORMAT(elf32-littlearm)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
#include "config.h"
|
||||
|
||||
/* Can't link all Sansa PP devices the same way at this time */
|
||||
#ifdef HAVE_BOOTLOADER_USB_MODE
|
||||
#include "../boot-pp502x-bl-usb.lds"
|
||||
#else /* !HAVE_BOOTLOADER_USB_MODE */
|
||||
|
||||
ENTRY(start)
|
||||
OUTPUT_FORMAT(elf32-littlearm)
|
||||
OUTPUT_ARCH(arm)
|
||||
|
|
@ -73,3 +78,4 @@ SECTIONS
|
|||
_end = .;
|
||||
} > DRAM
|
||||
}
|
||||
#endif /* HAVE_BOOTLOADER_USB_MODE */
|
||||
|
|
|
|||
|
|
@ -272,6 +272,10 @@ void clickwheel_int(void)
|
|||
delta = 0x7ful << 24;
|
||||
}
|
||||
}
|
||||
#else
|
||||
void clickwheel_int(void)
|
||||
{
|
||||
}
|
||||
#endif /* BOOTLOADER */
|
||||
|
||||
/* device buttons */
|
||||
|
|
|
|||
Loading…
Reference in a new issue