deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1730 from groessler/something_to_pull

Browse source 
Some 6502 target changes
This commit is contained in:
Oliver Schmidt 2016-07-06 09:17:39 +02:00 committed by GitHub
parent 80b9bfea93 4373aecec2
commit 98a795b967
3 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/atarixl/Makefile.atarixl
View file

@ -35,7 +35,7 @@ CONTIKI_CPU = $(CONTIKI)/cpu/6502
include $(CONTIKI_CPU)/Makefile.6502 include $(CONTIKI_CPU)/Makefile.6502
SHADOW_RAM_SOURCEFILES = ethernet.c ethernet-drv.c timer.c uip.c uiplib.c SHADOW_RAM_SOURCEFILES = ethernet.c ethernet-drv.c timer.c uip.c uiplib.c
SHADOW_RAM2_SOURCEFILES = clock.c uip_arch.c uip_arp.c SHADOW_RAM2_SOURCEFILES = clock.c uip_arch.c uip_arp.c unload.c random.c
# Set target-specific variable values # Set target-specific variable values
${addprefix $(OBJECTDIR)/,${call oname, $(SHADOW_RAM_SOURCEFILES)}}: CFLAGS += --code-name SHADOW_RAM ${addprefix $(OBJECTDIR)/,${call oname, $(SHADOW_RAM_SOURCEFILES)}}: CFLAGS += --code-name SHADOW_RAM

1
platform/atarixl/contiki-conf.h
View file

@ -60,5 +60,6 @@
#define WWW_CONF_WEBPAGE_WIDTH 40 #define WWW_CONF_WEBPAGE_WIDTH 40
#define WWW_CONF_WEBPAGE_HEIGHT 19 #define WWW_CONF_WEBPAGE_HEIGHT 19
#define WWW_CONF_HISTORY_SIZE 4 #define WWW_CONF_HISTORY_SIZE 4
#define WWW_CONF_WGET_EXEC(url) exec("wget.com", url)
#endif /* CONTIKI_CONF_H_ */ #endif /* CONTIKI_CONF_H_ */

44
tools/6502/Makefile
View file

@ -31,10 +31,6 @@
# Author: Oliver Schmidt <ol.sc@web.de> # Author: Oliver Schmidt <ol.sc@web.de>
# #
ifndef CONTIKI
${error CONTIKI not defined! You must specify where Contiki resides}
endif
ifndef AC ifndef AC
${error AC not defined! You must specify where the AppleCommander jar resides} ${error AC not defined! You must specify where the AppleCommander jar resides}
endif endif
@ -48,6 +44,7 @@ ifndef DIR2ATR
endif endif
all: apple2 atari c64 c128 all: apple2 atari c64 c128
clean: apple2-clean atari-clean c64-clean c128-clean
ifeq ($(shell echo),) ifeq ($(shell echo),)
NULLDEV = /dev/null NULLDEV = /dev/null
@ -65,26 +62,33 @@ endif
CC65 := $(shell cl65 --print-target-path) CC65 := $(shell cl65 --print-target-path)
define makes define makes
$1-makes: .PHONY: $1-$2makes
$(MAKE) -C ../../cpu/6502/ethconfig TARGET=$1 $1-$2makes:
$(MAKE) -C ../../cpu/6502/ipconfig TARGET=$1 $(MAKE) -C ../../cpu/6502/ethconfig TARGET=$1 $2
$(MAKE) -C ../../examples/webbrowser TARGET=$1 $(MAKE) -C ../../cpu/6502/ipconfig TARGET=$1 $2
$(MAKE) -C ../../examples/webbrowser-80col TARGET=$1 $(MAKE) -C ../../examples/webbrowser TARGET=$1 $2
$(MAKE) -C ../../examples/wget TARGET=$1 $(MAKE) -C ../../examples/webbrowser-80col TARGET=$1 $2
$(MAKE) -C ../../examples/irc TARGET=$1 $(MAKE) -C ../../examples/wget TARGET=$1 $2
$(MAKE) -C ../../examples/irc-80col TARGET=$1 $(MAKE) -C ../../examples/irc TARGET=$1 $2
$(MAKE) -C ../../examples/webserver TARGET=$1 HTTPD-CFS=1 $(MAKE) -C ../../examples/irc-80col TARGET=$1 $2
$(MAKE) -C ../../examples/telnet-server TARGET=$1 $(MAKE) -C ../../examples/webserver TARGET=$1 HTTPD-CFS=1 $2
$(MAKE) -C ../../examples/telnet-server TARGET=$1 $2
endef endef
$(eval $(call makes,apple2enh)) $(eval $(call makes,apple2enh))
$(eval $(call makes,apple2enh,clean))
%.zip: %.zip:
zip $@ $^ zip $@ $^
echo $(ZIPCOMMENT) | zip -z $@ echo $(ZIPCOMMENT) | zip -z $@
.PHONY: apple2 apple2-clean atari atari-clean c64 c64-clean c128 c128-clean
apple2: contiki-apple2.zip apple2: contiki-apple2.zip
apple2-clean: apple2enh-cleanmakes
rm -f contiki-apple2.zip contiki-apple2-1.dsk contiki-apple2-2.dsk contiki-apple2-3.dsk contiki-apple2.po
contiki-apple2.zip: contiki-apple2-1.dsk contiki-apple2-2.dsk contiki-apple2-3.dsk contiki-apple2.po contiki-apple2.zip: contiki-apple2-1.dsk contiki-apple2-2.dsk contiki-apple2-3.dsk contiki-apple2.po
contiki-apple2-1.dsk: apple2enh-makes contiki-apple2-1.dsk: apple2enh-makes
@ -168,9 +172,13 @@ contiki-apple2.po: apple2enh-makes
java -jar $(AC) -p $@ notfound.htm bin 0 < ../../examples/webserver/httpd-cfs/notfound.htm java -jar $(AC) -p $@ notfound.htm bin 0 < ../../examples/webserver/httpd-cfs/notfound.htm
$(eval $(call makes,atarixl)) $(eval $(call makes,atarixl))
$(eval $(call makes,atarixl,clean))
atari: contiki-atari.zip atari: contiki-atari.zip
atari-clean: atarixl-cleanmakes
rm -f contiki-atari.zip contiki-atari-1.atr contiki-atari-2.atr contiki-atari-3.atr contiki-atari.atr
contiki-atari.zip: contiki-atari-1.atr contiki-atari-2.atr contiki-atari-3.atr contiki-atari.atr contiki-atari.zip: contiki-atari-1.atr contiki-atari-2.atr contiki-atari-3.atr contiki-atari.atr
contiki-atari-1.atr: atarixl-makes contiki-atari-1.atr: atarixl-makes
@ -252,9 +260,13 @@ contiki-atari.atr: atarixl-makes
rm -r atr rm -r atr
$(eval $(call makes,c64)) $(eval $(call makes,c64))
$(eval $(call makes,c64,clean))
c64: contiki-c64.zip c64: contiki-c64.zip
c64-clean: c64-cleanmakes
rm -f contiki-c64.zip contiki-c64-1.d64 contiki-c64-2.d64 contiki-c64-3.d64 contiki-c64.d71 contiki-c64.d81
contiki-c64.zip: contiki-c64-1.d64 contiki-c64-2.d64 contiki-c64-3.d64 contiki-c64.d71 contiki-c64.d81 contiki-c64.zip: contiki-c64-1.d64 contiki-c64-2.d64 contiki-c64-3.d64 contiki-c64.d71 contiki-c64.d81
contiki-c64-1.d64: c64-makes contiki-c64-1.d64: c64-makes
@ -351,9 +363,13 @@ contiki-c64.d81: c64-makes
$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV) $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV)
$(eval $(call makes,c128)) $(eval $(call makes,c128))
$(eval $(call makes,c128,clean))
c128: contiki-c128.zip c128: contiki-c128.zip
c128-clean: c128-cleanmakes
rm -f contiki-c128.zip contiki-c128-1.d64 contiki-c128-2.d64 contiki-c128.d71 contiki-c128.d81
contiki-c128.zip: contiki-c128-1.d64 contiki-c128-2.d64 contiki-c128.d71 contiki-c128.d81 contiki-c128.zip: contiki-c128-1.d64 contiki-c128-2.d64 contiki-c128.d71 contiki-c128.d81
contiki-c128-1.d64: c128-makes contiki-c128-1.d64: c128-makes