goran-mahovlic
/
eez-flow-template-stm32l496g-disco
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Exclude scpi from build - getting to missing ltdc - l4 does not have ltdc

main
Goran Mahovlic 2 years ago
parent
c9e3addf28
commit
06c4d4c35a
8 changed files with 117 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      .cproject
  2. 27
      Debug/Drivers/BSP/Components/ft6x06/subdir.mk
  3. 27
      Debug/Drivers/BSP/Components/mfxstm32l152/subdir.mk
  4. 27
      Debug/Drivers/BSP/Components/st7789h2/subdir.mk
  5. 4
      Debug/makefile
  6. 12
      Debug/objects.list
  7. 4
      Debug/sources.mk
  8. 2
      Middlewares/eez/platform/stm32/display.cpp

27
.cproject
Unescape View File

@ -142,11 +142,36 @@
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.501148177" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
</toolChain>
</folderInfo>
<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.492497308.453934513" name="/" resourcePath="Middlewares/eez/libs/libscpi">
<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.31728627" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug" unusedChildren="">
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.268277717.1270403439" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.268277717"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.605903784.62114728" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.605903784"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.231107333.1465590823" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.231107333"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.114505375.655393161" name="Floating-point unit" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.114505375"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.2145459000.1950630946" name="Floating-point ABI" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.2145459000"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1341431598.141589236" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1341431598"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.660901030.1640601035" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.660901030"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.1761325588.264451482" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.1761325588"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.548740340" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1032500835"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1172685210" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.699083586"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1556601395" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1862481145"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1271820121" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.124354128"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1542043225" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1724686711"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.742351167" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1758075669"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1696588107" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1998106185"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.629802373" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.639371599"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.146892337" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.96901258"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.824079627" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.2117972595"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.269984374" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.396175973"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1058452027" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.107126441"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1646705546" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.501148177"/>
</toolChain>
</folderInfo>
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="FATFS"/>
<entry excluding="eez/platform/simulator" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
<entry excluding="eez/libs/libscpi|eez/platform/simulator" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="USB_DEVICE"/>
</sourceEntries>
</configuration>

27
Debug/Drivers/BSP/Components/ft6x06/subdir.mk
Unescape View File

@ -0,0 +1,27 @@
################################################################################
# Automatically-generated file. Do not edit!
# Toolchain: GNU Tools for STM32 (10.3-2021.10)
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
../Drivers/BSP/Components/ft6x06/ft6x06.c
C_DEPS += \
./Drivers/BSP/Components/ft6x06/ft6x06.d
OBJS += \
./Drivers/BSP/Components/ft6x06/ft6x06.o
# Each subdirectory must supply rules for building sources it contributes
Drivers/BSP/Components/ft6x06/%.o Drivers/BSP/Components/ft6x06/%.su: ../Drivers/BSP/Components/ft6x06/%.c Drivers/BSP/Components/ft6x06/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DUSE_STM32469I_DISCO_REVB -DEEZ_PLATFORM_STM32 -DEEZ_PLATFORM_STM32F469I_DISCO -DLZ4_FORCE_MEMORY_ACCESS=0 -DSTM32L496xx -c -I../Core/Inc -I../FATFS/Target -I../FATFS/App -I../USB_DEVICE/App -I../USB_DEVICE/Target -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I../Middlewares/Third_Party/FatFs/src -I../Middlewares/ST/STM32_USB_Device_Library/Core/Inc -I../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I../Core/Inc -I../FATFS/Target -I../FATFS/App -I"/media/internal/Programs/studio_build/templates/eez-flow-template-stm32l496g-disco/Drivers/BSP/STM32L496G-Discovery" -I../Drivers/BSP/Components/Common -I../Utilities/CPU -I../Utilities/Log -I../Src/conf -I../Middlewares -I../Middlewares/eez/libs/agg -I../USB_DEVICE/App -I../USB_DEVICE/Target -I../Middlewares/ST/STM32_USB_Device_Library/Core/Inc -I../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@"
clean: clean-Drivers-2f-BSP-2f-Components-2f-ft6x06
clean-Drivers-2f-BSP-2f-Components-2f-ft6x06:
-$(RM) ./Drivers/BSP/Components/ft6x06/ft6x06.d ./Drivers/BSP/Components/ft6x06/ft6x06.o ./Drivers/BSP/Components/ft6x06/ft6x06.su
.PHONY: clean-Drivers-2f-BSP-2f-Components-2f-ft6x06

27
Debug/Drivers/BSP/Components/mfxstm32l152/subdir.mk
Unescape View File

@ -0,0 +1,27 @@
################################################################################
# Automatically-generated file. Do not edit!
# Toolchain: GNU Tools for STM32 (10.3-2021.10)
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
../Drivers/BSP/Components/mfxstm32l152/mfxstm32l152.c
C_DEPS += \
./Drivers/BSP/Components/mfxstm32l152/mfxstm32l152.d
OBJS += \
./Drivers/BSP/Components/mfxstm32l152/mfxstm32l152.o
# Each subdirectory must supply rules for building sources it contributes
Drivers/BSP/Components/mfxstm32l152/%.o Drivers/BSP/Components/mfxstm32l152/%.su: ../Drivers/BSP/Components/mfxstm32l152/%.c Drivers/BSP/Components/mfxstm32l152/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DUSE_STM32469I_DISCO_REVB -DEEZ_PLATFORM_STM32 -DEEZ_PLATFORM_STM32F469I_DISCO -DLZ4_FORCE_MEMORY_ACCESS=0 -DSTM32L496xx -c -I../Core/Inc -I../FATFS/Target -I../FATFS/App -I../USB_DEVICE/App -I../USB_DEVICE/Target -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I../Middlewares/Third_Party/FatFs/src -I../Middlewares/ST/STM32_USB_Device_Library/Core/Inc -I../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I../Core/Inc -I../FATFS/Target -I../FATFS/App -I"/media/internal/Programs/studio_build/templates/eez-flow-template-stm32l496g-disco/Drivers/BSP/STM32L496G-Discovery" -I../Drivers/BSP/Components/Common -I../Utilities/CPU -I../Utilities/Log -I../Src/conf -I../Middlewares -I../Middlewares/eez/libs/agg -I../USB_DEVICE/App -I../USB_DEVICE/Target -I../Middlewares/ST/STM32_USB_Device_Library/Core/Inc -I../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@"
clean: clean-Drivers-2f-BSP-2f-Components-2f-mfxstm32l152
clean-Drivers-2f-BSP-2f-Components-2f-mfxstm32l152:
-$(RM) ./Drivers/BSP/Components/mfxstm32l152/mfxstm32l152.d ./Drivers/BSP/Components/mfxstm32l152/mfxstm32l152.o ./Drivers/BSP/Components/mfxstm32l152/mfxstm32l152.su
.PHONY: clean-Drivers-2f-BSP-2f-Components-2f-mfxstm32l152

27
Debug/Drivers/BSP/Components/st7789h2/subdir.mk
Unescape View File

@ -0,0 +1,27 @@
################################################################################
# Automatically-generated file. Do not edit!
# Toolchain: GNU Tools for STM32 (10.3-2021.10)
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
../Drivers/BSP/Components/st7789h2/st7789h2.c
C_DEPS += \
./Drivers/BSP/Components/st7789h2/st7789h2.d
OBJS += \
./Drivers/BSP/Components/st7789h2/st7789h2.o
# Each subdirectory must supply rules for building sources it contributes
Drivers/BSP/Components/st7789h2/%.o Drivers/BSP/Components/st7789h2/%.su: ../Drivers/BSP/Components/st7789h2/%.c Drivers/BSP/Components/st7789h2/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DUSE_STM32469I_DISCO_REVB -DEEZ_PLATFORM_STM32 -DEEZ_PLATFORM_STM32F469I_DISCO -DLZ4_FORCE_MEMORY_ACCESS=0 -DSTM32L496xx -c -I../Core/Inc -I../FATFS/Target -I../FATFS/App -I../USB_DEVICE/App -I../USB_DEVICE/Target -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I../Middlewares/Third_Party/FatFs/src -I../Middlewares/ST/STM32_USB_Device_Library/Core/Inc -I../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I../Core/Inc -I../FATFS/Target -I../FATFS/App -I"/media/internal/Programs/studio_build/templates/eez-flow-template-stm32l496g-disco/Drivers/BSP/STM32L496G-Discovery" -I../Drivers/BSP/Components/Common -I../Utilities/CPU -I../Utilities/Log -I../Src/conf -I../Middlewares -I../Middlewares/eez/libs/agg -I../USB_DEVICE/App -I../USB_DEVICE/Target -I../Middlewares/ST/STM32_USB_Device_Library/Core/Inc -I../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@"
clean: clean-Drivers-2f-BSP-2f-Components-2f-st7789h2
clean-Drivers-2f-BSP-2f-Components-2f-st7789h2:
-$(RM) ./Drivers/BSP/Components/st7789h2/st7789h2.d ./Drivers/BSP/Components/st7789h2/st7789h2.o ./Drivers/BSP/Components/st7789h2/st7789h2.su
.PHONY: clean-Drivers-2f-BSP-2f-Components-2f-st7789h2

4
Debug/makefile
Unescape View File

@ -13,7 +13,6 @@ RM := rm -rf
-include USB_DEVICE/App/subdir.mk
-include Middlewares/eez/platform/stm32/subdir.mk
-include Middlewares/eez/libs/lz4/subdir.mk
-include Middlewares/eez/libs/libscpi/src/subdir.mk
-include Middlewares/eez/libs/agg/subdir.mk
-include Middlewares/eez/gui/widgets/containers/subdir.mk
-include Middlewares/eez/gui/widgets/subdir.mk
@ -35,6 +34,9 @@ RM := rm -rf
-include FATFS/App/subdir.mk
-include Drivers/STM32L4xx_HAL_Driver/Src/subdir.mk
-include Drivers/BSP/STM32L496G-Discovery/subdir.mk
-include Drivers/BSP/Components/st7789h2/subdir.mk
-include Drivers/BSP/Components/mfxstm32l152/subdir.mk
-include Drivers/BSP/Components/ft6x06/subdir.mk
-include Core/Startup/subdir.mk
-include Core/Src/subdir.mk
-include objects.mk

12
Debug/objects.list
Unescape View File

@ -20,6 +20,9 @@
"./Core/Src/tim.o"
"./Core/Src/usart.o"
"./Core/Startup/startup_stm32l496agix.o"
"./Drivers/BSP/Components/ft6x06/ft6x06.o"
"./Drivers/BSP/Components/mfxstm32l152/mfxstm32l152.o"
"./Drivers/BSP/Components/st7789h2/st7789h2.o"
"./Drivers/BSP/STM32L496G-Discovery/stm32l496g_discovery.o"
"./Drivers/BSP/STM32L496G-Discovery/stm32l496g_discovery_audio.o"
"./Drivers/BSP/STM32L496G-Discovery/stm32l496g_discovery_camera.o"
@ -214,15 +217,6 @@
"./Middlewares/eez/libs/agg/agg_vpgen_clip_polygon.o"
"./Middlewares/eez/libs/agg/agg_vpgen_clip_polyline.o"
"./Middlewares/eez/libs/agg/agg_vpgen_segmentator.o"
"./Middlewares/eez/libs/libscpi/src/error.o"
"./Middlewares/eez/libs/libscpi/src/expression.o"
"./Middlewares/eez/libs/libscpi/src/fifo.o"
"./Middlewares/eez/libs/libscpi/src/ieee488.o"
"./Middlewares/eez/libs/libscpi/src/lexer.o"
"./Middlewares/eez/libs/libscpi/src/minimal.o"
"./Middlewares/eez/libs/libscpi/src/parser.o"
"./Middlewares/eez/libs/libscpi/src/units.o"
"./Middlewares/eez/libs/libscpi/src/utils.o"
"./Middlewares/eez/libs/lz4/lz4.o"
"./Middlewares/eez/platform/stm32/display.o"
"./Middlewares/eez/platform/stm32/touch.o"

4
Debug/sources.mk
Unescape View File

@ -34,6 +34,9 @@ CPP_DEPS :=
SUBDIRS := \
Core/Src \
Core/Startup \
Drivers/BSP/Components/ft6x06 \
Drivers/BSP/Components/mfxstm32l152 \
Drivers/BSP/Components/st7789h2 \
Drivers/BSP/STM32L496G-Discovery \
Drivers/STM32L4xx_HAL_Driver/Src \
FATFS/App \
@ -55,7 +58,6 @@ Middlewares/eez/gui \
Middlewares/eez/gui/widgets \
Middlewares/eez/gui/widgets/containers \
Middlewares/eez/libs/agg \
Middlewares/eez/libs/libscpi/src \
Middlewares/eez/libs/lz4 \
Middlewares/eez/platform/stm32 \
USB_DEVICE/App \

2
Middlewares/eez/platform/stm32/display.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <ltdc.h>
#ifdef EEZ_PLATFORM_STM32F469I_DISCO
#include "stm32469i_discovery_lcd.h"
#include "stm32l496g_discovery_lcd.h"
extern "C" LTDC_HandleTypeDef hltdc_eval;
extern "C" DMA2D_HandleTypeDef hdma2d_eval;
#define hltdc hltdc_eval

Write Preview
Loading…
Cancel
Save