From 06c4d4c35a426ead140b6b3639d79e9637dfd9fc Mon Sep 17 00:00:00 2001 From: Goran Mahovlic Date: Thu, 18 Aug 2022 17:30:47 +0200 Subject: [PATCH] Exclude scpi from build - getting to missing ltdc - l4 does not have ltdc --- .cproject | 27 +++++++++++++++++++++- Debug/Drivers/BSP/Components/ft6x06/subdir.mk | 27 ++++++++++++++++++++++ .../Drivers/BSP/Components/mfxstm32l152/subdir.mk | 27 ++++++++++++++++++++++ Debug/Drivers/BSP/Components/st7789h2/subdir.mk | 27 ++++++++++++++++++++++ Debug/makefile | 4 +++- Debug/objects.list | 12 +++------- Debug/sources.mk | 4 +++- Middlewares/eez/platform/stm32/display.cpp | 2 +- 8 files changed, 117 insertions(+), 13 deletions(-) create mode 100644 Debug/Drivers/BSP/Components/ft6x06/subdir.mk create mode 100644 Debug/Drivers/BSP/Components/mfxstm32l152/subdir.mk create mode 100644 Debug/Drivers/BSP/Components/st7789h2/subdir.mk diff --git a/.cproject b/.cproject index ded3865..9e54f25 100644 --- a/.cproject +++ b/.cproject @@ -142,11 +142,36 @@ + + + + - + diff --git a/Debug/Drivers/BSP/Components/ft6x06/subdir.mk b/Debug/Drivers/BSP/Components/ft6x06/subdir.mk new file mode 100644 index 0000000..9065e5a --- /dev/null +++ b/Debug/Drivers/BSP/Components/ft6x06/subdir.mk @@ -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 + diff --git a/Debug/Drivers/BSP/Components/mfxstm32l152/subdir.mk b/Debug/Drivers/BSP/Components/mfxstm32l152/subdir.mk new file mode 100644 index 0000000..fc68680 --- /dev/null +++ b/Debug/Drivers/BSP/Components/mfxstm32l152/subdir.mk @@ -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 + diff --git a/Debug/Drivers/BSP/Components/st7789h2/subdir.mk b/Debug/Drivers/BSP/Components/st7789h2/subdir.mk new file mode 100644 index 0000000..aaa1a8a --- /dev/null +++ b/Debug/Drivers/BSP/Components/st7789h2/subdir.mk @@ -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 + diff --git a/Debug/makefile b/Debug/makefile index 8608a21..5c5c3c3 100644 --- a/Debug/makefile +++ b/Debug/makefile @@ -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 diff --git a/Debug/objects.list b/Debug/objects.list index 5b652ee..74cbe13 100644 --- a/Debug/objects.list +++ b/Debug/objects.list @@ -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" diff --git a/Debug/sources.mk b/Debug/sources.mk index ad21a59..4a91d7a 100644 --- a/Debug/sources.mk +++ b/Debug/sources.mk @@ -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 \ diff --git a/Middlewares/eez/platform/stm32/display.cpp b/Middlewares/eez/platform/stm32/display.cpp index b0f6a08..e37ae2e 100644 --- a/Middlewares/eez/platform/stm32/display.cpp +++ b/Middlewares/eez/platform/stm32/display.cpp @@ -27,7 +27,7 @@ #include #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