Remvoe Qtcreator project files

bitfileds for clock config.

.gitignore

@@ -1,8 +1,11 @@
 project.elf
+*.lss
 *.o
 *.map
 *.bin
 *.hex
+*.lss
 *.user
 *.user*
 *.user.*
+obj/*

Makefile

@@ -7,10 +7,11 @@ CFILES 	= main.c syscalls/syscalls.c setup/system_init.c startup/startup_stm32f7
 ASFILES =
 INCLUDEPATH = -Iinclude
 
+OBJDIR := obj
 
-target	= project
+TARGET	= project
 LIBRARYPATH = -Lstartup -Ldsp
-LIBRARIES = -larm_cortexM7lfsp_math
+LIBRARIES = -larm_cortexM7lfsp_math -lm
 
 DEFINES = -DSTM32F746xx -DSTM32F7XX -DARM_MATH_CM7
 mapfile = memmap
@@ -29,58 +30,59 @@ SIZE=arm-none-eabi-size
 LFLAGS = -mlittle-endian -mthumb -mcpu=cortex-m7 -mthumb-interwork 
 LFLAGS += -mfloat-abi=hard -mfpu=fpv5-sp-d16 --disable-newlib-supplied-syscalls -nostartfiles
 LFLAGS += -Tstm32f746zgt-axim.ld -Wl,-Map=$(mapfile).map -Wl,--gc-sections
+LFLAGS += -Wl,--print-memory-usage
 
-CFLAGS = -c -fmessage-length=0 -mlittle-endian -mthumb -mcpu=cortex-m7 -mthumb-interwork
+CFLAGS = -fmessage-length=0 -mlittle-endian -mthumb -mcpu=cortex-m7 -mthumb-interwork
 CFLAGS += -mfloat-abi=hard -mfpu=fpv5-sp-d16 -nostartfiles -Wall
 
 ####################################################################################
 
-OBJ = $(CFILES:%.c=%.c.o)
-ASOBJ = $(ASFILES:%.S=%.S.o)
-
-default: $(target).elf
-
+OBJ = $(CFILES:%.c=$(OBJDIR)/%.c.o)
+ASOBJ = $(ASFILES:%.S=$(OBJDIR)/%.S.o)
 
+DEPENDENCY_FILES = $(CFILES:%.c=$(OBJDIR)/%.c.d) $(ASFILES:%.S=$(OBJDIR)/%.S.d)
 
+default: $(TARGET).elf
 
 %.bin: %.elf
-	$(OBJCOPY) -O binary $^ $@
+	@echo [BIN] $@
+	@$(OBJCOPY) -O binary $^ $@
 %.hex: %.elf
-	$(OBJCOPY) -O ihex $^ $@
-
+	@echo [HEX] $@
+	@$(OBJCOPY) -O ihex $^ $@
 
 #Linking
-$(target).elf: $(OBJ) $(ASOBJ)
-	$(CC) $(LFLAGS) $(LIBRARYPATH) -o $@ $^ $(LIBRARIES)
-	$(SIZE) $@	
+$(TARGET).elf: $(OBJ) $(ASOBJ)
+	@$(CC) $(LFLAGS) $(LIBRARYPATH) -o $@ $^ $(LIBRARIES)
+	@$(SIZE) $@
 
 #Compiling
-%.c.o: %.c
-	$(CC) $(CFLAGS) $(INCLUDEPATH) $(DEFINES) -o $@ $<
+$(OBJ):
+	@echo [CC] $@
+	@mkdir -p $(@D)
+	@$(CC) $(CFLAGS) -MMD -MT $@ $(INCLUDEPATH) $(DEFINES) -o $@ -c $(@:$(OBJDIR)/%.c.o=%.c)
 	
-%.S.o: %.S
-	$(CC) $(CFLAGS) $(INCLUDEPATH) $(DEFINES) -o $@ $<
+$(ASOBJ):
+	@echo [AS] $@
+	@mkdir -p $(@D)
+	@$(CC) $(CFLAGS) -MMD -MT $@ $(INCLUDEPATH) $(DEFINES) -o $@ -c $(@:$(OBJDIR)/%.S.o=%.S)
 
-.PHONY: qtproject clean mrproper objcopy disassemble
+.PHONY: clean mrproper objcopy disassemble binary
 
-disassemble: $(target).elf
-	$(OBJDUMP) -D -s $< > $(target).lss
+binary: $(TARGET).bin $(TARGET).hex
 
-objcopy: $(target).bin $(target).hex
+disassemble: $(TARGET).elf
+	$(OBJDUMP) -D -s $< > $(TARGET).lss
+
+objcopy: $(TARGET).bin $(TARGET).hex
 
 mrproper:
-	rm -f $(target).pro
+	rm -f $(TARGET).pro
 
 clean:
-	rm -f $(target).elf $(target).bin $(target).hex $(OBJ) $(ASOBJ) $(mapfile).map $(target).lss
-qtproject:
-	echo -e "TEMPLATE = app\nCONFIG -= console app_bundle qt" > $(target).pro
-	echo -e "SOURCES += $(CFILES) $(ASFILES)" >> $(target).pro
-	echo -ne "INCLUDEPATH += " >> $(target).pro
-	echo "$(INCLUDEPATH)" | sed "s!-I!./!g" >> $(target).pro
-	echo -ne "HEADERS += " >> $(target).pro
-	find -name "*.h" | tr "\\n" " " >> $(target).pro
-	echo -ne "\nDEFINES += " >> $(target).pro
-	echo "$(DEFINES)" | sed "s/-D//g" >> $(target).pro
-
+	@echo [RM] in $(OBJDIR)
+	@rm -f $(TARGET).elf $(TARGET).bin $(TARGET).hex $(OBJ) $(ASOBJ) $(mapfile).map $(TARGET).lss $(DEPENDENCY_FILES)
+	@rm -rf $(OBJDIR)/*
 
+# Include dependency files, if available
+-include $(DEPENDENCY_FILES)

include/arm_math.h

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

main.c

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

setup/system_init.c

@@ -4,6 +4,7 @@ const signed char __pll_main_div_q_val[] = {-1, -1, 2, 3, 4, 5, 6, 7, 8 ,9, 10,
 const signed char __pll_main_div_p_val[] = {-1, -1, 0, -1, 1, -1, 2, -1, 3};
 const signed char __mco_div_val[] = {-1, 0, 4, 5, 6, 7};
 const signed char __apb_presc_val[] = {-1, 0, 4, -1, 5, -1, -1, -1, 6, -1, -1, -1, -1, -1, -1, -1, 7};
+const signed char *__pll_i2s_div_p_val = __pll_main_div_p_val;
 #define SYSINIT_MAIN_I2S_PLL_DIV_M_MIN (2)
 #define SYSINIT_MAIN_I2S_PLL_DIV_M_MAX (63)
 #define SYSINIT_MAIN_I2S_PLL_MULT_N_MIN (2)
@@ -40,13 +41,14 @@ struct clock_config {
 	uint32_t pll_main_on : 1;
 	uint32_t css_on	: 1;
 	uint32_t hse_bypass : 1;
+    uint32_t lse_bypass : 1;
 	uint32_t hsi_trim : 5;
 	/* Main PLL Conf */
 	uint32_t pll_main_i2s_src : 1;
 	uint32_t pll_main_div_q : 4; /* true value */
 	uint32_t pll_main_div_p : 3; /* true value */
 	uint32_t pll_main_mult_n : 9;
-	uint32_t pll_main_div_m : 6;
+    uint32_t pll_div_m : 6;
 	/* MCO Outputs */
 	uint32_t mco2_sel : 2;
 	uint32_t mco2_presc : 3;
@@ -55,13 +57,19 @@ struct clock_config {
 	uint32_t i2s_src : 1;
 	/* RTC */
 	uint32_t rtc_hse_div_1_meg : 5;
+    uint32_t rtc_clock_en : 1;
 	/* APB */
 	uint32_t apb1_presc : 5;
 	uint32_t apb2_presc : 5;
 	/* Systemclock */
 	uint32_t sysclk_src : 2;
-	
-	
+    /* PLLI2S */
+    uint32_t pll_i2s_r : 3;
+    uint32_t pll_i2s_q : 4;
+    uint32_t pll_i2s_p : 4; /* true value */
+    uint32_t pll_i2s_mult : 9;
+    /* PLLSAI */
+
 	/* AHB */
 	enum sysinit_ahb_presc ahb_presc;
 };