move CHARGEN_RELOC enabling to Makefile.inc

diff --git a/libsrc/atari/Makefile.inc b/libsrc/atari/Makefile.inc
index d12b54058e4b9d04c0876ae3dc2e6d73ddf4939c..af5a17e59fa3ee674db0c385d65a5619149e9294 100644 (file)
--- a/libsrc/atari/Makefile.inc
+++ b/libsrc/atari/Makefile.inc
@@ -14,3 +14,20 @@
 #                  needs DEFAULT_DEVICE to be defined, otherwise no effect
 
 CA65FLAGS += -D NUMDRVS=4 -D LINEBUF=80 -D UCASE_FILENAME=1 -D DEFAULT_DEVICE=1 -D DYNAMIC_DD=1
+
+# The following defines are only used by the 'atarixl' target:
+#
+# CHARGEN_RELOC  - If defined, CHBAS and CHBASE are updated when
+#                  enabling or disabling the ROM.
+#                  If the ROM is enabled, $E0 is written to CHBAS
+#                  and CHBASE.
+#                  If the ROM is disabled, the upper byte of
+#                  __CHARGEN_START__ is written to CHBAS and CHBASE.
+# USEWSYNC       - If defined, the code waits for horizontal retrace
+#                  before switching the ROM and updating CHBAS and
+#                  CHBASE. This define only has effect if CHARGEN_RELOC
+#                  is also defined.
+
+# Disabled by default, you should enable it if the linker script relocates the
+# character generator (like atarixl-largehimem.cfg).
+#CA65FLAGS += -D CHARGEN_RELOC -D USEWSYNC

diff --git a/libsrc/atari/romswitch.inc b/libsrc/atari/romswitch.inc
index e1f3433b69b298e304d70712291d2c3e4ec2cb9b..7169f2b39ce1c5ba5fc8ac92b80af4d1a39e6865 100644 (file)
--- a/libsrc/atari/romswitch.inc
+++ b/libsrc/atari/romswitch.inc
@@ -14,16 +14,12 @@
 ;                __CHARGEN_START__ is written to CHBAS and CHBASE.
 ; USEWSYNC:      If defined, the code waits for horizontal retrace
 ;                before switching the ROM and updating CHBAS and
-;                CHBASE. This define only has effect if CHAGEN_RELOC
+;                CHBASE. This define only has effect if CHARGEN_RELOC
 ;                is also defined.
 
 
 .ifdef __ATARIXL__
 
-USEWSYNC =      1
-CHARGEN_RELOC = 1
-
-
 .ifdef CHARGEN_RELOC
 
 .macro  set_chbase val