sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

source/Makefile compatibility with BSD find [#1886] (#1892)

Browse Source 
* source/Makefile compatibility with BSD find [#1886]

* Align formatting

* source/Makefile: remove trailing /s from DIR vars to fix build using BSD find/OSX env [#1886]
This commit is contained in:
Ivan Zorin
2024-03-16 11:32:31 +03:00
committed by GitHub
parent 9ea71bc4d2
commit 1d12e9d7dd
1 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
source/Makefile
View File

@@ -57,13 +57,13 @@ DEVICE_DFU_VID_PID=0x28E9:0x0189
# Enumerate all of the include directories (HAL source dirs are used for clang-format only) # Enumerate all of the include directories (HAL source dirs are used for clang-format only)
APP_INC_DIR=./Core/Inc/ APP_INC_DIR=./Core/Inc
MIDDLEWARES_DIR=./Middlewares/ MIDDLEWARES_DIR=./Middlewares
BSP_INC_DIR=./Core/BSP/ BSP_INC_DIR=./Core/BSP
THREADS_DIR=./Core/Threads/ THREADS_DIR=./Core/Threads
SOURCE_CORE_DIR=./Core/Src/ SOURCE_CORE_DIR=./Core/Src
BRIEFLZ_DIR=./Core/brieflz/ BRIEFLZ_DIR=./Core/brieflz
DRIVERS_DIR=./Core/Drivers/ DRIVERS_DIR=./Core/Drivers
PD_DRIVER_DIR=./Core/Drivers/usb-pd PD_DRIVER_DIR=./Core/Drivers/usb-pd
# Exclude USB-PD tests # Exclude USB-PD tests
PD_DRIVER_TESTS_DIR=./Core/Drivers/usb-pd/tests PD_DRIVER_TESTS_DIR=./Core/Drivers/usb-pd/tests
@@ -71,8 +71,7 @@ PD_DRIVER_TESTS_DIR=./Core/Drivers/usb-pd/tests
# Excludes for clang-format # Excludes for clang-format
ALL_INCLUDES_EXCEPT:=-path $(PD_DRIVER_DIR) \ ALL_INCLUDES_EXCEPT:=-path $(PD_DRIVER_DIR) -o -not -name "configuration.h"
-o -not -name "configuration.h"
ALL_SOURCE_EXCEPT:=-path $(PD_DRIVER_DIR) ALL_SOURCE_EXCEPT:=-path $(PD_DRIVER_DIR)
# Find-all's used for formatting; have to exclude external modules # Find-all's used for formatting; have to exclude external modules
ALL_INCLUDES=$(shell find ./Core -type d \( $(ALL_INCLUDES_EXCEPT) \) -prune -false -o \( -type f \( -name '*.h' -o -name '*.hpp' \) \) ) ALL_INCLUDES=$(shell find ./Core -type d \( $(ALL_INCLUDES_EXCEPT) \) -prune -false -o \( -type f \( -name '*.h' -o -name '*.hpp' \) \) )
@@ -81,7 +80,7 @@ ALL_SOURCE=$(shell find ./Core -type d \( $(ALL_SOURCE_EXCEPT) \) -prune -f
# Device dependent settings # Device dependent settings
ifeq ($(model),$(filter $(model),$(ALL_MINIWARE_MODELS))) ifeq ($(model),$(filter $(model),$(ALL_MINIWARE_MODELS)))
$(info Building for Miniware ) $(info Building for Miniware )
DEVICE_BSP_DIR=./Core/BSP/Miniware/ DEVICE_BSP_DIR=./Core/BSP/Miniware
LDSCRIPT=./Core/BSP/Miniware/stm32f103.ld LDSCRIPT=./Core/BSP/Miniware/stm32f103.ld
ifeq ($(model),$(filter $(model),TS101)) ifeq ($(model),$(filter $(model),TS101))
@@ -119,7 +118,7 @@ endif # ALL_MINIWARE_MODELS
ifeq ($(model),$(filter $(model),$(ALL_SEQURE_MODELS))) ifeq ($(model),$(filter $(model),$(ALL_SEQURE_MODELS)))
$(info Building for Sequre ) $(info Building for Sequre )
DEVICE_BSP_DIR=./Core/BSP/Sequre_S60/ DEVICE_BSP_DIR=./Core/BSP/Sequre_S60
S_SRCS:=$(shell find $(S60_STARTUP_DIR) -type f -name '*.S') S_SRCS:=$(shell find $(S60_STARTUP_DIR) -type f -name '*.S')
LDSCRIPT=./Core/BSP/Sequre_S60/stm32f103.ld LDSCRIPT=./Core/BSP/Sequre_S60/stm32f103.ld
DEV_GLOBAL_DEFS=-D STM32F103T8Ux \ DEV_GLOBAL_DEFS=-D STM32F103T8Ux \
@@ -155,7 +154,7 @@ endif # ALL_SEQURE_MODELS
ifeq ($(model),$(filter $(model),$(ALL_MHP30_MODELS))) ifeq ($(model),$(filter $(model),$(ALL_MHP30_MODELS)))
$(info Building for MHP30 ) $(info Building for MHP30 )
DEVICE_BSP_DIR=./Core/BSP/MHP30/ DEVICE_BSP_DIR=./Core/BSP/MHP30
LDSCRIPT=./Core/BSP/MHP30/stm32f103.ld LDSCRIPT=./Core/BSP/MHP30/stm32f103.ld
DEV_GLOBAL_DEFS=-D STM32F103T8Ux \ DEV_GLOBAL_DEFS=-D STM32F103T8Ux \
-D STM32F1 \ -D STM32F1 \
@@ -185,7 +184,7 @@ ifeq ($(model),$(ALL_PINECIL_MODELS))
$(info Building for Pine64 Pinecilv1) $(info Building for Pine64 Pinecilv1)
DEVICE_BSP_DIR=./Core/BSP/Pinecil/ DEVICE_BSP_DIR=./Core/BSP/Pinecil
S_SRCS:=$(shell find $(DEVICE_BSP_DIR) -type f -name '*.S') S_SRCS:=$(shell find $(DEVICE_BSP_DIR) -type f -name '*.S')
LDSCRIPT=./Core/BSP/Pinecil/Vendor/SoC/gd32vf103/Board/pinecil/Source/GCC/gcc_gd32vf103_flashxip.ld LDSCRIPT=./Core/BSP/Pinecil/Vendor/SoC/gd32vf103/Board/pinecil/Source/GCC/gcc_gd32vf103_flashxip.ld
flash_size=128k flash_size=128k
@@ -193,10 +192,10 @@ bootldr_size=0x0
# Flags # Flags
CPUFLAGS=-march=rv32imaczicsr \ CPUFLAGS=-march=rv32imaczicsr \
-mabi=ilp32 \ -mabi=ilp32 \
-mcmodel=medany \ -mcmodel=medany \
-fsigned-char \ -fsigned-char \
-fno-builtin \ -fno-builtin \
-nostartfiles -nostartfiles
DEV_LDFLAGS=-nostartfiles DEV_LDFLAGS=-nostartfiles
@@ -210,12 +209,12 @@ ifeq ($(model),$(ALL_PINECIL_V2_MODELS))
$(info Building for Pine64 Pinecilv2 ) $(info Building for Pine64 Pinecilv2 )
DEVICE_BSP_DIR=./Core/BSP/Pinecilv2/ DEVICE_BSP_DIR=./Core/BSP/Pinecilv2
LDSCRIPT=./Core/BSP/Pinecilv2/bl_mcu_sdk/drivers/bl702_driver/bl702_flash.ld LDSCRIPT=./Core/BSP/Pinecilv2/bl_mcu_sdk/drivers/bl702_driver/bl702_flash.ld
DEVICE_DFU_ADDRESS=0x23000000 DEVICE_DFU_ADDRESS=0x23000000
# DFU starts at the beginning of flash # DFU starts at the beginning of flash
# Flags # Flags
CPUFLAGS=-march=rv32imafczicsr \ CPUFLAGS=-march=rv32imafczicsr \
-mabi=ilp32f \ -mabi=ilp32f \
-mcmodel=medany \ -mcmodel=medany \
-fsigned-char \ -fsigned-char \
@@ -300,12 +299,12 @@ BRIEFLZ_INCLUDE_DIRS:= ${shell find ${BRIEFLZ_DIR} -type d -print}
MIDDLEWARES_INCLUDE_DIRS:= ${shell find ${MIDDLEWARES_DIR} -type d -print} MIDDLEWARES_INCLUDE_DIRS:= ${shell find ${MIDDLEWARES_DIR} -type d -print}
INCLUDES=-I$(APP_INC_DIR) \ INCLUDES=-I$(APP_INC_DIR) \
-I$(BSP_INC_DIR) \ -I$(BSP_INC_DIR) \
${patsubst %,-I%,${DEVICE_BSP_INCLUDE_DIRS}} \ ${patsubst %,-I%,${DEVICE_BSP_INCLUDE_DIRS}} \
${patsubst %,-I%,${THREADS_INCLUDE_DIRS}} \ ${patsubst %,-I%,${THREADS_INCLUDE_DIRS}} \
${patsubst %,-I%,${DRIVERS_INCLUDE_DIRS}} \ ${patsubst %,-I%,${DRIVERS_INCLUDE_DIRS}} \
${patsubst %,-I%,${BRIEFLZ_INCLUDE_DIRS}} \ ${patsubst %,-I%,${BRIEFLZ_INCLUDE_DIRS}} \
${patsubst %,-I%,${MIDDLEWARES_INCLUDE_DIRS}} ${patsubst %,-I%,${MIDDLEWARES_INCLUDE_DIRS}}
ASM_INC=$(INCLUDES) ASM_INC=$(INCLUDES)
@@ -319,11 +318,11 @@ SOURCE:=$(shell find ${THREADS_DIR} -type f -name '*.c') \
$(BRIEFLZ_DIR)/depack.c $(BRIEFLZ_DIR)/depack.c
# We exclude the USB-PD stack tests $(PD_DRIVER_TESTS_DIR) # We exclude the USB-PD stack tests $(PD_DRIVER_TESTS_DIR)
SOURCE_CPP:=$(shell find ${THREADS_DIR} -type f -name '*.cpp') \ SOURCE_CPP:=$(shell find ${THREADS_DIR} -type f -name '*.cpp') \
$(shell find ${SOURCE_CORE_DIR} -type f -name '*.cpp') \ $(shell find ${SOURCE_CORE_DIR} -type f -name '*.cpp') \
$(shell find ${DRIVERS_DIR} -type f -name '*.cpp' -not -path "${PD_DRIVER_TESTS_DIR}/*" ) \ $(shell find ${DRIVERS_DIR} -type f -name '*.cpp' -not -path "${PD_DRIVER_TESTS_DIR}/*" ) \
$(shell find ${DEVICE_BSP_DIR} -type f -name '*.cpp') \ $(shell find ${DEVICE_BSP_DIR} -type f -name '*.cpp') \
$(shell find ${MIDDLEWARES_DIR} -type f -name '*.cpp') $(shell find ${MIDDLEWARES_DIR} -type f -name '*.cpp')
S_SRCS:=$(shell find $(DEVICE_BSP_DIR) -type f -name '*.S') S_SRCS:=$(shell find $(DEVICE_BSP_DIR) -type f -name '*.S')
@@ -337,7 +336,7 @@ OPTIM=-Os \
-fdevirtualize-at-ltrans \ -fdevirtualize-at-ltrans \
-fmerge-all-constants \ -fmerge-all-constants \
-fshort-wchar \ -fshort-wchar \
-flto=auto \ -flto=auto \
-finline-small-functions \ -finline-small-functions \
-finline-functions \ -finline-functions \
-findirect-inlining \ -findirect-inlining \