sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for the Atollic Pro toolchain; Change extension .ihx to .hex to be better compatible with most of the rest of the world

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4431 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-02-27 19:50:35 +00:00
parent 73e0c43ce1
commit e59c942a68
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/8051/src/Makefile
View File

@ -171,7 +171,7 @@ board/libboard$(LIBEXT):
# This target builds the final executable # This target builds the final executable
pass1.ihx: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBEXT) pass1.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBEXT)
@echo "LD: $@" @echo "LD: $@"
@$(CC) $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ @$(CC) $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
$(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@ $(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@
@ -179,14 +179,14 @@ pass1.ihx: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBE
@rm -f up_allocateheap$(OBJEXT) libarch$(LIBEXT) @rm -f up_allocateheap$(OBJEXT) libarch$(LIBEXT)
@$(MAKE) TOPDIR=$(TOPDIR) libarch$(LIBEXT) @$(MAKE) TOPDIR=$(TOPDIR) libarch$(LIBEXT)
nuttx.ihx: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) nuttx.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS)
@echo "LD: $@" @echo "LD: $@"
@$(CC) $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ @$(CC) $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
$(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@ $(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@
nuttx$(EXEEXT): pass1.ihx nuttx.ihx nuttx$(EXEEXT): pass1.hex nuttx.hex
@rm -f pass1.* @rm -f pass1.*
@packihx nuttx.ihx > $(TOPDIR)/nuttx$(EXEEXT) @packihx nuttx.hex > $(TOPDIR)/nuttx$(EXEEXT)
@cp -f nuttx.map $(TOPDIR)/. @cp -f nuttx.map $(TOPDIR)/.
# This is part of the top-level export target # This is part of the top-level export target
@ -202,11 +202,11 @@ export_head: board/libboard$(LIBEXT) p_head$(OBJEXT)
# This target builds a test program to verify interrupt context switching. irqtest is # This target builds a test program to verify interrupt context switching. irqtest is
# a PHONY target that just sets upt the up_irqtest build correctly # a PHONY target that just sets upt the up_irqtest build correctly
up_irqtest.ihx: $(TESTOBJS) up_irqtest.hex: $(TESTOBJS)
$(CC) $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@ $(CC) $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@
irqtest: irqtest:
@$(MAKE) TOPDIR=../../.. up_irqtest.ihx @$(MAKE) TOPDIR=../../.. up_irqtest.hex
# Build dependencies # Build dependencies

18
arch/z80/src/Makefile.sdcc
View File

@ -145,8 +145,8 @@ board/libboard$(LIBEXT):
# This target builds the final executable # This target builds the final executable
pass1.ihx: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard$(LIBEXT) pass1.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: pass1.ihx" @echo "LD: pass1.hex"
@echo "--" >pass1.lnk # Non-interactive @echo "--" >pass1.lnk # Non-interactive
@echo "-k $(BOARDDIR)" >>pass1.lnk # Path to board library @echo "-k $(BOARDDIR)" >>pass1.lnk # Path to board library
@echo "-k $(SDCCLIBDIR)" >>pass1.lnk # Path to SDCC z80 library @echo "-k $(SDCCLIBDIR)" >>pass1.lnk # Path to SDCC z80 library
@ -169,7 +169,7 @@ endif
@echo "-x" >>pass1.lnk # Hexadecimal @echo "-x" >>pass1.lnk # Hexadecimal
@echo "-m" >>pass1.lnk # Generate a map file @echo "-m" >>pass1.lnk # Generate a map file
@echo "-j" >>pass1.lnk # Generate a symbol file @echo "-j" >>pass1.lnk # Generate a symbol file
@echo "pass1.ihx" >>pass1.lnk # Path to head object @echo "pass1.hex" >>pass1.lnk # Path to head object
@echo "$(HEAD_OBJ)" >>pass1.lnk # Path to head object @echo "$(HEAD_OBJ)" >>pass1.lnk # Path to head object
@echo "-e" >>pass1.lnk # End of script @echo "-e" >>pass1.lnk # End of script
@$(LD) -f pass1.lnk @$(LD) -f pass1.lnk
@ -178,8 +178,8 @@ endif
@$(MAKE) TOPDIR="$(TOPDIR)" libarch$(LIBEXT) @$(MAKE) TOPDIR="$(TOPDIR)" libarch$(LIBEXT)
@$(MAKE) TOPDIR="$(TOPDIR)" $(HEAD_OBJ) @$(MAKE) TOPDIR="$(TOPDIR)" $(HEAD_OBJ)
nuttx.ihx: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx.ihx" @echo "LD: nuttx.hex"
@echo "--" >nuttx.lnk # Non-interactive @echo "--" >nuttx.lnk # Non-interactive
@echo "-k $(BOARDDIR)" >>nuttx.lnk # Path to board library @echo "-k $(BOARDDIR)" >>nuttx.lnk # Path to board library
@echo "-k $(SDCCLIBDIR)" >>nuttx.lnk # Path to SDCC z80 library @echo "-k $(SDCCLIBDIR)" >>nuttx.lnk # Path to SDCC z80 library
@ -202,19 +202,19 @@ endif
@echo "-x" >>nuttx.lnk # Hexadecimal @echo "-x" >>nuttx.lnk # Hexadecimal
@echo "-m" >>nuttx.lnk # Generate a map file @echo "-m" >>nuttx.lnk # Generate a map file
@echo "-j" >>nuttx.lnk # Generate a symbol file @echo "-j" >>nuttx.lnk # Generate a symbol file
@echo "nuttx.ihx" >>nuttx.lnk # Path to head object @echo "nuttx.hex" >>nuttx.lnk # Path to head object
@echo "$(HEAD_OBJ)" >>nuttx.lnk # Path to head object @echo "$(HEAD_OBJ)" >>nuttx.lnk # Path to head object
@echo "-e" >>nuttx.lnk # End of script @echo "-e" >>nuttx.lnk # End of script
@$(LD) -f nuttx.lnk @$(LD) -f nuttx.lnk
nuttx$(EXEEXT): pass1.ihx nuttx.ihx nuttx$(EXEEXT): pass1.hex nuttx.hex
@rm -f pass1.* @rm -f pass1.*
@cp -f nuttx.map $(TOPDIR)/. @cp -f nuttx.map $(TOPDIR)/.
ifeq ($(EXEEXT),.cmd) ifeq ($(EXEEXT),.cmd)
sed s/:00000001FF/:00520001AD/ nuttx.ihx | \ sed s/:00000001FF/:00520001AD/ nuttx.hex | \
hex2cmd > $(TOPDIR)/nuttx.cmd hex2cmd > $(TOPDIR)/nuttx.cmd
else else
@packihx nuttx.ihx > $(TOPDIR)/nuttx$(EXEEXT) @packihx nuttx.hex > $(TOPDIR)/nuttx$(EXEEXT)
endif endif
# This is part of the top-level export target # This is part of the top-level export target