Skip to content

Commit 02478c5

Browse files
committed
more ci fix
1 parent e62d1a0 commit 02478c5

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

examples/make.mk

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -30,43 +30,6 @@ CMDEXE := 1
3030
SHELL := cmd.exe
3131
endif
3232

33-
#-------------- Cross Compiler ------------
34-
# Can be set by board, default to ARM GCC
35-
CROSS_COMPILE ?= arm-none-eabi-
36-
37-
ifeq ($(CC),iccarm)
38-
USE_IAR = 1
39-
endif
40-
41-
ifdef USE_IAR
42-
AS = iasmarm
43-
LD = ilinkarm
44-
OBJCOPY = ielftool
45-
SIZE = size
46-
47-
else
48-
CC = $(CROSS_COMPILE)gcc
49-
CXX = $(CROSS_COMPILE)g++
50-
AS = $(CC) -x assembler-with-cpp
51-
LD = $(CC)
52-
53-
GDB = $(CROSS_COMPILE)gdb
54-
OBJCOPY = $(CROSS_COMPILE)objcopy
55-
SIZE = $(CROSS_COMPILE)size
56-
endif
57-
58-
ifeq ($(CMDEXE),1)
59-
CP = copy
60-
RM = del
61-
MKDIR = mkdir
62-
PYTHON = python
63-
else
64-
CP = cp
65-
RM = rm
66-
MKDIR = mkdir
67-
PYTHON = python3
68-
endif
69-
7033

7134
# Build directory
7235
BUILD := _build/$(BOARD)
@@ -111,6 +74,43 @@ else
11174
SRC_C += $(subst $(TOP)/,,$(wildcard $(TOP)/$(FAMILY_PATH)/*.c))
11275
endif
11376

77+
#-------------- Cross Compiler ------------
78+
# Can be set by board, default to ARM GCC
79+
CROSS_COMPILE ?= arm-none-eabi-
80+
81+
ifeq ($(CC),iccarm)
82+
USE_IAR = 1
83+
endif
84+
85+
ifdef USE_IAR
86+
AS = iasmarm
87+
LD = ilinkarm
88+
OBJCOPY = ielftool
89+
SIZE = size
90+
91+
else
92+
CC = $(CROSS_COMPILE)gcc
93+
CXX = $(CROSS_COMPILE)g++
94+
AS = $(CC) -x assembler-with-cpp
95+
LD = $(CC)
96+
97+
GDB = $(CROSS_COMPILE)gdb
98+
OBJCOPY = $(CROSS_COMPILE)objcopy
99+
SIZE = $(CROSS_COMPILE)size
100+
endif
101+
102+
ifeq ($(CMDEXE),1)
103+
CP = copy
104+
RM = del
105+
MKDIR = mkdir
106+
PYTHON = python
107+
else
108+
CP = cp
109+
RM = rm
110+
MKDIR = mkdir
111+
PYTHON = python3
112+
endif
113+
114114
#-------------- Source files and compiler flags --------------
115115

116116
# Include all source C in family & board folder

hw/bsp/stm32h7/family.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ GCC_CFLAGS += \
3737
-nostdlib -nostartfiles
3838

3939
# suppress warning caused by vendor mcu driver
40-
GCC_CFLAGS += -Wno-error=maybe-uninitialized -Wno-error=cast-align
40+
GCC_CFLAGS += -Wno-error=maybe-uninitialized -Wno-error=cast-align -Wno-error=unused-parameter
4141

4242
# IAR Flags
4343
IAR_CFLAGS += --cpu cortex-m7 --fpu VFPv5_D16

0 commit comments

Comments
 (0)