Skip to content

Commit

Permalink
Merge pull request contiki-os#1706 from oliverschmidt/master
Browse files Browse the repository at this point in the history 
Make use of new cl65 option --print-target-path.
  • Loading branch information
@oliverschmidt
oliverschmidt committed Jun 3, 2016
2 parents 71dcbe0 + ae0c5f0 commit 0151a7c
Show file tree
Hide file tree
Showing 7 changed files with 192 additions and 197 deletions.
1 change: 0 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ before_script:
git clone https://github.com/cc65/cc65 /tmp/cc65 &&
make -C /tmp/cc65 bin apple2enh atarixl c64 c128 &&
sudo make -C /tmp/cc65 avail &&
export CC65_HOME=/tmp/cc65/ &&
cc65 --version ;
fi

Expand Down
6 changes: 2 additions & 4 deletions cpu/6502/Makefile.6502
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@
# Author: Oliver Schmidt <[email protected]>
#

ifndef CC65_HOME
${error CC65_HOME not defined! You must specify where cc65 resides}
endif

.SUFFIXES:

CONTIKI_TARGET_DIRS = . lib sys
Expand Down Expand Up @@ -70,3 +66,5 @@ ASFLAGS = -t $(TARGET)
CFLAGS += -t $(TARGET) -Or -W -unused-param
LDFLAGS = -t $(TARGET) -m contiki-$(TARGET).map -D __STACKSIZE__=0x200
AROPTS = a

CC65_TARGET_DIR := $(shell $(CC) --print-target-path)/$(TARGET)
4 changes: 2 additions & 2 deletions platform/apple2enh/Makefile.apple2enh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ endif

disk: all
cp $(CONTIKI)/tools/$(TARGET)/prodos.dsk contiki.dsk
java -jar $(AC) -p contiki.dsk contiki.system sys < $(CC65_HOME)/targetutil/loader.system
java -jar $(AC) -p contiki.dsk contiki.system sys < $(CC65_TARGET_DIR)/util/loader.system
java -jar $(AC) -cc65 contiki.dsk contiki bin < $(CONTIKI_PROJECT).$(TARGET)
java -jar $(AC) -p contiki.dsk contiki.cfg bin 0 < $(CONTIKI)/tools/$(TARGET)/sample.cfg
java -jar $(AC) -p contiki.dsk cs8900a.eth rel 0 < cs8900a.eth
java -jar $(AC) -p contiki.dsk lan91c96.eth rel 0 < lan91c96.eth
java -jar $(AC) -p contiki.dsk w5100.eth rel 0 < w5100.eth
ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE)
java -jar $(AC) -p contiki.dsk contiki.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
java -jar $(AC) -p contiki.dsk contiki.mou rel 0 < $(CC65_TARGET_DIR)/drv/mou/a2e.stdmou.mou
endif
ifeq ($(HTTPD-CFS),1)
java -jar $(AC) -p contiki.dsk index.htm bin 0 < httpd-cfs/index.htm
Expand Down
2 changes: 1 addition & 1 deletion platform/atarixl/Makefile.atarixl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ disk: all
cp $(CONTIKI)/tools/$(TARGET)/sample.cfg atr/contiki.cfg
cp cs8900a.eth atr/cs8900a.eth
ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE)
cp $(CC65_HOME)/mou/atrxst.mou atr/contiki.mou
cp $(CC65_TARGET_DIR)/drv/mou/atrxst.mou atr/contiki.mou
endif
ifeq ($(HTTPD-CFS),1)
cp httpd-cfs/index.htm atr/index.htm
Expand Down
18 changes: 9 additions & 9 deletions platform/c128/Makefile.c128
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ endif

disk: all
$(C1541) -format contiki,00 d71 contiki.d71
$(C1541) -attach contiki.d71 -write $(CONTIKI_PROJECT).$(TARGET) contiki,p
$(C1541) -attach contiki.d71 -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg,s
$(C1541) -attach contiki.d71 -write cs8900a.eth cs8900a.eth,s
$(C1541) -attach contiki.d71 -write lan91c96.eth lan91c96.eth,s
$(C1541) -attach contiki.d71 -write $(CONTIKI_PROJECT).$(TARGET) contiki,p
$(C1541) -attach contiki.d71 -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg,s
$(C1541) -attach contiki.d71 -write cs8900a.eth cs8900a.eth,s
$(C1541) -attach contiki.d71 -write lan91c96.eth lan91c96.eth,s
ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE)
$(C1541) -attach contiki.d71 -write $(CC65_HOME)/mou/c128-1351.mou contiki.mou,s
$(C1541) -attach contiki.d71 -write $(CC65_TARGET_DIR)/drv/mou/c128-1351.mou contiki.mou,s
endif
ifeq ($(HTTPD-CFS),1)
$(C1541) -attach contiki.d71 -write httpd-cfs/index.htm index.htm,s
$(C1541) -attach contiki.d71 -write httpd-cfs/backgrnd.gif backgrnd.gif,s
$(C1541) -attach contiki.d71 -write httpd-cfs/contiki.gif contiki.gif,s
$(C1541) -attach contiki.d71 -write httpd-cfs/notfound.htm notfound.htm,s
$(C1541) -attach contiki.d71 -write httpd-cfs/index.htm index.htm,s
$(C1541) -attach contiki.d71 -write httpd-cfs/backgrnd.gif backgrnd.gif,s
$(C1541) -attach contiki.d71 -write httpd-cfs/contiki.gif contiki.gif,s
$(C1541) -attach contiki.d71 -write httpd-cfs/notfound.htm notfound.htm,s
endif
18 changes: 9 additions & 9 deletions platform/c64/Makefile.c64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ endif

disk: all
$(C1541) -format contiki,00 d64 contiki.d64
$(C1541) -attach contiki.d64 -write $(CONTIKI_PROJECT).$(TARGET) contiki,p
$(C1541) -attach contiki.d64 -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg,s
$(C1541) -attach contiki.d64 -write cs8900a.eth cs8900a.eth,s
$(C1541) -attach contiki.d64 -write lan91c96.eth lan91c96.eth,s
$(C1541) -attach contiki.d64 -write $(CONTIKI_PROJECT).$(TARGET) contiki,p
$(C1541) -attach contiki.d64 -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg,s
$(C1541) -attach contiki.d64 -write cs8900a.eth cs8900a.eth,s
$(C1541) -attach contiki.d64 -write lan91c96.eth lan91c96.eth,s
ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE)
$(C1541) -attach contiki.d64 -write $(CC65_HOME)/mou/c64-1351.mou contiki.mou,s
$(C1541) -attach contiki.d64 -write $(CC65_TARGET_DIR)/drv/mou/c64-1351.mou contiki.mou,s
endif
ifeq ($(HTTPD-CFS),1)
$(C1541) -attach contiki.d64 -write httpd-cfs/index.htm index.htm,s
$(C1541) -attach contiki.d64 -write httpd-cfs/backgrnd.gif backgrnd.gif,s
$(C1541) -attach contiki.d64 -write httpd-cfs/contiki.gif contiki.gif,s
$(C1541) -attach contiki.d64 -write httpd-cfs/notfound.htm notfound.htm,s
$(C1541) -attach contiki.d64 -write httpd-cfs/index.htm index.htm,s
$(C1541) -attach contiki.d64 -write httpd-cfs/backgrnd.gif backgrnd.gif,s
$(C1541) -attach contiki.d64 -write httpd-cfs/contiki.gif contiki.gif,s
$(C1541) -attach contiki.d64 -write httpd-cfs/notfound.htm notfound.htm,s
endif
Loading

0 comments on commit 0151a7c

Please sign in to comment.