andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM and ARMCMx rules.mk improvements. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3704 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2012-01-02 11:30:14 +00:00
parent 12ba4080d6
commit 2f6d56866c
3 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
os/ports/GCC/ARM/rules.mk
View File

@ -109,58 +109,62 @@ MAKE_ALL_RULE_HOOK:
$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR) $(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR)
$(BUILDDIR): $(BUILDDIR):
@echo $(SRCPATHS) ifneq ($(USE_VERBOSE_COMPILE),yes)
@echo Compiler Options
@echo $(CC) -c $(CFLAGS) -I. $(IINCDIR) main.c -o main.o
@echo
endif
mkdir $(BUILDDIR) mkdir $(BUILDDIR)
$(OBJDIR): $(OBJDIR): $(BUILDDIR)
mkdir $(OBJDIR) mkdir $(OBJDIR)
$(LSTDIR): $(LSTDIR): $(BUILDDIR)
mkdir $(LSTDIR) mkdir $(LSTDIR)
$(ACPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile $(ACPPOBJS) : $(OBJDIR)/%.o : %.cpp $(OBJDIR) $(LSTDIR) Makefile
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CPPC) -c $(CPPFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@ $(CPPC) -c $(CPPFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
else else
@echo Compiling $< @echo Compiling $<
@$(CPPC) -c $(CPPFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@ @$(CPPC) -c $(CPPFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(TCPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile $(TCPPOBJS) : $(OBJDIR)/%.o : %.cpp $(OBJDIR) $(LSTDIR) Makefile
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CPPC) -c $(CPPFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@ $(CPPC) -c $(CPPFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
else else
@echo Compiling $< @echo Compiling $<
@$(CPPC) -c $(CPPFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@ @$(CPPC) -c $(CPPFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(ACOBJS) : $(OBJDIR)/%.o : %.c Makefile $(ACOBJS) : $(OBJDIR)/%.o : %.c $(OBJDIR) $(LSTDIR) Makefile
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(CFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@ $(CC) -c $(CFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
else else
@echo Compiling $< @echo Compiling $<
@$(CC) -c $(CFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@ @$(CC) -c $(CFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(TCOBJS) : $(OBJDIR)/%.o : %.c Makefile $(TCOBJS) : $(OBJDIR)/%.o : %.c $(OBJDIR) $(LSTDIR) Makefile
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(CFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@ $(CC) -c $(CFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
else else
@echo Compiling $< @echo Compiling $<
@$(CC) -c $(CFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@ @$(CC) -c $(CFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(ASMOBJS) : $(OBJDIR)/%.o : %.s Makefile $(ASMOBJS) : $(OBJDIR)/%.o : %.s $(OBJDIR) $(LSTDIR) Makefile
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(AS) -c $(ASFLAGS) -I . $(IINCDIR) $< -o $@ $(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@
else else
@echo Compiling $< @echo Compiling $<
@$(AS) -c $(ASFLAGS) -I . $(IINCDIR) $< -o $@ @$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@
endif endif
%.elf: $(OBJS) $(LDSCRIPT) %.elf: $(OBJS) $(LDSCRIPT)

40
os/ports/GCC/ARMCMx/rules.mk
View File

@ -109,58 +109,62 @@ MAKE_ALL_RULE_HOOK:
$(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR) $(OBJS): | $(BUILDDIR) $(OBJDIR) $(LSTDIR)
$(BUILDDIR): $(BUILDDIR):
@echo $(SRCPATHS) ifneq ($(USE_VERBOSE_COMPILE),yes)
@echo Compiler Options
@echo $(CC) -c $(CFLAGS) -I. $(IINCDIR) main.c -o main.o
@echo
endif
mkdir $(BUILDDIR) mkdir $(BUILDDIR)
$(OBJDIR): $(OBJDIR): $(BUILDDIR)
mkdir $(OBJDIR) mkdir $(OBJDIR)
$(LSTDIR): $(LSTDIR): $(BUILDDIR)
mkdir $(LSTDIR) mkdir $(LSTDIR)
$(ACPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile $(ACPPOBJS) : $(OBJDIR)/%.o : %.cpp $(OBJDIR) $(LSTDIR) Makefile
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CPPC) -c $(CPPFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@ $(CPPC) -c $(CPPFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
else else
@echo Compiling $< @echo Compiling $<
@$(CPPC) -c $(CPPFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@ @$(CPPC) -c $(CPPFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(TCPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile $(TCPPOBJS) : $(OBJDIR)/%.o : %.cpp $(OBJDIR) $(LSTDIR) Makefile
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CPPC) -c $(CPPFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@ $(CPPC) -c $(CPPFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
else else
@echo Compiling $< @echo Compiling $<
@$(CPPC) -c $(CPPFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@ @$(CPPC) -c $(CPPFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(ACOBJS) : $(OBJDIR)/%.o : %.c Makefile $(ACOBJS) : $(OBJDIR)/%.o : %.c $(OBJDIR) $(LSTDIR) Makefile
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(CFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@ $(CC) -c $(CFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
else else
@echo Compiling $< @echo Compiling $<
@$(CC) -c $(CFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@ @$(CC) -c $(CFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(TCOBJS) : $(OBJDIR)/%.o : %.c Makefile $(TCOBJS) : $(OBJDIR)/%.o : %.c $(OBJDIR) $(LSTDIR) Makefile
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(CC) -c $(CFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@ $(CC) -c $(CFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
else else
@echo Compiling $< @echo Compiling $<
@$(CC) -c $(CFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@ @$(CC) -c $(CFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@
endif endif
$(ASMOBJS) : $(OBJDIR)/%.o : %.s Makefile $(ASMOBJS) : $(OBJDIR)/%.o : %.s $(OBJDIR) $(LSTDIR) Makefile
ifeq ($(USE_VERBOSE_COMPILE),yes) ifeq ($(USE_VERBOSE_COMPILE),yes)
@echo @echo
$(AS) -c $(ASFLAGS) -I . $(IINCDIR) $< -o $@ $(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@
else else
@echo Compiling $< @echo Compiling $<
@$(AS) -c $(ASFLAGS) -I . $(IINCDIR) $< -o $@ @$(AS) -c $(ASFLAGS) -I. $(IINCDIR) $< -o $@
endif endif
%.elf: $(OBJS) $(LDSCRIPT) %.elf: $(OBJS) $(LDSCRIPT)

3
readme.txt
View File

@ -78,6 +78,9 @@
- FIX: Fixed SYSCFG clock not started in STM32L1/F4 HALs (bug 3449139). - FIX: Fixed SYSCFG clock not started in STM32L1/F4 HALs (bug 3449139).
- FIX: Fixed wrong definitions in STM32L-Discovery board file (bug 3449076). - FIX: Fixed wrong definitions in STM32L-Discovery board file (bug 3449076).
- OPT: Improved the exception exit code in the GCC Cortex-Mx ports. - OPT: Improved the exception exit code in the GCC Cortex-Mx ports.
- NEW: Modified ARM and ARMCMx build rules to allow parallel build. Now the
log outputs one dummy compilation command in order to allow paths discovery
by Eclipse.
- NEW: Added an utility module to access LIS302DL MEMS using a SPI. - NEW: Added an utility module to access LIS302DL MEMS using a SPI.
- NEW: Updated STM32F2xx support by inheriting the work done on the STM32F4xx, - NEW: Updated STM32F2xx support by inheriting the work done on the STM32F4xx,
the whole thing is untested because lack of hardware. the whole thing is untested because lack of hardware.