scons

xusiwei · xusiwei · commit c3195a709674 · 2025-08-21T23:56:24.000+08:00
diff --git a/bsp/nxp/imx/imx91/.config b/bsp/nxp/imx/imx91/.config
diff --git a/bsp/nxp/imx/imx91/Kconfig b/bsp/nxp/imx/imx91/Kconfig
@@ -6,19 +6,23 @@ RTT_DIR := ../../../..
 
 PKGS_DIR := packages
 
+source "$(RTT_DIR)/Kconfig"
+osource "$PKGS_DIR/Kconfig"
+
 config BOARD_IMX91
     bool
     select ARCH_ARM_CORTEX_A55
     select RT_USING_GIC_V2
     default y
 
-source "$(RTT_DIR)/Kconfig"
-osource "$PKGS_DIR/Kconfig"
-
-source "$(BSP_DIR)/drivers/Kconfig"
-
 config SOC_MIMX91X1D
     bool
+    select ARCH_ARMV8
+    select ARCH_CPU_64BIT
+    select RT_USING_CACHE
     select RT_USING_COMPONENTS_INIT
     select RT_USING_USER_MAIN
+    select ARCH_ARM_BOOTWITH_FLUSH_CACHE
     default y
+
+source "$(BSP_DIR)/drivers/Kconfig"
diff --git a/bsp/nxp/imx/imx91/SConscript b/bsp/nxp/imx/imx91/SConscript
@@ -1,8 +1,8 @@
 # for module compiling
 import os
-Import('RTT_ROOT')
+from building import *
 
-cwd = str(Dir('#'))
+cwd  = GetCurrentDir()
 objs = []
 list = os.listdir(cwd)
 
diff --git a/bsp/nxp/imx/imx91/SConstruct b/bsp/nxp/imx/imx91/SConstruct
@@ -10,23 +10,6 @@ else:
 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
 from building import *
 
-def bsp_pkg_check():
-    import subprocess
-
-    check_paths = [
-        os.path.join("packages", "nxp-imx91-sdk-latest"),
-    ]
-
-    need_update = not all(os.path.exists(p) for p in check_paths)
-
-    if need_update:
-        print("\n==============================================================")
-        print("Dependency packages missing, please running 'pkgs --update'...")
-        print("==============================================================")
-        exit(1)
-
-RegisterPreBuildingAction(bsp_pkg_check)
-
 TARGET = 'rtthread.' + rtconfig.TARGET_EXT
 
 DefaultEnvironment(tools=[])
diff --git a/bsp/nxp/imx/imx91/applications/SConscript b/bsp/nxp/imx/imx91/applications/SConscript
@@ -1,15 +1,9 @@
 from building import *
-import os
 
-cwd = GetCurrentDir()
-src = Glob('*.c')
+cwd     = GetCurrentDir()
+src     = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
-list = os.listdir(cwd)
-for item in list:
-    if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
-        group = group + SConscript(os.path.join(item, 'SConscript'))
-
 Return('group')
diff --git a/bsp/nxp/imx/imx91/applications/application.c b/bsp/nxp/imx/imx91/applications/application.c
diff --git a/bsp/nxp/imx/imx91/applications/startup.c b/bsp/nxp/imx/imx91/applications/startup.c
diff --git a/bsp/nxp/imx/imx91/drivers/board.h b/bsp/nxp/imx/imx91/drivers/board.h
@@ -13,10 +13,9 @@
 
 #include <registers.h>
 #include <irq_numbers.h>
-#include "imx91.h"
 
-#define CONFIG_MX6
-#define CONFIG_MX6UL
+#include "imx91.h"
+#include "rtconfig.h"
 
 #if defined(__CC_ARM)
 extern int Image$$RW_IRAM1$$ZI$$Limit;
diff --git a/bsp/nxp/imx/imx91/drivers/imx91.h b/bsp/nxp/imx/imx91/drivers/imx91.h
@@ -94,4 +94,5 @@ rt_inline void disable_interrupt(uint32_t irq_id, uint32_t cpu_id)
     rt_hw_interrupt_mask(irq_id);
 }
 
-#endif  /* __IMX6UL_H__ */
+#endif  /* __IMX91_H__ */
+
diff --git a/bsp/nxp/imx/imx91/drivers/iomux/iomux_config.c b/bsp/nxp/imx/imx91/drivers/iomux/iomux_config.c
@@ -29,7 +29,7 @@
 
 #include "iomux_config.h"
 
-// Function to configure iomux for i.MX6SL board MCIMX6SLEVK rev. B.
+// Function to configure iomux for i.MX91 board FRDM-i.MX91
 void iomux_config(void)
 {
     uart1_iomux_config();
diff --git a/bsp/nxp/imx/imx91/drivers/iomux/uart_iomux_config.c b/bsp/nxp/imx/imx91/drivers/iomux/uart_iomux_config.c
@@ -105,13 +105,13 @@ void uart_iomux_config(int instance)
             return uart5_iomux_config();
 
         case HW_UART6:
-            return uart5_iomux_config();
+            return uart6_iomux_config();
 
         case HW_UART7:
-            return uart5_iomux_config();
+            return uart7_iomux_config();
 
         case HW_UART8:
-            return uart5_iomux_config();
+            return uart8_iomux_config();
 
         default:
             assert(false);
diff --git a/bsp/nxp/imx/imx91/drivers/serial.c b/bsp/nxp/imx/imx91/drivers/serial.c
@@ -5,7 +5,8 @@
  *
  * Change Logs:
  * Date           Author       Notes
- * 2025-07-12     BruceOu      The first verion
+ * 2025-07-12     BruceOu      The first version
+ * 2025-08-10     Siwei Xu     Fix compile errors
  */
 
 #include <rthw.h>
diff --git a/bsp/nxp/imx/imx91/drivers/serial.h b/bsp/nxp/imx/imx91/drivers/serial.h
@@ -5,7 +5,8 @@
  *
  * Change Logs:
  * Date           Author       Notes
- * 2025-07-12     BruceOu      the first verion
+ * 2025-07-12     BruceOu      the first 
+ * 2025-08-10     Siwei Xu     Fix compile errors
  */
 
 #ifndef __UART_H__
diff --git a/bsp/nxp/imx/imx91/rtconfig.h b/bsp/nxp/imx/imx91/rtconfig.h
diff --git a/bsp/nxp/imx/imx91/rtconfig.py b/bsp/nxp/imx/imx91/rtconfig.py

Original file line number	Diff line number	Diff line change
`@@ -94,4 +94,5 @@ rt_inline void disable_interrupt(uint32_t irq_id, uint32_t cpu_id)`
`94`	`94`	`rt_hw_interrupt_mask(irq_id);`
`95`	`95`	`}`
`96`	`96`
`97`		`-#endif /* __IMX6UL_H__ */`
	`97`	`+#endif /* __IMX91_H__ */`
	`98`	`+`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`
`30`	`30`	`#include "iomux_config.h"`
`31`	`31`
`32`		`-// Function to configure iomux for i.MX6SL board MCIMX6SLEVK rev. B.`
	`32`	`+// Function to configure iomux for i.MX91 board FRDM-i.MX91`
`33`	`33`	`void iomux_config(void)`
`34`	`34`	`{`
`35`	`35`	`uart1_iomux_config();`