modified to use the supplied preprocessor define "COMPILE_RAM" instead of fiddling with "TARGET_ADDRESS"

This commit is contained in:
Markus Fröschle
2013-11-05 11:12:19 +00:00
parent 034adb7101
commit 6d7dc8bcb9

View File

@@ -7,11 +7,11 @@
#endif /* MACHINE_M5484LITE */ #endif /* MACHINE_M5484LITE */
/* make bas_rom access flags rx if compiling to RAM */ /* make bas_rom access flags rx if compiling to RAM */
#if (TARGET_ADDRESS < 0x1FFFFFFF && TARGET_ADDRESS > 0) #if COMPILE_RAM
#define ROMFLAGS WX #define ROMFLAGS WX
#else #else
#define ROMFLAGS RX #define ROMFLAGS RX
#endif /* TARGET_ADDRESS */ #endif /* COMPILE_RAM */
MEMORY MEMORY
{ {
@@ -68,7 +68,7 @@ SECTIONS
/* /*
* if we compile to RAM anyway, there is no need to copy anything * if we compile to RAM anyway, there is no need to copy anything
*/ */
#if (TARGET_ADDRESS < 0x1FFFFFFF && TARGET_ADDRESS > 0) #if COMPILE_RAM
. = ALIGN(16); . = ALIGN(16);
__BAS_DATA_START = .; __BAS_DATA_START = .;
*(.data) *(.data)
@@ -76,15 +76,15 @@ SECTIONS
__BAS_BSS_START = .; __BAS_BSS_START = .;
*(.bss) *(.bss)
__BAS_BSS_END = .; __BAS_BSS_END = .;
#endif /* TARGET_ADDRESS */ #endif /* COMPILE_RAM */
#if (FORMAT == elf32-m68k) #if (FORMAT == elf32-m68k)
*(.rodata) *(.rodata)
*(.rodata.*) *(.rodata.*)
#endif #endif
#if (TARGET_ADDRESS < 0x1FFFFFFF && TARGET_ADDRESS > 0) #if COMPILE_RAM
. = ALIGN(16); . = ALIGN(16);
_usb_buffer = .; _usb_buffer = .;
#endif #endif /* COMPILE_RAM */
} > bas_rom } > bas_rom
#if (TARGET_ADDRESS == BOOTFLASH_BASE_ADDRESS) #if (TARGET_ADDRESS == BOOTFLASH_BASE_ADDRESS)