From b7c2d1ba42267820ed6f82384367e5981cdb3b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E7=86=99?= <yandld@hipnuc.com>
Date: Fri, 3 Mar 2023 11:13:22 +0800
Subject: [PATCH] [bsp][lpc55sxx] add CPU define for S06/S16/S29/S36 make GCC
 comiple pass

---
 .github/workflows/action.yml              | 4 ++++
 bsp/lpc55sxx/lpc55s06_nxp_evk/rtconfig.py | 2 +-
 bsp/lpc55sxx/lpc55s16_nxp_evk/rtconfig.py | 2 +-
 bsp/lpc55sxx/lpc55s28_nxp_evk/rtconfig.py | 2 +-
 bsp/lpc55sxx/lpc55s36_nxp_evk/rtconfig.py | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
index 2b714458a3..b2f98fb116 100644
--- a/.github/workflows/action.yml
+++ b/.github/workflows/action.yml
@@ -102,6 +102,10 @@ jobs:
          - {RTT_BSP: "lpc43xx/M4", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "lpc176x", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "lpc55sxx/lpc55s69_nxp_evk", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "lpc55sxx/lpc55s28_nxp_evk", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "lpc55sxx/lpc55s06_nxp_evk", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "lpc55sxx/lpc55s16_nxp_evk", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "lpc55sxx/lpc55s36_nxp_evk", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "lpc178x", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "lpc408x", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "lpc1114", RTT_TOOL_CHAIN: "sourcery-arm"}
diff --git a/bsp/lpc55sxx/lpc55s06_nxp_evk/rtconfig.py b/bsp/lpc55sxx/lpc55s06_nxp_evk/rtconfig.py
index cac2fca3e5..4f7c9654a1 100644
--- a/bsp/lpc55sxx/lpc55s06_nxp_evk/rtconfig.py
+++ b/bsp/lpc55sxx/lpc55s06_nxp_evk/rtconfig.py
@@ -44,7 +44,7 @@ if PLATFORM == 'gcc':
     OBJCPY = PREFIX + 'objcopy'
     STRIP = PREFIX + 'strip'
 
-    DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections'
+    DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -DCPU_LPC55S06JBD64'
     CFLAGS = DEVICE + ' -Wall -D__FPU_PRESENT -eentry'
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb -D__START=entry'
     LFLAGS = DEVICE + ' -lm -lgcc -lc' + ' -nostartfiles -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T board/linker_scripts/LPC55S06_flash.ld'
diff --git a/bsp/lpc55sxx/lpc55s16_nxp_evk/rtconfig.py b/bsp/lpc55sxx/lpc55s16_nxp_evk/rtconfig.py
index 61ba4da031..059245f3a2 100644
--- a/bsp/lpc55sxx/lpc55s16_nxp_evk/rtconfig.py
+++ b/bsp/lpc55sxx/lpc55s16_nxp_evk/rtconfig.py
@@ -44,7 +44,7 @@ if PLATFORM == 'gcc':
     OBJCPY = PREFIX + 'objcopy'
     STRIP = PREFIX + 'strip'
 
-    DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections'
+    DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -DCPU_LPC55S16JBD100'
     CFLAGS = DEVICE + ' -Wall -D__FPU_PRESENT -eentry'
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb -D__START=entry'
     LFLAGS = DEVICE + ' -lm -lgcc -lc' + ' -nostartfiles -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T board/linker_scripts/LPC55S16_flash.ld'
diff --git a/bsp/lpc55sxx/lpc55s28_nxp_evk/rtconfig.py b/bsp/lpc55sxx/lpc55s28_nxp_evk/rtconfig.py
index b2ff73644b..ab70291753 100644
--- a/bsp/lpc55sxx/lpc55s28_nxp_evk/rtconfig.py
+++ b/bsp/lpc55sxx/lpc55s28_nxp_evk/rtconfig.py
@@ -44,7 +44,7 @@ if PLATFORM == 'gcc':
     OBJCPY = PREFIX + 'objcopy'
     STRIP = PREFIX + 'strip'
 
-    DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections'
+    DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -DCPU_LPC55S28JBD100'
     CFLAGS = DEVICE + ' -Wall -D__FPU_PRESENT -eentry'
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb -D__START=entry'
     LFLAGS = DEVICE + ' -lm -lgcc -lc' + ' -nostartfiles -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T board/linker_scripts/LPC55S28_flash.ld'
diff --git a/bsp/lpc55sxx/lpc55s36_nxp_evk/rtconfig.py b/bsp/lpc55sxx/lpc55s36_nxp_evk/rtconfig.py
index 08e6c11d0e..80a288917b 100644
--- a/bsp/lpc55sxx/lpc55s36_nxp_evk/rtconfig.py
+++ b/bsp/lpc55sxx/lpc55s36_nxp_evk/rtconfig.py
@@ -44,7 +44,7 @@ if PLATFORM == 'gcc':
     OBJCPY = PREFIX + 'objcopy'
     STRIP = PREFIX + 'strip'
 
-    DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections'
+    DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -DCPU_LPC55S36JBD100'
     CFLAGS = DEVICE + ' -Wall -D__FPU_PRESENT -eentry'
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb -D__START=entry'
     LFLAGS = DEVICE + ' -lm -lgcc -lc' + ' -nostartfiles -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T board/linker_scripts/LPC55S36_flash.ld'
-- 
GitLab