Merge remote-tracking branch 'upstream/master'

[cc65] / cfg / atarixl.cfg

diff --git a/cfg/atarixl.cfg b/cfg/atarixl.cfg
index dd49d421db1048019255724cf3fd5b155bddc5eb..ceb4141af935c9fb4b687db6dbb6c205e6a54f6d 100644 (file)
--- a/cfg/atarixl.cfg
+++ b/cfg/atarixl.cfg
@@ -4,7 +4,6 @@ FEATURES {
 
 SYMBOLS {
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
-    __RESERVED_MEMORY__: type = weak, value = $0000;
     __STARTADDRESS__:    type = export, value = %S;
     syschk:              type = import;  # force inclusion of SYSCHK
     sramprep:            type = import;  # force inclusion of SRPREP
@@ -29,21 +28,22 @@ MEMORY {
 # "main program" load chunk
     MAINHDR:       file = %O,               start = $0000,                  size = $0004;
     RAM:           file = %O, define = yes, start = %S +
-                                                   __SAVEAREA_SIZE__ +
-                                                   __LOWDATA_SIZE__, size = $D000 -
-                                                                            __STACKSIZE__ -
-                                                                            %S -
-                                                                            __SAVEAREA_SIZE__ -
-                                                                            __LOWDATA_SIZE__;
+                                                   __LOWDATA_SIZE__,       size = $D000 -
+                                                                                  __STACKSIZE__ -
+                                                                                  %S -
+                                                                                  __LOWDATA_SIZE__;
 
 # defines entry point into program
     TRAILER:       file = %O,               start = $0000, size = $0006;
 
-# address of relocated character generator
-    CHARGEN:       file = "", define = yes, start = $D800, size = $0400;
+# memory beneath the ROM preceeding the character generator
+    HIDDEN_RAM2:   file = "", define = yes, start = $D800, size = $0800;
+
+# address of relocated character generator (same addess as ROM version)
+    CHARGEN:       file = "", define = yes, start = $E000, size = $0400;
 
 # memory beneath the ROM
-    HIDDEN_RAM:    file = "", define = yes, start = $DC00, size = $FFF0 - $DC00;
+    HIDDEN_RAM:    file = "", define = yes, start = $E400, size = $FFF0 - $E400;
 }
 
 SEGMENTS {
@@ -54,10 +54,10 @@ SEGMENTS {
     SYSCHKTRL:  load = SYSCHKTRL,                   type = ro,                optional = yes;
 
     SRPREPHDR:  load = SRPREPHDR,                   type = ro;
-    SAVEAREA:   load = SRPREPCHNK,                  type = bss, define = yes;  # shared btw. SRPREP and RAM
-    LOWDATA:    load = SRPREPCHNK,                  type = bss, define = yes;  #   "  "  "  "  "  "  "  "
+    LOWDATA:    load = SRPREPCHNK,                  type = bss, define = yes;  # shared btw. SRPREP and RAM
     SRPREP:     load = SRPREPCHNK,                  type = rw,  define = yes;
-    SHADOW_RAM: load = SRPREPCHNK, run = HIDDEN_RAM, type = rw,  define = yes, optional = yes;
+    SHADOW_RAM:  load = SRPREPCHNK, run = HIDDEN_RAM,  type = rw,  define = yes, optional = yes;
+    SHADOW_RAM2: load = SRPREPCHNK, run = HIDDEN_RAM2, type = rw,  define = yes, optional = yes;
     SRPREPTRL:  load = SRPREPTRL,                   type = ro;
 
     MAINHDR:    load = MAINHDR,                     type = ro;