slp
/
mcu_base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efm32: EFM32 builds and links cleanly now.

This commit is contained in:
Solomon Peachy 2013-08-04 15:27:11 -04:00
parent d22848b96b
commit c3d05fc576
7 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.opts
View File

@ -21,7 +21,22 @@
### c8 db cc cz hb
#MCU=stm32f30x
MCU=stm32f37x
#MCU=stm32f37x
#MCU=efm32g
#MCU_SUBTYPE=efm32g200f16
#MCU=efm32gg
#MCU_SUBTYPE=efm32gg230f1024
#MCU=efm32lg
#MCU_SUBTYPE=efm32lg230f256
#MCU=efm32tg
#MCU_SUBTYPE=efm32tg210f8
MCU=efm32wg
MCU_SUBTYPE=efm32wg280f128
#TARGET_LDCPPFLAGS = -DMCU=$(MCU)
#TARGET_CPPFLAGS = -DVECT_TAB_SRAM

2
libs/efm32g.mk
View File

@ -29,7 +29,7 @@ MCU_LIBS_OBJS += $(EFM32G_OBJS)
# Build Rules
$(LIBDIR)/startup_$(MCU).o: $(LIBDIR)/CMSIS/Device/EnergyMicro/EFM32G/Source/GCC/startup_efm32g.S
@$(E) " AS " $@
$(Q)$(CPP) -p < $< | $(AS) -c -o $@
$(Q)$(CPP) -D_start=main -p < $< | $(AS) -c -o $@
$(LIBDIR)/libefm32g.a: $(EFM32G_OBJS) $(LIBDIR)/startup_$(MCU).o
@$(E) " AR " $@

2
libs/efm32gg.mk
View File

@ -29,7 +29,7 @@ MCU_LIBS_OBJS += $(EFM32GG_OBJS)
# Build Rules
$(LIBDIR)/startup_$(MCU).o: $(LIBDIR)/CMSIS/Device/EnergyMicro/EFM32GG/Source/GCC/startup_efm32gg.S
@$(E) " AS " $@
$(Q)$(CPP) -p < $< | $(AS) -c -o $@
$(Q)$(CPP) -D_start=main -p < $< | $(AS) -c -o $@
$(LIBDIR)/libefm32gg.a: $(EFM32GG_OBJS) $(LIBDIR)/startup_$(MCU).o
@$(E) " AR " $@

2
libs/efm32lg.mk
View File

@ -29,7 +29,7 @@ MCU_LIBS_OBJS += $(EFM32LG_OBJS)
# Build Rules
$(LIBDIR)/startup_$(MCU).o: $(LIBDIR)/CMSIS/Device/EnergyMicro/EFM32LG/Source/GCC/startup_efm32lg.S
@$(E) " AS " $@
$(Q)$(CPP) -p < $< | $(AS) -c -o $@
$(Q)$(CPP) -D_start=main -p < $< | $(AS) -c -o $@
$(LIBDIR)/libefm32lg.a: $(EFM32LG_OBJS) $(LIBDIR)/startup_$(MCU).o
@$(E) " AR " $@

2
libs/efm32tg.mk
View File

@ -29,7 +29,7 @@ MCU_LIBS_OBJS += $(EFM32TG_OBJS)
# Build Rules
$(LIBDIR)/startup_$(MCU).o: $(LIBDIR)/CMSIS/Device/EnergyMicro/EFM32TG/Source/GCC/startup_efm32tg.S
@$(E) " AS " $@
$(Q)$(CPP) -p < $< | $(AS) -c -o $@
$(Q)$(CPP) -D_start=main -p < $< | $(AS) -c -o $@
$(LIBDIR)/libefm32tg.a: $(EFM32TG_OBJS) $(LIBDIR)/startup_$(MCU).o
@$(E) " AR " $@

2
libs/efm32wg.mk
View File

@ -29,7 +29,7 @@ MCU_LIBS_OBJS += $(EFM32WG_OBJS)
# Build Rules
$(LIBDIR)/startup_$(MCU).o: $(LIBDIR)/CMSIS/Device/EnergyMicro/EFM32WG/Source/GCC/startup_efm32wg.S
@$(E) " AS " $@
$(Q)$(CPP) -p < $< | $(AS) -c -o $@
$(Q)$(CPP) -D_start=main -p < $< | $(AS) -c -o $@
$(LIBDIR)/libefm32wg.a: $(EFM32WG_OBJS) $(LIBDIR)/startup_$(MCU).o
@$(E) " AR " $@

3
libs/emlib/src/em_mpu.c
View File

@ -68,12 +68,14 @@
* @{
******************************************************************************/
#if defined(__MPU_PRESENT) && (__MPU_PRESENT == 1)
/*******************************************************************************
************************** GLOBAL FUNCTIONS *******************************
******************************************************************************/
/***************************************************************************//**
* @brief
* Configure an MPU region.
@ -117,6 +119,7 @@ void MPU_ConfigureRegion(const MPU_RegionInit_TypeDef *init)
}
}
#endif
/** @} (end addtogroup CMU) */
/** @} (end addtogroup EM_Library) */