From: Alan Cox <alan@linux.intel.com>
Date: Fri, 11 Nov 2016 15:39:55 +0000 (+0000)
Subject: 6502: quick fixes to bring the code somewhere aligned with current
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=350d7212a0537f424718ba012bc23a5663c51700;p=FUZIX.git

6502: quick fixes to bring the code somewhere aligned with current
---

diff --git a/Kernel/cpu-6502/rules.mk b/Kernel/cpu-6502/rules.mk
index 278b4333..48d06b5c 100644
--- a/Kernel/cpu-6502/rules.mk
+++ b/Kernel/cpu-6502/rules.mk
@@ -11,6 +11,11 @@ export CROSS_CC_SEG1=--code-name SEG1
 export CROSS_CC_SEG2=--code-name SEG2
 # 6502 we need a real SEG3 to make it fit
 export CROSS_CC_SEG3=--code-name SEG3
+export CROSS_CC_SYS1=--code-name SYS1
+export CROSS_CC_SYS2=--code-name SYS2
+export CROSS_CC_SYS3=--code-name SYS3
+export CROSS_CC_SYS4=--code-name SYS4
+export CROSS_CC_SYS5=--code-name SYS5
 export CROSS_CC_VIDEO=--code-name SEG3
 export CROSS_CC_SEGDISC=--code-name DISCARD --rodata-name DISCARDDATA
 export ASMEXT = .s
diff --git a/Kernel/platform-tgl6502/Makefile b/Kernel/platform-tgl6502/Makefile
index a1c4bb52..8bfafbdf 100644
--- a/Kernel/platform-tgl6502/Makefile
+++ b/Kernel/platform-tgl6502/Makefile
@@ -14,7 +14,7 @@ JUNK = $(CSRCS:.c=.o) $(CSRCS:.c=.s) $(ASRCS:.s=.o)
 all:	$(OBJS)
 
 $(COBJS): %$(BINEXT): %.c
-	$(CROSS_CC) $(CROSS_CCOPTS) $<
+	$(CROSS_CC) $(CROSS_CCOPTS) $(CROSS_CC_SEG1) $<
 
 $(AOBJS): %$(BINEXT): %.s
 	$(CROSS_AS) $(ASOPTS) $< -o $*$(BINEXT)
diff --git a/Kernel/platform-tgl6502/config.h b/Kernel/platform-tgl6502/config.h
index 6656352f..61488976 100644
--- a/Kernel/platform-tgl6502/config.h
+++ b/Kernel/platform-tgl6502/config.h
@@ -37,7 +37,7 @@
 #define MAPBASE	    0x0000  /* We map from 0 */
 #define PROGBASE    0x2000  /* also data base */
 #define PROGLOAD    0x2000
-#define PROGTOP     0xC000  /* Top of program (for debug for now, can go to 10000) */
+#define PROGTOP     0xC000  /* Top of program (for debug for now, can go to FFF9) */
 
 #define BOOT_TTY 513        /* Set this to default device for stdio, stderr */
 
diff --git a/Kernel/platform-tgl6502/ld65.cfg b/Kernel/platform-tgl6502/ld65.cfg
index 9369be71..95ac6220 100644
--- a/Kernel/platform-tgl6502/ld65.cfg
+++ b/Kernel/platform-tgl6502/ld65.cfg
@@ -16,10 +16,15 @@ SEGMENTS {
 	BSS:	load = RAM1, type = bss, define=yes;
 	COMMONDATA: load = RAM0, type= bss;
 	COMMONMEM: load = ROM1, run = RAM0, type = rw, define = yes;
-	CODE:	load = ROM0, type = ro, define = yes;
+	CODE: load = ROM1, run = RAM0, type = ro, define = yes;
 	SEG1:	load = ROM0, type = ro;
 	SEG2:	load = ROM0, type = ro;
 	SEG3:	load = ROM0, type = ro;
+	SYS1:	load = ROM0, type = ro;
+	SYS2:	load = ROM0, type = ro;
+	SYS3:	load = ROM0, type = ro;
+	SYS4:	load = ROM0, type = ro;
+	SYS5:	load = ROM0, type = ro;
 	STUBS:   load = ROM1, run = RAM0, type = ro, define = yes;
 	VECTORS: load = ROM1, type = ro, start = $FFFA;
 }