diff --git a/flash_scripts/flash_m548x_etos.bdm b/flash_scripts/flash_m548x_etos.bdm index 60292fd..e0333bd 100755 --- a/flash_scripts/flash_m548x_etos.bdm +++ b/flash_scripts/flash_m548x_etos.bdm @@ -63,4 +63,4 @@ erase 0xe0000000 37 erase 0xe0000000 38 erase 0xe0000000 39 -load -v ../../emutos/emutos-m548x_bas.elf +load ../../emutos/emutos-m548x_bas.elf diff --git a/sources/mmu.c b/sources/mmu.c index e1a3ab9..91c3991 100644 --- a/sources/mmu.c +++ b/sources/mmu.c @@ -58,9 +58,9 @@ #define DEBUG_MMU #ifdef DEBUG_MMU -#define debug_print(format, arg...) do { xprintf("DEBUG: " format "\r\n", ##arg);} while(0) +#define dbg_mmu(format, arg...) do { xprintf("DEBUG: " format "\r\n", ##arg);} while(0) #else -#define debug_print(format, arg...) do {;} while (0) +#define dbg_mmu(format, arg...) do {;} while (0) #endif /* DEBUG_MMU */ /* @@ -363,7 +363,7 @@ void mmutr_miss(void) { register uint32_t address asm("d0"); - debug_print("MMU TLB MISS at 0x%08x\r\n", address); + dbg_mmu("MMU TLB MISS at 0x%08x\r\n", address); flush_and_invalidate_caches(); switch (address) @@ -371,13 +371,13 @@ void mmutr_miss(void) case keyctl: case keybd: /* do something to emulate the IKBD access */ - debug_print("IKBD access\r\n"); + dbg_mmu("IKBD access\r\n"); break; case midictl: case midi: /* do something to emulate MIDI access */ - debug_print("MIDI ACIA access\r\n"); + dbg_mmu("MIDI ACIA access\r\n"); break; default: diff --git a/sources/sysinit.c b/sources/sysinit.c index 5934fcb..f3ea9e1 100644 --- a/sources/sysinit.c +++ b/sources/sysinit.c @@ -459,7 +459,7 @@ void init_fbcs() MCF_FBCS5_CSAR = MCF_FBCS_CSAR_BA(0x60000000); MCF_FBCS5_CSCR = MCF_FBCS_CSCR_PS_16 /* CPLD access */ - | MCF_FBCS_CSCR_WS(10) + | MCF_FBCS_CSCR_WS(32) | MCF_FBCS_CSCR_ASET(1) | MCF_FBCS_CSCR_AA; MCF_FBCS5_CSMR = MCF_FBCS_CSMR_BAM_256M