Skip to content

Commit 7d0ce56

Browse files
committed
allow to skip CPU_CORE
1 parent 086c1d4 commit 7d0ce56

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/build_iar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run: python3 tools/get_deps.py ${{ matrix.family }}
4848

4949
- name: Build
50-
run: python3 tools/build_family.py ${{ matrix.family }} CC=iccarm
50+
run: python3 tools/build_family.py ${{ matrix.family }} TOOLCHAIN=iar
5151

5252
cmake:
5353
runs-on: [self-hosted, Linux, X64, hifiphile]

examples/make.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,5 +137,10 @@ else ifeq ($(LOGGER),swo)
137137
CFLAGS += -DLOGGER_SWO
138138
endif
139139

140+
# CPU specific flags
141+
ifdef CPU_CORE
142+
include $(TOP)/tools/make/cpu/$(CPU_CORE).mk
143+
endif
144+
140145
# toolchain specific
141146
include $(TOP)/tools/make/toolchain/arm_$(TOOLCHAIN).mk

tools/build_family.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
build_separator = '-' * 106
1313

14-
make_iar_option = 'CC=iccarm'
14+
make_iar_option = 'TOOLCHAIN=iar'
1515

1616
def filter_with_input(mylist):
1717
if len(sys.argv) > 1:

tools/make/toolchain/arm_gcc.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ GDB = $(CROSS_COMPILE)gdb
99
OBJCOPY = $(CROSS_COMPILE)objcopy
1010
SIZE = $(CROSS_COMPILE)size
1111

12-
# CPU specific flags
13-
include $(TOP)/tools/make/cpu/$(CPU_CORE).mk
14-
1512
# ---------------------------------------
1613
# Compiler Flags
1714
# ---------------------------------------

tools/make/toolchain/arm_iar.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ LD = ilinkarm
44
OBJCOPY = ielftool --silent
55
SIZE = size
66

7-
include $(TOP)/tools/make/cpu/$(CPU_CORE).mk
8-
97
# Enable extension mode (gcc compatible)
108
CFLAGS += -e --debug --silent
119

0 commit comments

Comments
 (0)