diff --git a/Targets/Bonito2fdev/Bonito/start.S b/Targets/Bonito2fdev/Bonito/start.S index 0737c5ce..b0cc6292 100644 --- a/Targets/Bonito2fdev/Bonito/start.S +++ b/Targets/Bonito2fdev/Bonito/start.S @@ -1304,7 +1304,7 @@ END(hexserial) LEAF(tgt_putchar) .set noat move AT,ra -#if (PCI_IDSEL_VIA686B != 0) +#if ((PCI_IDSEL_VIA686B != 0)&& !defined(HAVE_NB_SERIAL)) la v0, COM1_BASE_ADDR bal 1f nop diff --git a/Targets/Bonito2fdev/Bonito/tgt_machdep.c b/Targets/Bonito2fdev/Bonito/tgt_machdep.c index d57c7c3c..cd05b11f 100644 --- a/Targets/Bonito2fdev/Bonito/tgt_machdep.c +++ b/Targets/Bonito2fdev/Bonito/tgt_machdep.c @@ -189,11 +189,13 @@ void initmips(unsigned int memsz) { +#ifdef DEVBD2F_SM502 { /*set lio bus to 16 bit*/ volatile int *p=0xbfe00108; *p=((*p)&~(0x1f<<8))|(0x8<<8) |(1<<13); } +#endif /*enable float*/ memsz=512; diff --git a/Targets/Bonito2fdev/conf/Bonito.2feva b/Targets/Bonito2fdev/conf/Bonito.2feva index 7da5631e..8bf6fa28 100644 --- a/Targets/Bonito2fdev/conf/Bonito.2feva +++ b/Targets/Bonito2fdev/conf/Bonito.2feva @@ -157,12 +157,14 @@ pseudo-device loop 1 # network loopback ide_cd* at pciide? channel ? drive ? flags 0x0001 select iso9660 option IDECD -#option HAVE_NB_SERIAL -option USE_ENVMAC +option HAVE_NB_SERIAL +#option USE_ENVMAC #option LOOKLIKE_PC #select cmd_lwdhcp #select cmd_bootp -#option FOR_GXEMUL +option FOR_GXEMUL select fatfs option FLOATINGPT option PCI_IDSEL_VIA686B=6 +option COM3_BASE_ADDR=0xbff003f8 +option WDC_NORESET diff --git a/zloader.2feva b/zloader.2feva new file mode 120000 index 00000000..a8f6aad1 --- /dev/null +++ b/zloader.2feva @@ -0,0 +1 @@ +zloader \ No newline at end of file