fixed recursive call to disk_initialize()
This commit is contained in:
@@ -12,6 +12,10 @@ SECTIONS
|
|||||||
objs/startcf.o(.text) /* this one is the entry point so it must be the first */
|
objs/startcf.o(.text) /* this one is the entry point so it must be the first */
|
||||||
objs/sysinit.o(.text)
|
objs/sysinit.o(.text)
|
||||||
objs/init_fpga.o(.text)
|
objs/init_fpga.o(.text)
|
||||||
|
objs/sd_card.o(.text)
|
||||||
|
objs/ff.o(.text)
|
||||||
|
objs/mmcbb.o(.text)
|
||||||
|
|
||||||
#if (FORMAT == elf32-m68k)
|
#if (FORMAT == elf32-m68k)
|
||||||
*(.rodata)
|
*(.rodata)
|
||||||
*(.rodata.*)
|
*(.rodata.*)
|
||||||
@@ -32,7 +36,6 @@ SECTIONS
|
|||||||
objs/bas_printf.o(.text)
|
objs/bas_printf.o(.text)
|
||||||
objs/printf_helper.o(.text)
|
objs/printf_helper.o(.text)
|
||||||
objs/cache.o(.text)
|
objs/cache.o(.text)
|
||||||
objs/sd_card.o(.text)
|
|
||||||
objs/mmu.o(.text)
|
objs/mmu.o(.text)
|
||||||
objs/exceptions.o(.text)
|
objs/exceptions.o(.text)
|
||||||
objs/supervisor.o(.text)
|
objs/supervisor.o(.text)
|
||||||
|
|||||||
@@ -30,6 +30,7 @@
|
|||||||
#include "bas_printf.h"
|
#include "bas_printf.h"
|
||||||
#include "bas_types.h"
|
#include "bas_types.h"
|
||||||
#include "sd_card.h"
|
#include "sd_card.h"
|
||||||
|
#include "diskio.h"
|
||||||
#include "ff.h"
|
#include "ff.h"
|
||||||
|
|
||||||
/* imported routines */
|
/* imported routines */
|
||||||
@@ -152,19 +153,12 @@ void nvram_init(void)
|
|||||||
/********************************************************************/
|
/********************************************************************/
|
||||||
void BaS(void)
|
void BaS(void)
|
||||||
{
|
{
|
||||||
int az_sectors;
|
|
||||||
uint8_t *src;
|
uint8_t *src;
|
||||||
uint8_t *dst = (uint8_t *)TOS;
|
uint8_t *dst = (uint8_t *)TOS;
|
||||||
uint32_t *adr;
|
uint32_t *adr;
|
||||||
|
|
||||||
|
|
||||||
az_sectors = spi_init();
|
disk_initialize(0);
|
||||||
|
|
||||||
if (az_sectors > 0)
|
|
||||||
{
|
|
||||||
sd_card_idle();
|
|
||||||
}
|
|
||||||
|
|
||||||
pic_init();
|
pic_init();
|
||||||
nvram_init();
|
nvram_init();
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,8 @@
|
|||||||
#include "sd_card.h"
|
#include "sd_card.h"
|
||||||
#include "diskio.h"
|
#include "diskio.h"
|
||||||
|
|
||||||
|
#define xprintf xprintf_before_copy
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* "standard value" for DSPI module configuration register MCF_DSPC_DMCR
|
* "standard value" for DSPI module configuration register MCF_DSPC_DMCR
|
||||||
*/
|
*/
|
||||||
@@ -174,7 +176,6 @@ int spi_init(void)
|
|||||||
wait(10000);
|
wait(10000);
|
||||||
|
|
||||||
//sd_card_idle();
|
//sd_card_idle();
|
||||||
disk_initialize(0);
|
|
||||||
xprintf("finished\r\n");
|
xprintf("finished\r\n");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user