Merge pull request electro-smith#129 from andrewikenberry/develop

CPP daisysp, and performance/stability fixes for libdaisy

.gitignore

@@ -128,3 +128,7 @@ transcode report.txt
 /daisysp/examples/*/build
 hardware_platforms/*/examples/*/build
 hardware_platforms/*/examples/*/VisualGDB/
+daisysp/doc/*.md
+libdaisy/doc/*.md
+core/build
+

core/Makefile

@@ -0,0 +1,239 @@
+#TARGET = ex_bypass
+CHIPSET ?= stm32h7x
+
+PGM_DEVICE ?= interface/stlink-v2.cfg
+
+TARGET_BIN=$(TARGET).bin
+TARGET_ELF=$(TARGET).elf
+FLASH_ADDRESS ?= 0x08000000
+
+
+# If you have the arm-none-eabi- toolchain located in a particular place, but not installed for the entire system, add the path here:
+# GCC_PATH=
+
+######################################
+# OpenOCD stuff
+# TODO: add config.mk file for settings like programmer, etc.
+######################################
+OCD=openocd
+OCD_DIR ?= /usr/local/share/openocd/scripts
+PGM_DEVICE ?= interface/stlink.cfg
+OCDFLAGS = -f $(PGM_DEVICE) -f target/$(CHIPSET).cfg
+
+GDB_FLAGS=
+
+######################################
+# building variables
+######################################
+# debug build?
+#DEBUG = 1
+# optimization
+#OPT = -Og
+OPT ?= -O2
+
+
+######################################
+# paths
+######################################
+
+# Build path
+BUILD_DIR = build
+
+LIBDAISY_DIR ?= \
+./libdaisy
+
+DAISYSP_DIR ?= \
+./daisysp
+
+SYSTEM_FILES_DIR ?= \
+./
+
+######################################
+# source
+######################################
+
+CPP_SOURCES ?= 
+
+C_SOURCES += \
+$(SYSTEM_FILES_DIR)/system_stm32h7xx.c
+
+ASM_SOURCES += \
+$(SYSTEM_FILES_DIR)/startup_stm32h750xx.s
+
+#######################################
+# binaries
+#######################################
+PREFIX = arm-none-eabi-
+# The gcc compiler bin path can be either defined in make command via GCC_PATH variable (> make GCC_PATH=xxx)
+# either it can be added to the PATH environment variable.
+ifdef GCC_PATH
+CC = $(GCC_PATH)/$(PREFIX)gcc
+AS = $(GCC_PATH)/$(PREFIX)gcc -x assembler-with-cpp
+CXX = $(GCC_PATH)/$(PREFIX)g++ 
+CP = $(GCC_PATH)/$(PREFIX)objcopy
+SZ = $(GCC_PATH)/$(PREFIX)size
+else
+CC = $(PREFIX)gcc
+CXX = $(PREFIX)g++ 
+AS = $(PREFIX)gcc -x assembler-with-cpp
+CP = $(PREFIX)objcopy
+SZ = $(PREFIX)size
+endif
+HEX = $(CP) -O ihex
+BIN = $(CP) -O binary -S
+
+#######################################
+# CFLAGS
+#######################################
+# cpu
+CPU = -mcpu=cortex-m7
+
+# fpu
+FPU = -mfpu=fpv5-d16
+
+# float-abi
+FLOAT-ABI = -mfloat-abi=hard
+
+# mcu
+MCU = $(CPU) -mthumb $(FPU) $(FLOAT-ABI)
+
+# macros for gcc
+# AS defines
+AS_DEFS =
+
+# C defines
+C_DEFS =  \
+-DUSE_HAL_DRIVER \
+-DSTM32H750xx \
+-DUSE_HAL_DRIVER \
+-DSTM32H750xx
+
+
+# AS includes
+AS_INCLUDES =
+
+C_INCLUDES = \
+-I$(SYSTEM_FILES_DIR)/ \
+-I$(LIBDAISY_DIR) \
+-I$(LIBDAISY_DIR)/src/ \
+-I$(LIBDAISY_DIR)/Drivers/CMSIS/Include/ \
+-I$(LIBDAISY_DIR)/Drivers/CMSIS/Device/ST/STM32H7xx/Include \
+-I$(LIBDAISY_DIR)/Drivers/STM32H7xx_HAL_Driver/Inc/ \
+-I$(DAISYSP_DIR) \
+
+
+# compile gcc flags
+ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
+
+CFLAGS = $(MCU) $(C_DEFS) $(C_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
+
+ifeq ($(DEBUG), 1)
+CFLAGS += -g -gdwarf-2
+endif
+
+# Generate dependency information
+CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)"
+
+CPPFLAGS = $(CFLAGS)
+CPPFLAGS += \
+-fno-exceptions \
+-fasm \
+-finline \
+-finline-functions-called-once \
+-fshort-enums \
+-fno-move-loop-invariants \
+-fno-unwind-tables \
+
+#######################################
+# LDFLAGS
+#######################################
+# link script
+LDSCRIPT = $(SYSTEM_FILES_DIR)/STM32H750IB_flash.lds
+
+# libraries
+LIBS = -ldaisy -ldaisysp -lc -lm -lnosys
+LIBDIR = -L$(LIBDAISY_DIR)/build -L$(DAISYSP_DIR)/build
+LDFLAGS = $(MCU) -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections
+
+# default action: build all
+all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin
+
+#######################################
+# build the application
+#######################################
+# list of objects
+OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
+vpath %.c $(sort $(dir $(C_SOURCES)))
+OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(CPP_SOURCES:.cpp=.o)))
+vpath %.cpp $(sort $(dir $(CPP_SOURCES)))
+# list of ASM program objects
+OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
+vpath %.s $(sort $(dir $(ASM_SOURCES)))
+
+$(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
+	$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
+
+$(BUILD_DIR)/%.o: %.cpp Makefile | $(BUILD_DIR)
+	$(CXX) -c $(CPPFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.cpp=.lst)) $< -o $@
+
+$(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
+	$(AS) -c $(CFLAGS) $< -o $@
+
+$(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) Makefile
+	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
+	$(SZ) $@
+
+$(BUILD_DIR)/%.hex: $(BUILD_DIR)/%.elf | $(BUILD_DIR)
+	$(HEX) $< $@
+
+$(BUILD_DIR)/%.bin: $(BUILD_DIR)/%.elf | $(BUILD_DIR)
+	$(BIN) $< $@
+
+$(BUILD_DIR):
+	mkdir $@
+
+#######################################
+# clean up
+#######################################
+clean:
+	-rm -fR $(BUILD_DIR)
+
+#######################################
+# openocd recipes
+#######################################
+
+openocd:
+	$(OCD) -s $(OCD_DIR) $(OCDFLAGS)
+
+debug:
+	@if ! nc -z localhost 3333; then \
+        echo "\n\t[Error] OpenOCD is not running! Start it with: 'make openocd'\n"; exit 1; \
+    else \
+        $(GDB)  -ex "target extended localhost:3333" \
+            -ex "monitor arm semihosting enable" \
+            -ex "monitor reset halt" \
+            -ex "load" \
+            -ex "monitor reset init" \
+            $(GDBFLAGS) build/$(TARGET).elf; \
+    fi
+
+debug_client:
+	ddd --eval-command="target remote localhost:3333" --debugger $(GDB) $(TARGET_ELF)
+
+program:
+	$(OCD) -s $(OCD_DIR) $(OCDFLAGS) \
+		-c "program ./build/$(TARGET).elf verify reset exit"
+
+#######################################
+# dfu-util
+#######################################
+
+program-dfu:
+	dfu-util -a 0 -s $(FLASH_ADDRESS):leave -D $(BUILD_DIR)/$(TARGET_BIN)
+
+#######################################
+# dependencies
+#######################################
+-include $(wildcard $(BUILD_DIR)/*.d)
+
+# *** EOF ***

daisysp/examples/bypass/core/STM32H750IB_flash.lds → core/STM32H750IB_flash.lds

@@ -13,9 +13,8 @@ MEMORY
 	RAM_D2 (RWX)  : ORIGIN = 0x30000000, LENGTH = 288K
 	RAM_D3 (RWX)  : ORIGIN = 0x38000000, LENGTH = 64K
 	ITCMRAM (RWX) : ORIGIN = 0x00000000, LENGTH = 64K
-	/* --- begin generated external memories -- */
-	SDRAM (RWX) : ORIGIN = 0xc0000000, LENGTH = 64M
-	/* --- end generated external memories -- */
+	SDRAM (RWX)   : ORIGIN = 0xc0000000, LENGTH = 64M
+    	QSPIFLASH (RWX)  : ORIGIN = 0x90000000, LENGTH = 8M
 }
 
 _estack = 0x20020000;
@@ -122,7 +121,39 @@ SECTIONS
 
 		PROVIDE(__bss_end__ = _ebss);
 	} > SRAM
-	/* --- begin generated external memory sections -- */
+
+	.dtcmram_bss :
+	{
+		. = ALIGN(4);
+		_sdtcmram_bss = .;
+
+		PROVIDE(__dtcmram_bss_start__ = _sdtcmram_bss);
+		*(.dtcmram_bss)
+		*(.dtcmram_bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		_edtcmram_bss = .;
+
+		PROVIDE(__dtcmram_bss_end__ = _edtcmram_bss);
+	} > DTCMRAM
+
+	.sram1_bss :
+	{
+		. = ALIGN(4);
+		_ssram1_bss = .;
+
+		PROVIDE(__sram1_bss_start__ = _sram1_bss);
+		*(.sram1_bss)
+		*(.sram1_bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		_esram1_bss = .;
+
+		PROVIDE(__sram1_bss_end__ = _esram1_bss);
+	} > RAM_D2
+
+
+
 	.sdram_text :
 	{
 		. = ALIGN(4);
@@ -152,7 +183,48 @@ SECTIONS
 		PROVIDE(__sdram_bss_end = _esdram_bss);
 	} > SDRAM
 
-	/* --- end generated external memory sections -- */
+    	.qspiflash_text :
+	{
+		. = ALIGN(4);
+		_sqspiflash_text = .;
+
+		PROVIDE(__qspiflash_text_start = _sqspiflash_text);
+		*(.qspiflash_text)
+		*(.qspiflash_text*)
+		. = ALIGN(4);
+		_eqspiflash_text = .;
+
+		PROVIDE(__qspiflash_text_end = _eqspiflash_text);
+	} > QSPIFLASH
+
+	.qspiflash_data :
+	{
+		. = ALIGN(4);
+		_sqspiflash_data = .;
+
+		PROVIDE(__qspiflash_data_start = _sqspiflash_data);
+		*(.qspiflash_data)
+		*(.qspiflash_data*)
+		. = ALIGN(4);
+		_eqspiflash_data = .;
+
+		PROVIDE(__qspiflash_data_end = _eqspiflash_data);
+	} > QSPIFLASH
+
+	.qspiflash_bss (NOLOAD) :
+	{
+		. = ALIGN(4);
+		_sqspiflash_bss = .;
+
+		PROVIDE(__qspiflash_bss_start = _sqspiflash_bss);
+		*(.qspiflash_bss)
+		*(.qspiflash_bss*)
+		. = ALIGN(4);
+		_eqspiflash_bss = .;
+
+		PROVIDE(__qspiflash_bss_end = _eqspiflash_bss);
+	} > QSPIFLASH
+
 
 
 	PROVIDE(end = .);