From 3b8100568ad48f1a5b8a8db849a515cd53ea425b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= Date: Sat, 7 Dec 2013 08:39:47 +0000 Subject: [PATCH] modified memory map to enable load of patched EmuTOS --- BaS_gcc/.gdbinit | 4 ++-- BaS_gcc/flash_scripts/flash_m548x_etos.bdm | 2 +- BaS_gcc/sources/sysinit.c | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/BaS_gcc/.gdbinit b/BaS_gcc/.gdbinit index 598dbde..64c2100 100644 --- a/BaS_gcc/.gdbinit +++ b/BaS_gcc/.gdbinit @@ -1,7 +1,7 @@ #set disassemble-next-line on define tr - target remote | m68k-bdm-gdbserver pipe /dev/bdmcf3 - #target remote | m68k-bdm-gdbserver pipe /dev/tblcf3 + #target remote | m68k-bdm-gdbserver pipe /dev/bdmcf3 + target remote | m68k-bdm-gdbserver pipe /dev/tblcf3 #target dbug /dev/ttyS0 #monitor bdm-reset end diff --git a/BaS_gcc/flash_scripts/flash_m548x_etos.bdm b/BaS_gcc/flash_scripts/flash_m548x_etos.bdm index cfffa6c..55f9adf 100755 --- a/BaS_gcc/flash_scripts/flash_m548x_etos.bdm +++ b/BaS_gcc/flash_scripts/flash_m548x_etos.bdm @@ -64,4 +64,4 @@ erase 0xe0000000 37 erase 0xe0000000 38 erase 0xe0000000 39 -load -v ../../emutos_evb/emutos2.elf +load -v ../../emutos/emutos-m548x_bas.elf diff --git a/BaS_gcc/sources/sysinit.c b/BaS_gcc/sources/sysinit.c index 01efd27..f33d6cf 100644 --- a/BaS_gcc/sources/sysinit.c +++ b/BaS_gcc/sources/sysinit.c @@ -452,9 +452,17 @@ void init_fbcs() MCF_FBCS2_CSMR = 0; MCF_FBCS3_CSMR = 0; MCF_FBCS4_CSMR = 0; + + MCF_FBCS5_CSAR = 0x70000000; + MCF_FBCS5_CSCR = MCF_FBCS_CSCR_PS_16 /* CPLD access */ + | MCF_FBCS_CSCR_WS(10) + | MCF_FBCS_CSCR_AA + | MCF_FBCS_CSCR_PS_16; + MCF_FBCS5_CSMR = MCF_FBCS_CSMR_BAM_1M | MCF_FBCS_CSMR_V; #endif /* MACHINE_FIREBEE */ +#ifndef MACHINE_M5484LITE MCF_FBCS5_CSAR = 0x0; MCF_FBCS5_CSCR = MCF_FBCS_CSCR_PS_8 | MCF_FBCS_CSCR_BSTR @@ -462,6 +470,7 @@ void init_fbcs() | MCF_FBCS_CSCR_RDAH(1); /* chip errata SECF077 */ MCF_FBCS5_CSMR = MCF_FBCS_CSMR_BAM_1G; /* | MCF_FBCS_CSMR_V; */ /* not enabled */ +#endif /* MACHINE_M5484LITE */ xprintf("finished\r\n"); }