forked from len0rd/rockbox
Kill some D2 yellows with a simplistic Rolo implementation and NAND driver cleanup. Correct some comments in crt0.s and remove two erroneous null words from rockbox.bin
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17127 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
b36d3c0be2
commit
d88c5667d9
3 changed files with 19 additions and 10 deletions
|
|
@ -39,9 +39,6 @@ long last_disk_activity = -1;
|
|||
/** static, private data **/
|
||||
static bool initialized = false;
|
||||
|
||||
static long next_yield = 0;
|
||||
#define MIN_YIELD_PERIOD 2000
|
||||
|
||||
static struct mutex ata_mtx SHAREDBSS_ATTR;
|
||||
|
||||
#define SECTOR_SIZE 512
|
||||
|
|
@ -740,7 +737,11 @@ int ata_read_sectors(IF_MV2(int drive,) unsigned long start, int incount,
|
|||
int ata_write_sectors(IF_MV2(int drive,) unsigned long start, int count,
|
||||
const void* outbuf)
|
||||
{
|
||||
#warning function not implemented
|
||||
#ifdef HAVE_MULTIVOLUME
|
||||
(void)drive; /* unused for now */
|
||||
#endif
|
||||
|
||||
/* TODO: Learn more about TNFTL and implement this one day... */
|
||||
(void)start;
|
||||
(void)count;
|
||||
(void)outbuf;
|
||||
|
|
|
|||
|
|
@ -35,18 +35,16 @@
|
|||
|
||||
start:
|
||||
#ifdef TCCBOOT
|
||||
#ifdef BOOTLOADER
|
||||
/* Add -DTCCBOOT to EXTRA_DEFINES in the bootloader Makefile to
|
||||
enable building the bootloader to be appended to the end of the
|
||||
original firmware, dual-booting based on a key-press.
|
||||
|
||||
NB: On the D2 TCCBOOT currently only works in USB boot mode (via tcctool)
|
||||
When flashed to the device, the OF will boot as normal - but holding a
|
||||
key to boot Rockbox results in a blank screen and crashed player.
|
||||
|
||||
The following two values are filled in by mktccboot.
|
||||
*/
|
||||
.word 0 /* Saved entrypoint of original firmware*/
|
||||
.word 0 /* Location in RAM of the start of our bootloader */
|
||||
#endif
|
||||
#else
|
||||
ldr pc, =start_loc /* jump to the main entry point */
|
||||
|
||||
|
|
@ -79,7 +77,7 @@ start_loc:
|
|||
#error No bootup key detection implemented for this target
|
||||
#endif
|
||||
|
||||
/* Copy bootloader to safe area - 0x21000000 (DRAM) */
|
||||
/* Copy bootloader to safe area - 0x21F00000 (end of DRAM) */
|
||||
/* TODO: Adjust this for other targets - DRAM + DRAMSIZE - 0x100000 */
|
||||
ldr r0, [pc, #-28]
|
||||
mov r1, #0x22000000
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue