Makefile: Allow the kernel to be broken up a bit more for 16K banking

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 0ba0d21..8074b7e 100644 (file)
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -36,12 +36,13 @@ include cpu-$(CPU)/rules.mk
 #
 
 CDSRCS = start.c
-C1SRCS =  version.c filesys.c devio.c kdata.c
+C1SRCS =  devio.c kdata.c
 C1SRCS += inode.c tty.c
 C2SRCS =  syscall_proc.c process.c malloc.c
 C2SRCS += simple.c single.c bank8k.c bank16k.c bank16k_low.c bank32k.c
 C2SRCS += bankfixed.c bank65c816.c flat.c flat_mem.c buddy.c
 C2SRCS += bank8086.c
+C4SRCS = filesys.c version.c
 #
 #      Usually we map sysalls into CODE2 but they can be overlaid
 #      Assume we'll never be doing overlays with level2 or networking
@@ -68,6 +69,7 @@ CDOBJS = $(CDSRCS:.c=$(BINEXT))
 C1OBJS = $(C1SRCS:.c=$(BINEXT))
 C2OBJS = $(C2SRCS:.c=$(BINEXT))
 C3OBJS = $(C3SRCS:.c=$(BINEXT))
+C4OBJS = $(C4SRCS:.c=$(BINEXT))
 
 CS1OBJS = $(CS1SRCS:.c=$(BINEXT))
 CS2OBJS = $(CS2SRCS:.c=$(BINEXT))
@@ -82,8 +84,8 @@ AOBJS = $(ASRCS:$(ASMEXT)=$(BINEXT))
 CSSRCS = $(CS1SRCS) $(CS2SRCS) $(CS3SRCS) $(CS4SRCS) $(CS5SRCS)
 CSOBJS = $(CS1OBJS) $(CS2OBJS) $(CS3OBJS) $(CS4OBJS) $(CS5OBJS)
 
-CSRCS = $(CDSRCS) $(C1SRCS) $(C2SRCS) $(C3SRCS) $(CFONTSRCS) $(CVIDEOSRCS) $(CSSRCS)
-COBJS = $(CDOBJS) $(C1OBJS) $(C2OBJS) $(C3OBJS) $(CFONTOBJS) $(CVIDEOOBJS) $(CSOBJS)
+CSRCS = $(CDSRCS) $(C1SRCS) $(C2SRCS) $(C3SRCS) $(C4SRCS) $(CFONTSRCS) $(CVIDEOSRCS) $(CSSRCS)
+COBJS = $(CDOBJS) $(C1OBJS) $(C2OBJS) $(C3OBJS) $(C4OBJS) $(CFONTOBJS) $(CVIDEOOBJS) $(CSOBJS)
 
 OBJS  = $(COBJS) $(AOBJS)
 
@@ -124,6 +126,9 @@ $(C2OBJS): %$(BINEXT): %.c
 $(C3OBJS): %$(BINEXT): %.c
        $(CROSS_CC) $(CROSS_CCOPTS) $(CROSS_CC_SEG3) $<
 
+$(C4OBJS): %$(BINEXT): %.c
+       $(CROSS_CC) $(CROSS_CCOPTS) $(CROSS_CC_SEG4) $<
+
 $(CFONTOBJS): %$(BINEXT): %.c
        $(CROSS_CC) $(CROSS_CCOPTS) $(CROSS_CC_FONT) $<
 

diff --git a/Kernel/cpu-z80/rules.mk b/Kernel/cpu-z80/rules.mk
index e4de14d..4a95223 100644 (file)
--- a/Kernel/cpu-z80/rules.mk
+++ b/Kernel/cpu-z80/rules.mk
@@ -3,11 +3,12 @@ export CROSS_LD=tools/bankld/sdldz80
 export CROSS_CC=sdcc
 #export CROSS_CCOPTS=-c --std-sdcc99 --no-std-crt0 -m$(CPU) -I$(ROOT_DIR)/cpu-$(CPU) -I$(ROOT_DIR)/platform-$(TARGET) -I$(ROOT_DIR)/include --max-allocs-per-node 1000000 --opt-code-size --stack-auto --constseg CONST
 #export CROSS_CCOPTS=-c --std-sdcc99 --no-std-crt0 -m$(CPU) -I$(ROOT_DIR)/cpu-$(CPU) -I$(ROOT_DIR)/platform-$(TARGET) -I$(ROOT_DIR)/include --max-allocs-per-node 200000 --opt-code-size --stack-auto --constseg CONST
-export CROSS_CCOPTS=-c --std-sdcc99 --no-std-crt0 -m$(CPU) -I$(ROOT_DIR)/cpu-$(CPU) -I$(ROOT_DIR)/platform-$(TARGET) -I$(ROOT_DIR)/include --max-allocs-per-node 30000 --opt-code-size --stack-auto --constseg CONST --peep-file $(ROOT_DIR)/cpu-z80/switch.peep --fverbose-asm
+export CROSS_CCOPTS=-c --std-sdcc99 --no-std-crt0 -m$(CPU) -I$(ROOT_DIR)/cpu-$(CPU) -I$(ROOT_DIR)/platform-$(TARGET) -I$(ROOT_DIR)/include --max-allocs-per-node 30000 --opt-code-size --stack-auto --constseg CONST --peep-file $(ROOT_DIR)/cpu-z80/switch.peep #--fverbose-asm
 #export CROSS_CCOPTS+=--nostdlib --nostdinc -Isdcclib/include 
 export CROSS_CC_SEG2=--codeseg CODE2
 # For now but we are overspilling in a lot of configs so will need a real CODE3
 export CROSS_CC_SEG3=--codeseg CODE2
+export CROSS_CC_SEG4=--codeseg CODE
 export CROSS_CC_SEGDISC=--codeseg DISCARD --constseg DISCARD
 export CROSS_CC_FONT=--constseg FONT
 export CROSS_CC_VIDEO=--codeseg VIDEO