fixed recursive call to disk_initialize()

This commit is contained in:
Markus Fröschle
2012-12-06 08:55:50 +00:00
parent ed1941cf15
commit cb9c113827
3 changed files with 8 additions and 10 deletions

View File

@@ -12,6 +12,10 @@ SECTIONS
objs/startcf.o(.text) /* this one is the entry point so it must be the first */
objs/sysinit.o(.text)
objs/init_fpga.o(.text)
objs/sd_card.o(.text)
objs/ff.o(.text)
objs/mmcbb.o(.text)
#if (FORMAT == elf32-m68k)
*(.rodata)
*(.rodata.*)
@@ -32,7 +36,6 @@ SECTIONS
objs/bas_printf.o(.text)
objs/printf_helper.o(.text)
objs/cache.o(.text)
objs/sd_card.o(.text)
objs/mmu.o(.text)
objs/exceptions.o(.text)
objs/supervisor.o(.text)

View File

@@ -30,6 +30,7 @@
#include "bas_printf.h"
#include "bas_types.h"
#include "sd_card.h"
#include "diskio.h"
#include "ff.h"
/* imported routines */
@@ -152,19 +153,12 @@ void nvram_init(void)
/********************************************************************/
void BaS(void)
{
int az_sectors;
uint8_t *src;
uint8_t *dst = (uint8_t *)TOS;
uint32_t *adr;
az_sectors = spi_init();
if (az_sectors > 0)
{
sd_card_idle();
}
disk_initialize(0);
pic_init();
nvram_init();

View File

@@ -28,6 +28,8 @@
#include "sd_card.h"
#include "diskio.h"
#define xprintf xprintf_before_copy
/*
* "standard value" for DSPI module configuration register MCF_DSPC_DMCR
*/
@@ -174,7 +176,6 @@ int spi_init(void)
wait(10000);
//sd_card_idle();
disk_initialize(0);
xprintf("finished\r\n");
return 0;