From 7d0ce5605ace2acba928f444f3dd7eb6de0b29ec Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Sat, 24 Jun 2023 19:08:37 +0700
Subject: [PATCH] allow to skip CPU_CORE

---
 .github/workflows/build_iar.yml | 2 +-
 examples/make.mk                | 5 +++++
 tools/build_family.py           | 2 +-
 tools/make/toolchain/arm_gcc.mk | 3 ---
 tools/make/toolchain/arm_iar.mk | 2 --
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_iar.yml b/.github/workflows/build_iar.yml
index 48d66240e..8c9a500d7 100644
--- a/.github/workflows/build_iar.yml
+++ b/.github/workflows/build_iar.yml
@@ -47,7 +47,7 @@ jobs:
       run: python3 tools/get_deps.py ${{ matrix.family }}
 
     - name: Build
-      run: python3 tools/build_family.py ${{ matrix.family }} CC=iccarm
+      run: python3 tools/build_family.py ${{ matrix.family }} TOOLCHAIN=iar
 
   cmake:
     runs-on: [self-hosted, Linux, X64, hifiphile]
diff --git a/examples/make.mk b/examples/make.mk
index 4fcde83c8..3c3a920cc 100644
--- a/examples/make.mk
+++ b/examples/make.mk
@@ -137,5 +137,10 @@ else ifeq ($(LOGGER),swo)
   CFLAGS += -DLOGGER_SWO
 endif
 
+# CPU specific flags
+ifdef CPU_CORE
+include $(TOP)/tools/make/cpu/$(CPU_CORE).mk
+endif
+
 # toolchain specific
 include $(TOP)/tools/make/toolchain/arm_$(TOOLCHAIN).mk
diff --git a/tools/build_family.py b/tools/build_family.py
index 9b612b4cb..fb90e0edb 100644
--- a/tools/build_family.py
+++ b/tools/build_family.py
@@ -11,7 +11,7 @@ SKIPPED = "\033[33mskipped\033[0m"
 
 build_separator = '-' * 106
 
-make_iar_option = 'CC=iccarm'
+make_iar_option = 'TOOLCHAIN=iar'
 
 def filter_with_input(mylist):
     if len(sys.argv) > 1:
diff --git a/tools/make/toolchain/arm_gcc.mk b/tools/make/toolchain/arm_gcc.mk
index d5ee98def..693fda0b3 100644
--- a/tools/make/toolchain/arm_gcc.mk
+++ b/tools/make/toolchain/arm_gcc.mk
@@ -9,9 +9,6 @@ GDB = $(CROSS_COMPILE)gdb
 OBJCOPY = $(CROSS_COMPILE)objcopy
 SIZE = $(CROSS_COMPILE)size
 
-# CPU specific flags
-include $(TOP)/tools/make/cpu/$(CPU_CORE).mk
-
 # ---------------------------------------
 # Compiler Flags
 # ---------------------------------------
diff --git a/tools/make/toolchain/arm_iar.mk b/tools/make/toolchain/arm_iar.mk
index 42b31cfd3..f1850add7 100644
--- a/tools/make/toolchain/arm_iar.mk
+++ b/tools/make/toolchain/arm_iar.mk
@@ -4,8 +4,6 @@ LD = ilinkarm
 OBJCOPY = ielftool --silent
 SIZE = size
 
-include $(TOP)/tools/make/cpu/$(CPU_CORE).mk
-
 # Enable extension mode (gcc compatible)
 CFLAGS += -e --debug --silent