Fix i.MX91 BSP compile errors

Author: xusiwei

bsp/nxp/imx/imx91/.config

@@ -6,19 +6,32 @@ 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
+    select BSP_USING_GICV3
+    select BSP_USING_GIC
     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
+
+    config BSP_USING_GIC
+        bool
+        default y
+
+    config BSP_USING_GICV3
+        bool
+        default y
+
+source "$(BSP_DIR)/drivers/Kconfig"

bsp/nxp/imx/imx91/Kconfig

@@ -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)
 

bsp/nxp/imx/imx91/SConscript

@@ -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=[])

bsp/nxp/imx/imx91/SConstruct

@@ -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')

bsp/nxp/imx/imx91/applications/SConscript

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2006-2022, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2017-5-30      Bernard      the first version
+ */
+
+#include <rtthread.h>
+
+int main(int argc, char** argv)
+{
+    rt_kprintf("Hi, this is RT-Thread!!\n");
+
+    return 0;
+}

bsp/nxp/imx/imx91/applications/application.c

@@ -1,10 +1,16 @@
 from building import *
 
 cwd = GetCurrentDir()
-src = Glob('*.c') + Glob('iomux/*.c')
+src = Glob('*.c') #+ Glob('iomux/*.c')
+# src = []
 
 CPPPATH = [cwd, cwd + '/iomux']
 
-group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
+objs = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
-Return('group')
+for item in os.listdir(cwd):
+    sconsfile = os.path.join(cwd, item, 'SConscript')
+    if os.path.isfile(sconsfile):
+        objs = objs + SConscript(sconsfile)
+
+Return('objs')

bsp/nxp/imx/imx91/applications/main.c

@@ -13,12 +13,12 @@
 
 #include "board.h"
 
-#include <registers/regsarmglobaltimer.h>
-#include <registers/regsepit.h>
+// #include <registers/regsarmglobaltimer.h>
+// #include <registers/regsepit.h>
 
-#include <imx_uart.h>
-#include <epit.h>
-#include <cortex_a.h>
+// #include <imx_uart.h>
+// #include <epit.h>
+// #include <cortex_a.h>
 
 #include <mmu.h>
 
@@ -32,38 +32,38 @@ const rt_uint32_t platform_mem_desc_size = sizeof(platform_mem_desc)/sizeof(plat
 static void rt_hw_timer_isr(int vector, void *param)
 {
     rt_tick_increase();
-    epit_get_compare_event(HW_EPIT1);
+    // epit_get_compare_event(HW_EPIT1);
 }
 
 int rt_hw_timer_init(void)
 {
     uint32_t freq;
 
     // Make sure the timer is off.
-    HW_ARMGLOBALTIMER_CONTROL.B.TIMER_ENABLE = 0;
+    // HW_ARMGLOBALTIMER_CONTROL.B.TIMER_ENABLE = 0;
 
-    HW_ARMGLOBALTIMER_CONTROL.B.FCR0 =1;
+    // HW_ARMGLOBALTIMER_CONTROL.B.FCR0 =1;
 
-    HW_ARMGLOBALTIMER_CONTROL.B.FCR1 =0;
+    // HW_ARMGLOBALTIMER_CONTROL.B.FCR1 =0;
 
-    HW_ARMGLOBALTIMER_CONTROL.B.DBG_ENABLE =0;
+    // HW_ARMGLOBALTIMER_CONTROL.B.DBG_ENABLE =0;
 
-    // Clear counter.
-    HW_ARMGLOBALTIMER_COUNTER_HI_WR(0);
-    HW_ARMGLOBALTIMER_COUNTER_LO_WR(0);
+    // // Clear counter.
+    // HW_ARMGLOBALTIMER_COUNTER_HI_WR(0);
+    // HW_ARMGLOBALTIMER_COUNTER_LO_WR(0);
 
-    // Now turn on the timer.
-    HW_ARMGLOBALTIMER_CONTROL.B.TIMER_ENABLE = 1;
+    // // Now turn on the timer.
+    // HW_ARMGLOBALTIMER_CONTROL.B.TIMER_ENABLE = 1;
 
-    freq = get_main_clock(IPG_CLK);
+    // freq = get_main_clock(IPG_CLK);
 
-    epit_init(HW_EPIT1, CLKSRC_IPG_CLK, freq / 1000000,
-              SET_AND_FORGET, 10000, WAIT_MODE_EN | STOP_MODE_EN);
+    // epit_init(HW_EPIT1, CLKSRC_IPG_CLK, freq / 1000000,
+    //           SET_AND_FORGET, 10000, WAIT_MODE_EN | STOP_MODE_EN);
 
-    epit_counter_enable(HW_EPIT1, 10000, IRQ_MODE);
+    // epit_counter_enable(HW_EPIT1, 10000, IRQ_MODE);
 
-    rt_hw_interrupt_install(IMX_INT_EPIT1, rt_hw_timer_isr, RT_NULL, "tick");
-    rt_hw_interrupt_umask(IMX_INT_EPIT1);
+    // rt_hw_interrupt_install(IMX_INT_EPIT1, rt_hw_timer_isr, RT_NULL, "tick");
+    // rt_hw_interrupt_umask(IMX_INT_EPIT1);
 
     return 0;
 }
@@ -74,8 +74,8 @@ INIT_BOARD_EXPORT(rt_hw_timer_init);
  */
 void rt_hw_board_init(void)
 {
-    enable_neon_fpu();
-    disable_strict_align_check();
+    // enable_neon_fpu();
+    // disable_strict_align_check();
 
     rt_components_board_init();
     rt_console_set_device(RT_CONSOLE_DEVICE_NAME);