diff --git a/BaS_GNU/BaS_GNU/bas.hex.map b/BaS_GNU/BaS_GNU/bas.hex.map index aff34d8..a1d8cc8 100644 --- a/BaS_GNU/BaS_GNU/bas.hex.map +++ b/BaS_GNU/BaS_GNU/bas.hex.map @@ -7,12 +7,12 @@ code 0xe0000000 0x00200000 xr Linker script and memory map - 0x1fe00000 __Bas_base = 0x1fe00000 + 0x1fe00000 _Bas_base = 0x1fe00000 0xe0000000 ___BOOT_FLASH = 0xe0000000 0x00800000 ___BOOT_FLASH_SIZE = 0x800000 0x00000000 ___SDRAM = 0x0 0x20000000 ___SDRAM_SIZE = 0x20000000 - 0x60000000 ___VRAM = 0x60000000 + 0x60000000 __VRAM = 0x60000000 0xff000000 ___MBAR = 0xff000000 0xff040000 ___MMUBAR = 0xff040000 0xff100000 ___RAMBAR0 = 0xff100000 @@ -141,16 +141,16 @@ Symbol File BaS objs/sysinit.o MCF_MMU_MMUCR objs/startcf.o _BaS objs/BaS.o +_Bas_base objs/exceptions.o + objs/sysinit.o _MCF_PCICR1_CACHELINESIZE objs/sysinit.o _MCF_PCICR2_MINGNT objs/sysinit.o -__Bas_base objs/sysinit.o __MBAR objs/exceptions.o __MMUBAR objs/exceptions.o __VRAM objs/sysinit.o ___BOOT_FLASH objs/exceptions.o objs/startcf.o -___Bas_base objs/exceptions.o - objs/BaS.o +___Bas_base objs/BaS.o ___MBAR objs/exceptions.o objs/sd_card.o objs/BaS.o diff --git a/BaS_GNU/BaS_GNU/flash.lk b/BaS_GNU/BaS_GNU/flash.lk index 5938ddf..ca45959 100644 --- a/BaS_GNU/BaS_GNU/flash.lk +++ b/BaS_GNU/BaS_GNU/flash.lk @@ -3,7 +3,7 @@ MEMORY { } SECTIONS { - __Bas_base = 0x1FE00000; + _Bas_base = 0x1FE00000; /* Board Memory map definitions from linker command files: * __SDRAM,__SDRAM_SIZE, __CODE_FLASH, __CODE_FLASH_SIZE @@ -18,7 +18,7 @@ SECTIONS { ___SDRAM_SIZE = ABSOLUTE(0x20000000); /* VIDEO RAM BASIS */ - ___VRAM = ABSOLUTE(0x60000000); + __VRAM = ABSOLUTE(0x60000000); /* * MCF5475 Derivative Memory map definitions from linker command files: diff --git a/BaS_GNU/BaS_GNU/lcf/FLASH.lcf b/BaS_GNU/BaS_GNU/lcf/FLASH.lcf index 0315e2f..970ad7a 100644 --- a/BaS_GNU/BaS_GNU/lcf/FLASH.lcf +++ b/BaS_GNU/BaS_GNU/lcf/FLASH.lcf @@ -25,7 +25,7 @@ SECTIONS { ___SDRAM_SIZE = 0x20000000; #VIDEO RAM BASIS - ___VRAM = 0x60000000; + __VRAM = 0x60000000; # MCF5475 Derivative Memory map definitions from linker command files: # __MBAR, __MMUBAR, __RAMBAR0, __RAMBAR0_SIZE, __RAMBAR1, __RAMBAR1_SIZE diff --git a/BaS_GNU/BaS_GNU/sources/exceptions.S b/BaS_GNU/BaS_GNU/sources/exceptions.S index 0997fd2..6dc2797 100644 --- a/BaS_GNU/BaS_GNU/sources/exceptions.S +++ b/BaS_GNU/BaS_GNU/sources/exceptions.S @@ -386,7 +386,7 @@ access_mmu: btst #1,d0 bne bus_error move.l MCF_MMU_MMUAR,d0 - cmp.l #___Bas_base,d0 // max User RAM Bereich + cmp.l #_Bas_base,d0 // max User RAM Bereich bge bus_error // grösser -> bus error bra _mmutr_miss bus_error: diff --git a/BaS_GNU/BaS_GNU/sources/sysinit.c b/BaS_GNU/BaS_GNU/sources/sysinit.c index c5020d2..c44e4b8 100644 --- a/BaS_GNU/BaS_GNU/sources/sysinit.c +++ b/BaS_GNU/BaS_GNU/sources/sysinit.c @@ -14,7 +14,7 @@ static const uint8_t *FPGA_FLASH_DATA = (uint8_t *) 0xe0700000L; static const uint8_t *FPGA_FLASH_DATA_END = (uint8_t *) 0xe0800000L; -extern unsigned long __VRAM; +extern unsigned long _VRAM; extern unsigned long _Bas_base; extern unsigned long BaS; extern unsigned long _BOOT_FLASH[]; @@ -798,7 +798,7 @@ asm( "lea copy_start,A0\n\t" "lea BaS,A1\n\t" "sub.l A0,A1\n\t" - "move.l #__Bas_base,A2\n\t" + "move.l #_Bas_base,A2\n\t" "move.l A2,A3\n\t" "add.l A1,A3\n\t" "lea copy_end,A4\n\t"