Compare commits

..

No commits in common. "8e25f5ddb1404b1bdffc951f60d02dbcdc9bcfec" and "3861b82515d89f9f89e980fd54e88b6e287f9ea1" have entirely different histories.

8 changed files with 5 additions and 25 deletions

1
.gitignore vendored
View File

@ -3,7 +3,6 @@ project.elf
*.map *.map
*.bin *.bin
*.hex *.hex
*.lss
*.user *.user
*.user* *.user*
*.user.* *.user.*

View File

@ -10,7 +10,7 @@ INCLUDEPATH = -Iinclude
target = project target = project
LIBRARYPATH = -Lstartup -Ldsp LIBRARYPATH = -Lstartup -Ldsp
LIBRARIES = -larm_cortexM7lfsp_math -lm LIBRARIES = -larm_cortexM7lfsp_math
DEFINES = -DSTM32F746xx -DSTM32F7XX -DARM_MATH_CM7 DEFINES = -DSTM32F746xx -DSTM32F7XX -DARM_MATH_CM7
mapfile = memmap mapfile = memmap
@ -40,13 +40,15 @@ ASOBJ = $(ASFILES:%.S=%.S.o)
default: $(target).elf default: $(target).elf
binary: $(target).bin $(target).hex
%.bin: %.elf %.bin: %.elf
$(OBJCOPY) -O binary $^ $@ $(OBJCOPY) -O binary $^ $@
%.hex: %.elf %.hex: %.elf
$(OBJCOPY) -O ihex $^ $@ $(OBJCOPY) -O ihex $^ $@
#Linking #Linking
$(target).elf: $(OBJ) $(ASOBJ) $(target).elf: $(OBJ) $(ASOBJ)
$(CC) $(LFLAGS) $(LIBRARYPATH) -o $@ $^ $(LIBRARIES) $(CC) $(LFLAGS) $(LIBRARYPATH) -o $@ $^ $(LIBRARIES)

View File

@ -299,7 +299,7 @@
#define __CMSIS_GENERIC /* disable NVIC and Systick functions */ #define __CMSIS_GENERIC /* disable NVIC and Systick functions */
#if defined(ARM_MATH_CM7) #if defined(ARM_MATH_CM7)
#include <cmsis/core_cm7.h> #include "core_cm7.h"
#elif defined (ARM_MATH_CM4) #elif defined (ARM_MATH_CM4)
#include "core_cm4.h" #include "core_cm4.h"
#elif defined (ARM_MATH_CM3) #elif defined (ARM_MATH_CM3)

1
main.c
View File

@ -1,6 +1,5 @@
#include <stm32f7xx.h> #include <stm32f7xx.h>
unsigned int i = 0x12345678; unsigned int i = 0x12345678;
unsigned char c = 2; unsigned char c = 2;

View File

@ -1,6 +0,0 @@
// Add predefined macros for your project here. For example:
// #define THE_ANSWER 42
#define STM32F746xx
#define STM32F7XX
#define ARM_MATH_CM7

View File

@ -1 +0,0 @@
[General]

View File

@ -1,12 +0,0 @@
include/arm_math.h
include/cmsis/cmsis_gcc.h
include/cmsis/core_cm7.h
include/cmsis/core_cmFunc.h
include/cmsis/core_cmInstr.h
include/cmsis/core_cmSimd.h
include/stm32f746xx.h
include/stm32f7xx.h
main.c
setup/system_init.c
startup/startup_stm32f746.c
syscalls/syscalls.c

View File

@ -1 +0,0 @@
include