Update Makefile

This commit is contained in:
Ben V. Brown
2022-08-03 20:28:43 +10:00
parent 79d9774eac
commit b658aa4fbc

View File

@@ -71,49 +71,49 @@ PINE_VENDOR_USB_INC_DIR = ./Core/BSP/Pinecil/Vendor/SoC/gd32vf103/Common/Include
PINE_NMSIS_INC_DIR = ./Core/BSP/Pinecil/Vendor/NMSIS/Core/Include
PINE_FREERTOS_PORT_INC_DIR = ./Core/BSP/Pinecil/Vendor/OS/FreeRTOS/Source/portable/GCC
MAGIC_DIR = ./Core/BSP/Pinecilv2
MAGIC_SDK_DIR = $(MAGIC_DIR)/bl_mcu_sdk
PINECILV2_DIR = ./Core/BSP/Pinecilv2
PINECILV2_SDK_DIR = $(PINECILV2_DIR)/bl_mcu_sdk
MAGIC_VENDOR_BSP_DIR = $(MAGIC_SDK_DIR)/bsp
MAGIC_VENDOR_BSP_COMMON_DIR = $(MAGIC_VENDOR_BSP_DIR)/bsp_common
MAGIC_VENDOR_BSP_BOARD_DIR = $(MAGIC_VENDOR_BSP_DIR)/board
MAGIC_VENDOR_BSP_PLATFORM_DIR = $(MAGIC_VENDOR_BSP_COMMON_DIR)/platform
MAGIC_VENDOR_BSP_USB_DIR = $(MAGIC_VENDOR_BSP_COMMON_DIR)/usb
PINECILV2_VENDOR_BSP_DIR = $(PINECILV2_SDK_DIR)/bsp
PINECILV2_VENDOR_BSP_COMMON_DIR = $(PINECILV2_VENDOR_BSP_DIR)/bsp_common
PINECILV2_VENDOR_BSP_BOARD_DIR = $(PINECILV2_VENDOR_BSP_DIR)/board
PINECILV2_VENDOR_BSP_PLATFORM_DIR = $(PINECILV2_VENDOR_BSP_COMMON_DIR)/platform
PINECILV2_VENDOR_BSP_USB_DIR = $(PINECILV2_VENDOR_BSP_COMMON_DIR)/usb
MAGIC_COMMON_DIR = $(MAGIC_SDK_DIR)/common
MAGIC_COMMON_BL_MATH_DIR = $(MAGIC_COMMON_DIR)/bl_math
MAGIC_COMMON_DEVICE_DIR = $(MAGIC_COMMON_DIR)/device
MAGIC_COMMON_LIST_DIR = $(MAGIC_COMMON_DIR)/list
MAGIC_COMMON_MISC_DIR = $(MAGIC_COMMON_DIR)/misc
MAGIC_COMMON_PARTITION_DIR = $(MAGIC_COMMON_DIR)/partition
MAGIC_COMMON_PID_DIR = $(MAGIC_COMMON_DIR)/pid
MAGIC_COMMON_RING_BUFFERDIR = $(MAGIC_COMMON_DIR)/ring_buffer
MAGIC_COMMON_SOFT_CRC_DIR = $(MAGIC_COMMON_DIR)/soft_crc
MAGIC_COMMON_TIMESTAMP_DIR = $(MAGIC_COMMON_DIR)/timestamp
MAGIC_COMPONENTS_DIR = $(MAGIC_SDK_DIR)/components
PINECILV2_COMMON_DIR = $(PINECILV2_SDK_DIR)/common
PINECILV2_COMMON_BL_MATH_DIR = $(PINECILV2_COMMON_DIR)/bl_math
PINECILV2_COMMON_DEVICE_DIR = $(PINECILV2_COMMON_DIR)/device
PINECILV2_COMMON_LIST_DIR = $(PINECILV2_COMMON_DIR)/list
PINECILV2_COMMON_MISC_DIR = $(PINECILV2_COMMON_DIR)/misc
PINECILV2_COMMON_PARTITION_DIR = $(PINECILV2_COMMON_DIR)/partition
PINECILV2_COMMON_PID_DIR = $(PINECILV2_COMMON_DIR)/pid
PINECILV2_COMMON_RING_BUFFERDIR = $(PINECILV2_COMMON_DIR)/ring_buffer
PINECILV2_COMMON_SOFT_CRC_DIR = $(PINECILV2_COMMON_DIR)/soft_crc
PINECILV2_COMMON_TIMESTAMP_DIR = $(PINECILV2_COMMON_DIR)/timestamp
PINECILV2_COMPONENTS_DIR = $(PINECILV2_SDK_DIR)/components
MAGIC_COMPONENTS_FREERTOS_DIR = $(MAGIC_COMPONENTS_DIR)/freertos
MAGIC_COMPONENTS_FREERTOS_BL602_DIR = $(MAGIC_COMPONENTS_FREERTOS_DIR)/portable/gcc/risc-v/bl702
PINECILV2_COMPONENTS_FREERTOS_DIR = $(PINECILV2_COMPONENTS_DIR)/freertos
PINECILV2_COMPONENTS_FREERTOS_BL602_DIR = $(PINECILV2_COMPONENTS_FREERTOS_DIR)/portable/gcc/risc-v/bl702
MAGIC_COMPONENTS_NMSIS_DIR = $(MAGIC_COMPONENTS_DIR)/nmsis
MAGIC_COMPONENTS_NMSIS_CORE_INC_DIR = $(MAGIC_COMPONENTS_NMSIS_DIR)/core/inc
PINECILV2_COMPONENTS_NMSIS_DIR = $(PINECILV2_COMPONENTS_DIR)/nmsis
PINECILV2_COMPONENTS_NMSIS_CORE_INC_DIR = $(PINECILV2_COMPONENTS_NMSIS_DIR)/core/inc
MAGIC_COMPONENTS_USB_STACK_DIR = $(MAGIC_COMPONENTS_DIR)/usb_stack
MAGIC_COMPONENTS_USB_STACK_COMMON_DIR = $(MAGIC_COMPONENTS_USB_STACK_DIR)/common
MAGIC_COMPONENTS_USB_STACK_CORE_DIR = $(MAGIC_COMPONENTS_USB_STACK_DIR)/core
MAGIC_COMPONENTS_USB_STACK_CDC_DIR = $(MAGIC_COMPONENTS_USB_STACK_DIR)/class/cdc
MAGIC_COMPONENTS_USB_STACK_WINUSB_DIR = $(MAGIC_COMPONENTS_USB_STACK_DIR)/class/winusb
PINECILV2_COMPONENTS_USB_STACK_DIR = $(PINECILV2_COMPONENTS_DIR)/usb_stack
PINECILV2_COMPONENTS_USB_STACK_COMMON_DIR = $(PINECILV2_COMPONENTS_USB_STACK_DIR)/common
PINECILV2_COMPONENTS_USB_STACK_CORE_DIR = $(PINECILV2_COMPONENTS_USB_STACK_DIR)/core
PINECILV2_COMPONENTS_USB_STACK_CDC_DIR = $(PINECILV2_COMPONENTS_USB_STACK_DIR)/class/cdc
PINECILV2_COMPONENTS_USB_STACK_WINUSB_DIR = $(PINECILV2_COMPONENTS_USB_STACK_DIR)/class/winusb
MAGIC_DRIVERS_DIR = $(MAGIC_SDK_DIR)/drivers/bl702_driver
MAGIC_DRIVERS_HAL_DRV_INC_DIR = $(MAGIC_DRIVERS_DIR)/hal_drv/inc
MAGIC_DRIVERS_HAL_DRV_DEF_DIR = $(MAGIC_DRIVERS_DIR)/hal_drv/default_config
MAGIC_DRIVERS_REGS_DIR = $(MAGIC_DRIVERS_DIR)/regs
MAGIC_DRIVERS_RISCV_DIR = $(MAGIC_DRIVERS_DIR)/risc-v
MAGIC_DRIVERS_STARTUP_DIR = $(MAGIC_DRIVERS_DIR)/startup
MAGIC_DRIVERS_STD_DRV_DIR = $(MAGIC_DRIVERS_DIR)/std_drv/inc
PINECILV2_DRIVERS_DIR = $(PINECILV2_SDK_DIR)/drivers/bl702_driver
PINECILV2_DRIVERS_HAL_DRV_INC_DIR = $(PINECILV2_DRIVERS_DIR)/hal_drv/inc
PINECILV2_DRIVERS_HAL_DRV_DEF_DIR = $(PINECILV2_DRIVERS_DIR)/hal_drv/default_config
PINECILV2_DRIVERS_REGS_DIR = $(PINECILV2_DRIVERS_DIR)/regs
PINECILV2_DRIVERS_RISCV_DIR = $(PINECILV2_DRIVERS_DIR)/risc-v
PINECILV2_DRIVERS_STARTUP_DIR = $(PINECILV2_DRIVERS_DIR)/startup
PINECILV2_DRIVERS_STD_DRV_DIR = $(PINECILV2_DRIVERS_DIR)/std_drv/inc
@@ -136,8 +136,8 @@ PD_DRIVER_DIR = ./Core/Drivers/usb-pd
# Find-all's used for formatting; have to exclude external modules
ALL_INCLUDES = $(shell find ./Core -type d \( -path $(BRIEFLZ_INC_DIR) -o -path $(PD_DRIVER_DIR) -o -path $(MAGIC_SDK_DIR) \) -prune -false -o \( -type f \( -name '*.h' -o -name '*.hpp' \) \) )
ALL_SOURCE = $(shell find ./Core -type d \( -path $(SOURCE_BRIEFLZ_DIR) -o -path $(PD_DRIVER_DIR) -o -path $(MAGIC_SDK_DIR) \) -prune -false -o \( -type f \( -name '*.c' -o -name '*.cpp' \) \) )
ALL_INCLUDES = $(shell find ./Core -type d \( -path $(BRIEFLZ_INC_DIR) -o -path $(PD_DRIVER_DIR) -o -path $(PINECILV2_SDK_DIR) \) -prune -false -o \( -type f \( -name '*.h' -o -name '*.hpp' \) \) )
ALL_SOURCE = $(shell find ./Core -type d \( -path $(SOURCE_BRIEFLZ_DIR) -o -path $(PD_DRIVER_DIR) -o -path $(PINECILV2_SDK_DIR) \) -prune -false -o \( -type f \( -name '*.c' -o -name '*.cpp' \) \) )
# Device dependent settings
ifeq ($(model),$(filter $(model),$(ALL_MINIWARE_MODELS)))
@@ -226,42 +226,42 @@ $(info Building for Pine64 Pinecilv2 )
DEVICE_INCLUDES = -I$(MAGIC_DIR) \
-I$(MAGIC_SDK_DIR) \
-I$(MAGIC_VENDOR_BSP_COMMON_DIR) \
-I$(MAGIC_VENDOR_BSP_PLATFORM_DIR) \
-I$(MAGIC_COMMON_DIR) \
-I$(MAGIC_COMMON_BL_MATH_DIR) \
-I$(MAGIC_COMMON_DEVICE_DIR) \
-I$(MAGIC_COMMON_LIST_DIR) \
-I$(MAGIC_COMMON_MISC_DIR) \
-I$(MAGIC_COMMON_PARTITION_DIR) \
-I$(MAGIC_COMMON_PID_DIR) \
-I$(MAGIC_COMMON_RING_BUFFERDIR) \
-I$(MAGIC_COMMON_SOFT_CRC_DIR) \
-I$(MAGIC_COMMON_TIMESTAMP_DIR) \
-I$(MAGIC_COMPONENTS_DIR) \
-I$(MAGIC_COMPONENTS_FREERTOS_DIR) \
-I$(MAGIC_COMPONENTS_FREERTOS_BL602_DIR) \
-I$(MAGIC_COMPONENTS_NMSIS_DIR) \
-I$(MAGIC_COMPONENTS_USB_STACK_DIR) \
-I$(MAGIC_DRIVERS_DIR) \
-I$(MAGIC_DRIVERS_HAL_DRV_INC_DIR) \
-I$(MAGIC_DRIVERS_HAL_DRV_DEF_DIR) \
-I$(MAGIC_DRIVERS_REGS_DIR) \
-I$(MAGIC_DRIVERS_RISCV_DIR) \
-I$(MAGIC_DRIVERS_STARTUP_DIR) \
-I$(MAGIC_DRIVERS_STD_DRV_DIR) \
-I$(MAGIC_VENDOR_BSP_PLATFORM_DIR) \
-I$(MAGIC_VENDOR_BSP_USB_DIR) \
-I$(MAGIC_COMPONENTS_USB_STACK_COMMON_DIR) \
-I$(MAGIC_COMPONENTS_USB_STACK_CORE_DIR) \
-I$(MAGIC_COMPONENTS_USB_STACK_CDC_DIR) \
-I$(MAGIC_COMPONENTS_USB_STACK_WINUSB_DIR) \
-I$(MAGIC_COMPONENTS_NMSIS_CORE_INC_DIR)
DEVICE_INCLUDES = -I$(PINECILV2_DIR) \
-I$(PINECILV2_SDK_DIR) \
-I$(PINECILV2_VENDOR_BSP_COMMON_DIR) \
-I$(PINECILV2_VENDOR_BSP_PLATFORM_DIR) \
-I$(PINECILV2_COMMON_DIR) \
-I$(PINECILV2_COMMON_BL_MATH_DIR) \
-I$(PINECILV2_COMMON_DEVICE_DIR) \
-I$(PINECILV2_COMMON_LIST_DIR) \
-I$(PINECILV2_COMMON_MISC_DIR) \
-I$(PINECILV2_COMMON_PARTITION_DIR) \
-I$(PINECILV2_COMMON_PID_DIR) \
-I$(PINECILV2_COMMON_RING_BUFFERDIR) \
-I$(PINECILV2_COMMON_SOFT_CRC_DIR) \
-I$(PINECILV2_COMMON_TIMESTAMP_DIR) \
-I$(PINECILV2_COMPONENTS_DIR) \
-I$(PINECILV2_COMPONENTS_FREERTOS_DIR) \
-I$(PINECILV2_COMPONENTS_FREERTOS_BL602_DIR) \
-I$(PINECILV2_COMPONENTS_NMSIS_DIR) \
-I$(PINECILV2_COMPONENTS_USB_STACK_DIR) \
-I$(PINECILV2_DRIVERS_DIR) \
-I$(PINECILV2_DRIVERS_HAL_DRV_INC_DIR) \
-I$(PINECILV2_DRIVERS_HAL_DRV_DEF_DIR) \
-I$(PINECILV2_DRIVERS_REGS_DIR) \
-I$(PINECILV2_DRIVERS_RISCV_DIR) \
-I$(PINECILV2_DRIVERS_STARTUP_DIR) \
-I$(PINECILV2_DRIVERS_STD_DRV_DIR) \
-I$(PINECILV2_VENDOR_BSP_PLATFORM_DIR) \
-I$(PINECILV2_VENDOR_BSP_USB_DIR) \
-I$(PINECILV2_COMPONENTS_USB_STACK_COMMON_DIR) \
-I$(PINECILV2_COMPONENTS_USB_STACK_CORE_DIR) \
-I$(PINECILV2_COMPONENTS_USB_STACK_CDC_DIR) \
-I$(PINECILV2_COMPONENTS_USB_STACK_WINUSB_DIR) \
-I$(PINECILV2_COMPONENTS_NMSIS_CORE_INC_DIR)
DEVICE_BSP_DIR = ./Core/BSP/Pinecilv2
S_SRCS := $(shell find $(MAGIC_DIR) -type d \( -path $(MAGIC_VENDOR_BSP_COMMON_DIR) \) -prune -false -o -type f -name '*.S') $(info $(S_SRCS) )
S_SRCS := $(shell find $(PINECILV2_DIR) -type d \( -path $(PINECILV2_VENDOR_BSP_COMMON_DIR) \) -prune -false -o -type f -name '*.S') $(info $(S_SRCS) )
ASM_INC = $(DEVICE_INCLUDES)
LDSCRIPT=./Core/BSP/Pinecilv2/bl_mcu_sdk/drivers/bl702_driver/bl702_flash.ld
@@ -292,12 +292,12 @@ INCLUDES = -I$(APP_INC_DIR) \
-I$(INC_PD_DRIVERS_DIR) \
$(DEVICE_INCLUDES)
EXCLUDED_DIRS := -path $(MAGIC_VENDOR_BSP_ES8388_DIR) \
-o -path $(MAGIC_VENDOR_BSP_IMAGE_SENSOR_DIR) \
-o -path $(MAGIC_VENDOR_BSP_LVGL_DIR) \
-o -path $(MAGIC_VENDOR_BSP_MCU_LCD_DIR) \
-o -path $(MAGIC_VENDOR_BSP_BOARD_DIR) \
-o -path $(MAGIC_VENDOR_BSP_USB_DIR) \
EXCLUDED_DIRS := -path $(PINECILV2_VENDOR_BSP_ES8388_DIR) \
-o -path $(PINECILV2_VENDOR_BSP_IMAGE_SENSOR_DIR) \
-o -path $(PINECILV2_VENDOR_BSP_LVGL_DIR) \
-o -path $(PINECILV2_VENDOR_BSP_MCU_LCD_DIR) \
-o -path $(PINECILV2_VENDOR_BSP_BOARD_DIR) \
-o -path $(PINECILV2_VENDOR_BSP_USB_DIR) \
SOURCE := $(shell find $(SOURCE_THREADS_DIR) -type f -name '*.c') \
$(shell find $(SOURCE_CORE_DIR) -type f -name '*.c') \