Merge branch 'master' of https://github.com/illustriousness/rt-thread

Author: liuyucai

.github/ALL_BSP_COMPILE.json

@@ -69,7 +69,6 @@
       "RTT_TOOL_CHAIN": "sourcery-arm",
       "SUB_RTT_BSP": [
         "phytium/aarch32",
-        "qemu-vexpress-a9",
         "airm2m/air32f103",
         "acm32/acm32f0x0-nucleo",
         "acm32/acm32f0x0-nucleo",
@@ -338,6 +337,7 @@
         "Infineon/psoc6-cy8cproto-062S3-4343W",
         "Infineon/psoc6-evaluationkit-062S2",
         "Infineon/xmc7200-kit_xmc7200_evk",
+        "Infineon/xmc7100d-f144k4160aa",
         "fujitsu/mb9x/mb9bf500r",
         "fujitsu/mb9x/mb9bf506r",
         "fujitsu/mb9x/mb9bf618s",
@@ -396,6 +396,13 @@
         "qemu-virt64-riscv"
       ]
     },
+    {
+      "RTT_BSP": "K230",
+      "RTT_TOOL_CHAIN": "riscv64-unknown-linux-musl-",
+      "SUB_RTT_BSP": [
+        "k230"
+      ]
+    },
     {
       "RTT_BSP": "hpmicro",
       "RTT_TOOL_CHAIN": "RISC-V-GCC-RV32",
@@ -449,6 +456,14 @@
         "nrf5x/nrf52840",
         "nrf5x/nrf5340"
       ]
+    },
+    {
+      "RTT_BSP": "arm-none-bsp-smart",
+      "RTT_TOOL_CHAIN": "sourcery-arm",
+      "RTT_SMART_TOOL_CHAIN": "arm-linux-musleabi",
+      "SUB_RTT_BSP": [
+        "qemu-vexpress-a9"
+      ]
     }
   ]
 }

.github/workflows/bsp_buildings.yml

@@ -183,6 +183,14 @@ jobs:
           /opt/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc --version
           echo "RTT_EXEC_PATH=/opt/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin" >> $GITHUB_ENV
 
+      - name: Install k230 MUSL ToolChains
+        if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'riscv64-unknown-linux-musl-' && matrix.legs.RTT_BSP == 'K230' && success() }}
+        run: |
+          wget -q https://download.rt-thread.org/rt-smart/riscv64/riscv64-linux-musleabi_for_x86_64-pc-linux-gnu_251248.tar.bz2
+          sudo tar xjf riscv64-linux-musleabi_for_x86_64-pc-linux-gnu_251248.tar.bz2 -C /opt
+          /opt/riscv64-linux-musleabi_for_x86_64-pc-linux-gnu/bin/riscv64-unknown-linux-musl-gcc --version
+          echo "RTT_EXEC_PATH=/opt/riscv64-linux-musleabi_for_x86_64-pc-linux-gnu/bin" >> $GITHUB_ENV
+
       - name: Install riscv32-unknown-elf Toolchains
         if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'RISC-V-GCC-RV32' && success() }}
         run: |
@@ -208,6 +216,14 @@ jobs:
           pip3 install esptool
           echo "RTT_EXEC_PATH=/opt/riscv32-esp-elf/bin" >> $GITHUB_ENV
 
+      - name: Install Arm Musl ToolChains
+        if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'sourcery-arm' && matrix.legs.RTT_SMART_TOOL_CHAIN == 'arm-linux-musleabi'  && success() }}
+        shell: bash
+        run: |
+          wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.7/arm-linux-musleabi_for_x86_64-pc-linux-gnu_stable.tar.bz2
+          sudo tar xjf arm-linux-musleabi_for_x86_64-pc-linux-gnu_stable.tar.bz2 -C /opt
+          /opt/arm-linux-musleabi_for_x86_64-pc-linux-gnu/bin/arm-linux-musleabi-gcc --version
+
       - name: Install Simulator Tools
         if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'gcc' && success() }}
         run: |

bsp/Infineon/libraries/HAL_Drivers/SConscript

@@ -23,7 +23,7 @@ if GetDepend(['RT_USING_I2C', 'RT_USING_I2C_BITOPS']):
         src += ['drv_soft_i2c.c']
 
 if GetDepend(['RT_USING_I2C']):
-    if GetDepend('BSP_USING_HW_I2C3') or GetDepend('BSP_USING_HW_I2C4') or GetDepend('BSP_USING_HW_I2C6'):
+    if GetDepend('BSP_USING_HW_I2C1') or GetDepend('BSP_USING_HW_I2C3') or GetDepend('BSP_USING_HW_I2C4') or GetDepend('BSP_USING_HW_I2C6'):
         src += ['drv_i2c.c']
 
 if GetDepend(['BSP_USING_SDIO1']):

bsp/Infineon/libraries/HAL_Drivers/drv_gpio.c

@@ -6,6 +6,7 @@
  * Change Logs:
  * Date           Author            Notes
  * 2022-07-1      Rbb666            first version
+ * 2025-04-24     Passionate0424    fix ifx_pin_irq_enable
  */
 
 #include "drv_gpio.h"
@@ -353,7 +354,7 @@ static rt_err_t ifx_pin_irq_enable(struct rt_device *device, rt_base_t pin,
     {
         level = rt_hw_interrupt_disable();
 
-        Cy_GPIO_Port_Deinit(CYHAL_GET_PORTADDR(gpio_pin));
+        irqmap = &pin_irq_map[gpio_port];
 
 #if !defined(COMPONENT_CAT1C)
         IRQn_Type irqn = (IRQn_Type)(irqmap->irqno + PORT_GET(irqmap->port));

bsp/Infineon/libraries/HAL_Drivers/drv_i2c.c

@@ -6,14 +6,24 @@
  * Change Logs:
  * Date           Author       Notes
  * 2022-07-08     Rbb666       first implementation.
+ * 2025-04-21     Hydevcode    adapt xmc7100d
  */
 
 #include "board.h"
 
 #if defined(RT_USING_I2C)
-#if defined(BSP_USING_HW_I2C2) || defined(BSP_USING_HW_I2C3) || defined(BSP_USING_HW_I2C4)|| defined(BSP_USING_HW_I2C6)
+#if defined(BSP_USING_HW_I2C1) || defined(BSP_USING_HW_I2C2) || defined(BSP_USING_HW_I2C3) || defined(BSP_USING_HW_I2C4)|| defined(BSP_USING_HW_I2C6)
 #include <rtdevice.h>
 
+#ifndef I2C1_CONFIG
+#define I2C1_CONFIG                  \
+    {                                \
+        .name = "i2c1",              \
+        .scl_pin = BSP_I2C1_SCL_PIN, \
+        .sda_pin = BSP_I2C1_SDA_PIN, \
+    }
+#endif /* I2C1_CONFIG */
+
 #ifndef I2C2_CONFIG
 #define I2C2_CONFIG                  \
     {                                \
@@ -53,6 +63,9 @@
 
 enum
 {
+#ifdef BSP_USING_HW_I2C1
+    I2C1_INDEX,
+#endif
 #ifdef BSP_USING_HW_I2C2
     I2C2_INDEX,
 #endif
@@ -84,6 +97,10 @@ struct ifx_i2c
 
 static struct ifx_i2c_config i2c_config[] =
 {
+#ifdef BSP_USING_HW_I2C1
+    I2C1_CONFIG,
+#endif
+
 #ifdef BSP_USING_HW_I2C2
     I2C2_CONFIG,
 #endif

bsp/Infineon/libraries/HAL_Drivers/drv_spi.c

@@ -7,6 +7,7 @@
  * Date           Author       Notes
  * 2022-07-18     Rbb666       first version
  * 2023-03-30     Rbb666       update spi driver
+ * 2025-04-27     Hydevcode    update spi driver
  */
 
 #include <drv_spi.h>
@@ -28,6 +29,9 @@
 #ifdef BSP_USING_SPI3
     static struct rt_spi_bus spi_bus3;
 #endif
+#ifdef BSP_USING_SPI5
+    static struct rt_spi_bus spi_bus5;
+#endif
 #ifdef BSP_USING_SPI6
     static struct rt_spi_bus spi_bus6;
 #endif
@@ -50,6 +54,14 @@ static struct ifx_spi_handle spi_bus_obj[] =
         .mosi_pin = GET_PIN(6, 0),
     },
 #endif
+#if defined(BSP_USING_SPI5)
+    {
+        .bus_name = "spi5",
+        .sck_pin = GET_PIN(7, 2),
+        .miso_pin = GET_PIN(7, 0),
+        .mosi_pin = GET_PIN(7, 1),
+    },
+#endif
 #if defined(BSP_USING_SPI6)
     {
         .bus_name = "spi6",

bsp/Infineon/libraries/HAL_Drivers/drv_uart.c

@@ -6,6 +6,7 @@
  * Change Logs:
  * Date           Author       Notes
  * 2022-06-29     Rbb666       first version
+ * 2025-04-21     hydevcode    modify xmc7100d uart
  */
 
 #include <rtthread.h>
@@ -228,9 +229,10 @@ static rt_err_t ifx_control(struct rt_serial_device *serial, int cmd, void *arg)
 
         /* Enable the interrupt */
 #if defined(SOC_SERIES_IFX_XMC)
+        NVIC_DisableIRQ(UART_NvicMuxN_IRQn);
         NVIC_EnableIRQ(UART_NvicMuxN_IRQn);
 #else
-        NVIC_EnableIRQ(uart->config->intrSrc);
+        NVIC_EnableIRQ(uart->config->UART_SCB_IRQ_cfg->intrSrc);
 #endif
         break;
     }

bsp/Infineon/libraries/HAL_Drivers/drv_uart.h

@@ -21,16 +21,10 @@
 struct ifx_uart_config
 {
     cyhal_uart_t *uart_obj;
-
     const char *name;
     rt_uint32_t tx_pin;
     rt_uint32_t rx_pin;
     CySCB_Type *usart_x;
-#if defined(SOC_SERIES_IFX_XMC)
-    rt_uint32_t intrSrc;
-#else
-    IRQn_Type intrSrc;
-#endif
     cy_israddress userIsr;
     cy_stc_sysint_t *UART_SCB_IRQ_cfg;
 };