From caaa790add99f475197303aca5e632ce01f25857 Mon Sep 17 00:00:00 2001
From: oliverschmidt <oliverschmidt>
Date: Sun, 18 Oct 2009 10:06:44 +0000
Subject: [PATCH] cc65 2.13. comes with secondary linker configs. The
 'apple2enh-reboot.cfg' is more or less what was previously engineered as part
 of Contiki for the Apple2 - now moved into the cc65 distro.

---
 platform/apple2enh/Makefile.apple2enh | 10 +++---
 platform/apple2enh/linker.cfg         | 50 ---------------------------
 2 files changed, 6 insertions(+), 54 deletions(-)
 delete mode 100644 platform/apple2enh/linker.cfg

diff --git a/platform/apple2enh/Makefile.apple2enh b/platform/apple2enh/Makefile.apple2enh
index a77257919..8497bc60d 100644
--- a/platform/apple2enh/Makefile.apple2enh
+++ b/platform/apple2enh/Makefile.apple2enh
@@ -30,17 +30,19 @@
 #
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
-# $Id: Makefile.apple2enh,v 1.7 2008/05/26 11:26:57 oliverschmidt Exp $
+# $Id: Makefile.apple2enh,v 1.8 2009/10/18 10:06:44 oliverschmidt Exp $
 #
 
 CONTIKI_SOURCEFILES += log-asm.S pfs.S
 HIGHCODE_SOURCEFILES = process.c etimer.c uip_arp.c
 
+CONTIKI_CPU = $(CONTIKI)/cpu/6502
+include $(CONTIKI_CPU)/Makefile.6502
+
 # Set a target-specific variable value
 ${addprefix $(OBJECTDIR)/,${call oname, $(HIGHCODE_SOURCEFILES)}}: CFLAGS += --code-name HIGHCODE
 
-CONTIKI_CPU = $(CONTIKI)/cpu/6502
-include $(CONTIKI_CPU)/Makefile.6502
+LDFLAGS += -C apple2enh-reboot.cfg
 
 ifeq ($(MAKECMDGOALS),disk)
   ifndef AC
@@ -51,7 +53,7 @@ endif
 DISK = $(CONTIKI_PROJECT).dsk
 disk: all
 	cp $(CONTIKI)/tools/$(TARGET)/prodos.dsk $(DISK)
-	java -jar $(AC) -p    $(DISK) contiki.system sys 0 < $(CONTIKI)/tools/$(TARGET)/loader-reboot.system
+	java -jar $(AC) -p    $(DISK) contiki.system sys 0 < $(CONTIKI)/tools/$(TARGET)/loader.system
 	java -jar $(AC) -cc65 $(DISK) contiki        bin   < $(CONTIKI_PROJECT).$(TARGET)
 	java -jar $(AC) -p    $(DISK) contiki.cfg    bin 0 < $(CONTIKI)/tools/$(TARGET)/sample.cfg
 	java -jar $(AC) -p    $(DISK) cs8900a.eth    rel 0 < cs8900a.eth
diff --git a/platform/apple2enh/linker.cfg b/platform/apple2enh/linker.cfg
deleted file mode 100644
index e1f63359b..000000000
--- a/platform/apple2enh/linker.cfg
+++ /dev/null
@@ -1,50 +0,0 @@
-# This file should be identical to the file '<cc65>/doc/apple2.cfg' with the
-# following exceptions:
-# - Reduced stacksize: Contiki is designed to use extremely little stack.
-#   The applications coming with Contiki run even with a $100 byte stack.
-# - Expanded RAM size: Allow applications to overlay BASIC.SYSTEM if needed.
-#   In that case the binary must be loaded with the ProDOS 8 loader available
-#   at: ftp://ftp.musoftware.de/pub/uz/cc65/contrib/loader-1.4.zip
-# - Expanded LC size: Allow applications to overlay the ProDOS 8 QUIT code.
-#   In that case the binary must reboot on exit. There's a ProDOS 8 loader
-#   variant available at the URL above that does just this.
-
-FEATURES {
-    STARTADDRESS: default = $0803;
-}
-MEMORY {
-    ZP:     start = $0080, size = $001A,                 define = yes;
-    HEADER: start = $0000, size = $0004,      file = %O;
-    RAM:    start = %S,    size = $BF00 - %S, file = %O, define = yes; # $BF00 instead of $9600
-    MOVE:   start = $0000, size = $FFFF,      file = %O, define = yes;
-    LC:     start = $D000, size = $1000,                 define = yes; # $D000/$1000 instead of $D400/$0C00
-}
-SEGMENTS {
-    ZEROPAGE: load = ZP,              type = zp;
-    EXEHDR:   load = HEADER,          type = ro;
-    STARTUP:  load = RAM,             type = ro;
-    LOWCODE:  load = RAM,             type = ro;
-    CODE:     load = RAM,             type = ro;
-    RODATA:   load = RAM,             type = ro;
-    DATA:     load = RAM,             type = rw;
-    BSS:      load = RAM,             type = bss, define   = yes;
-    INIT:     load = MOVE, run = RAM, type = ro,  define   = yes;
-    HIGHCODE: load = MOVE, run = LC,  type = ro,  optional = yes;
-}
-FEATURES {
-    CONDES: segment = INIT,
-            type    = constructor,
-            label   = __CONSTRUCTOR_TABLE__,
-            count   = __CONSTRUCTOR_COUNT__;
-    CONDES: segment = RODATA,
-            type    = destructor,
-            label   = __DESTRUCTOR_TABLE__,
-            count   = __DESTRUCTOR_COUNT__;
-    CONDES: type    = interruptor,
-            segment = RODATA,
-            label   = __INTERRUPTOR_TABLE__,
-            count   = __INTERRUPTOR_COUNT__;
-}
-SYMBOLS {
-    __STACKSIZE__ = $0200; # 1/2K instead of 2K stack
-}