From c6474cc8bcf2f3a162f1e99cf1ed214c112266e8 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 6 Oct 2013 17:23:39 +0200 Subject: [PATCH] Final adjustments for the switch from 'atari' to 'atarixl'. --- platform/atarixl/Makefile.atarixl | 1 + tools/6502/Makefile | 98 +++++++++++++++---------------- 2 files changed, 50 insertions(+), 49 deletions(-) diff --git a/platform/atarixl/Makefile.atarixl b/platform/atarixl/Makefile.atarixl index 9a045f92d..4fe8c80d6 100644 --- a/platform/atarixl/Makefile.atarixl +++ b/platform/atarixl/Makefile.atarixl @@ -40,6 +40,7 @@ SHADOW_RAM2_SOURCEFILES = clock.c error.c uip_arch.c uip_arp.c # Set target-specific variable values ${addprefix $(OBJECTDIR)/,${call oname, $(SHADOW_RAM_SOURCEFILES)}}: CFLAGS += --code-name SHADOW_RAM ${addprefix $(OBJECTDIR)/,${call oname, $(SHADOW_RAM2_SOURCEFILES)}}: CFLAGS += --code-name SHADOW_RAM2 + ifeq ($(MAKECMDGOALS),disk) ifndef DIR2ATR ${error DIR2ATR not defined! You must specify where dir2atr resides} diff --git a/tools/6502/Makefile b/tools/6502/Makefile index db261ed81..b765b9108 100644 --- a/tools/6502/Makefile +++ b/tools/6502/Makefile @@ -166,75 +166,75 @@ atari: contiki-atari-1.atr contiki-atari-2.atr contiki-atari-3.atr contiki-atari contiki-atari-1.atr: atarixl-makes mkdir atr - cp ../atari/dos25/dos.sys atr/dos.sys - cp ../atari/dos25/dup.sys atr/dup.sys - cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com - cp ../../examples/webbrowser/webbrowser.atari atr/webbrows.com - cp ../../examples/wget/wget.atari atr/wget.com - cp ../atari/default.cfg atr/contiki.cfg - cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth + cp ../atarixl/dos25/dos.sys atr/dos.sys + cp ../atarixl/dos25/dup.sys atr/dup.sys + cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com + cp ../../examples/webbrowser/webbrowser.atarixl atr/webbrows.com + cp ../../examples/wget/wget.atarixl atr/wget.com + cp ../atarixl/default.cfg atr/contiki.cfg + cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth $(DIR2ATR) -b Dos25 1040 $@ atr rm -r atr contiki-atari-2.atr: atarixl-makes mkdir atr - cp ../atari/dos25/dos.sys atr/dos.sys - cp ../atari/dos25/dup.sys atr/dup.sys - cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com - cp ../../examples/irc/irc-client.atari atr/irc.com - cp ../../../contikiprojects/vandenbrande.com/twitter/platform/atari/breadbox64.atari atr/breadbox.com - cp ../atari/default.cfg atr/contiki.cfg - cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth + cp ../atarixl/dos25/dos.sys atr/dos.sys + cp ../atarixl/dos25/dup.sys atr/dup.sys + cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com + cp ../../examples/irc/irc-client.atarixl atr/irc.com + cp ../../../contikiprojects/vandenbrande.com/twitter/platform/atarixl/breadbox64.atarixl atr/breadbox.com + cp ../atarixl/default.cfg atr/contiki.cfg + cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth $(DIR2ATR) -b Dos25 1040 $@ atr rm -r atr contiki-atari-3.atr: atarixl-makes mkdir atr - cp ../atari/dos25/dos.sys atr/dos.sys - cp ../atari/dos25/dup.sys atr/dup.sys - cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com - cp ../../examples/email/email-client.atari atr/email.com - cp ../../examples/ftp/ftp-client.atari atr/ftp.com - cp ../atari/default.cfg atr/contiki.cfg - cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth + cp ../atarixl/dos25/dos.sys atr/dos.sys + cp ../atarixl/dos25/dup.sys atr/dup.sys + cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com + cp ../../examples/email/email-client.atarixl atr/email.com + cp ../../examples/ftp/ftp-client.atarixl atr/ftp.com + cp ../atarixl/default.cfg atr/contiki.cfg + cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth $(DIR2ATR) -b Dos25 1040 $@ atr rm -r atr contiki-atari-4.atr: atarixl-makes mkdir atr - cp ../atari/dos25/dos.sys atr/dos.sys - cp ../atari/dos25/dup.sys atr/dup.sys - cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com - cp ../../examples/webserver/webserver-example.atari atr/webserv.com - cp ../../examples/telnet-server/telnet-server.atari atr/telnetd.com - cp ../atari/default.cfg atr/contiki.cfg - cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth - cp ../../examples/webserver/httpd-cfs/index.htm atr/index.htm - cp ../../examples/webserver/httpd-cfs/backgrnd.gif atr/backgrnd.gif - cp ../../examples/webserver/httpd-cfs/contiki.gif atr/contiki.gif - cp ../../examples/webserver/httpd-cfs/notfound.htm atr/notfound.htm + cp ../atarixl/dos25/dos.sys atr/dos.sys + cp ../atarixl/dos25/dup.sys atr/dup.sys + cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com + cp ../../examples/webserver/webserver-example.atarixl atr/webserv.com + cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com + cp ../atarixl/default.cfg atr/contiki.cfg + cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth + cp ../../examples/webserver/httpd-cfs/index.htm atr/index.htm + cp ../../examples/webserver/httpd-cfs/backgrnd.gif atr/backgrnd.gif + cp ../../examples/webserver/httpd-cfs/contiki.gif atr/contiki.gif + cp ../../examples/webserver/httpd-cfs/notfound.htm atr/notfound.htm $(DIR2ATR) -b Dos25 1040 $@ atr rm -r atr contiki-atari.atr: atarixl-makes mkdir atr - cp ../atari/mydos4534/dos.sys atr/dos.sys - cp ../atari/mydos4534/dup.sys atr/dup.sys - cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com - cp ../../examples/webbrowser/webbrowser.atari atr/webbrows.com - cp ../../examples/wget/wget.atari atr/wget.com - cp ../../examples/irc/irc-client.atari atr/irc.com - cp ../../../contikiprojects/vandenbrande.com/twitter/platform/atari/breadbox64.atari atr/breadbox.com - cp ../../examples/email/email-client.atari atr/email.com - cp ../../examples/ftp/ftp-client.atari atr/ftp.com - cp ../../examples/webserver/webserver-example.atari atr/webserv.com - cp ../../examples/telnet-server/telnet-server.atari atr/telnetd.com - cp ../atari/default.cfg atr/contiki.cfg - cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth - cp ../../examples/webserver/httpd-cfs/index.htm atr/index.htm - cp ../../examples/webserver/httpd-cfs/backgrnd.gif atr/backgrnd.gif - cp ../../examples/webserver/httpd-cfs/contiki.gif atr/contiki.gif - cp ../../examples/webserver/httpd-cfs/notfound.htm atr/notfound.htm + cp ../atarixl/mydos4534/dos.sys atr/dos.sys + cp ../atarixl/mydos4534/dup.sys atr/dup.sys + cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com + cp ../../examples/webbrowser/webbrowser.atarixl atr/webbrows.com + cp ../../examples/wget/wget.atarixl atr/wget.com + cp ../../examples/irc/irc-client.atarixl atr/irc.com + cp ../../../contikiprojects/vandenbrande.com/twitter/platform/atarixl/breadbox64.atarixl atr/breadbox.com + cp ../../examples/email/email-client.atarixl atr/email.com + cp ../../examples/ftp/ftp-client.atarixl atr/ftp.com + cp ../../examples/webserver/webserver-example.atarixl atr/webserv.com + cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com + cp ../atarixl/default.cfg atr/contiki.cfg + cp ../../cpu/6502/ipconfig/cs8900a.eth atr/cs8900a.eth + cp ../../examples/webserver/httpd-cfs/index.htm atr/index.htm + cp ../../examples/webserver/httpd-cfs/backgrnd.gif atr/backgrnd.gif + cp ../../examples/webserver/httpd-cfs/contiki.gif atr/contiki.gif + cp ../../examples/webserver/httpd-cfs/notfound.htm atr/notfound.htm $(DIR2ATR) -d -b MyDos4534 3200 $@ atr rm -r atr