Fix rt_hw_board_init

Author: xusiwei

bsp/nxp/imx/imx91/drivers/board.c

@@ -14,15 +14,18 @@
 #include <gtimer.h>
 #include <mm_aspace.h>
 #include <mm_page.h>
+
+#include <rtconfig.h>
 #include <rtdevice.h>
 
 #include <mmu.h>
 
-#define BOARD_DRAM_SIZE (256 * 1024 * 1024)
+#include <limits.h>
+
 
 struct mem_desc platform_mem_desc[] = {
-    {0x00200000, 0x00200000 + BOARD_DRAM_SIZE - 1, 0x80000000, NORMAL_MEM}, // 256MB DRAM
-    {0xD0000000, 0xFFFFFFFF, 0x38000000, DEVICE_MEM},
+    {0x80100000, 0x8FFFFFFF, 0x80000000, NORMAL_MEM},
+    {0xD4000000, 0xDFFFFFFF, 0x44380000, DEVICE_MEM},
 };
 
 const rt_uint32_t platform_mem_desc_size = sizeof(platform_mem_desc)/sizeof(platform_mem_desc[0]);
@@ -81,38 +84,46 @@ void rt_hw_board_init(void)
 {
     // enable_neon_fpu();
     // disable_strict_align_check();
+    rt_hw_earlycon_ioremap();
+
+    rt_hw_earlycon_puts("rt_hw_board_init!\n");
+    rt_hw_mmu_map_init(&rt_kernel_space, (void*)0x080000000000, 0x10000000, MMUTable, 0);
+    rt_hw_earlycon_puts("[rt_hw_board_init] rt_hw_mmu_map_init done!\n");
 
-    imx_uart1_puts("rt_hw_board_init!\n");
-    // rt_hw_mmu_map_init(&rt_kernel_space, (void*)0x080000000000, 0x10000000, MMUTable, 0);
+    rt_hw_earlycon_print_hex("[rt_hw_board_init] rt_kernel_space.start: ", (rt_base_t) rt_kernel_space.start);
+    rt_hw_earlycon_print_hex("[rt_hw_board_init] rt_kernel_space.size:  ", (rt_base_t) rt_kernel_space.size);
 
-    // imx_uart1_puts("rt_page_init!\n");
-    // imx_uart1_print_hex("PAGE_START: ", (rt_base_t) PAGE_START);
-    // imx_uart1_print_hex("PAGE_END:   ", (rt_base_t) PAGE_END);
-    // rt_page_init(init_page_region);
+    rt_hw_earlycon_print_hex("[rt_hw_board_init] PAGE_START: ", (rt_base_t) PAGE_START);
+    rt_hw_earlycon_print_hex("[rt_hw_board_init] PAGE_END:   ", (rt_base_t) PAGE_END);
+    rt_page_init(init_page_region);
 
-    // imx_uart1_puts("rt_hw_mmu_setup!\n");
-    // rt_hw_mmu_setup(&rt_kernel_space, platform_mem_desc, platform_mem_desc_size);
+    rt_hw_earlycon_puts("[rt_hw_board_init] rt_hw_mmu_setup!\n");
+    rt_hw_mmu_setup(&rt_kernel_space, platform_mem_desc, platform_mem_desc_size);
 
 #ifdef RT_USING_HEAP
     /* initialize system heap */
+    rt_hw_earlycon_puts("[rt_hw_board_init] rt_system_heap_init!\n");
     rt_system_heap_init((void *)HEAP_BEGIN, (void *)HEAP_END);
 #endif
 
     /* initialize hardware interrupt */
+    rt_hw_earlycon_puts("[rt_hw_board_init] rt_hw_interrupt_init!\n");
     rt_hw_interrupt_init();
 
+    /* initialize uart */
+    rt_hw_earlycon_puts("[rt_hw_board_init] rt_hw_uart_init!\n");
     rt_hw_uart_init();
-    rt_hw_console_output("rt_hw_uart_init done!\n");
+    rt_hw_console_output("[rt_hw_board_init] rt_hw_uart_init done!\n");
 
     /* initialize timer for os tick */
     rt_hw_gtimer_init();
 
     rt_components_board_init();
     rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
 
-    rt_hw_console_output("rt_hw_board_init done!\n");
-    rt_kprintf("rt_kprintf works!\n");
-    rt_hw_console_output("rt_hw_board_init done!!\n");
+    rt_hw_console_output("[rt_hw_board_init] rt_hw_board_init done!\n");
+    rt_kprintf("[rt_hw_board_init] rt_kprintf works!\n");
+    rt_hw_console_output("[rt_hw_board_init] rt_hw_board_init done!!\n");
 }
 
 /*@}*/

bsp/nxp/imx/imx91/drivers/board.h

@@ -25,14 +25,7 @@ extern int __bss_end;
 #define HEAP_BEGIN      ((void*)&__bss_end)
 #endif
 
-// #define KERNEL_VADDR_START 0x0
-#ifndef KERNEL_VADDR_START
-#define KERNEL_VADDR_START (ARCH_RAM_OFFSET + ARCH_TEXT_OFFSET)
-#endif
-
-#define HEAP_END        (KERNEL_VADDR_START + 32 * 1024 * 1024)
-
-// #define HEAP_END        (void*)(HEAP_BEGIN + 32 * 1024 * 1024)
+#define HEAP_END        (void*)(HEAP_BEGIN + 32 * 1024 * 1024)
 #define PAGE_START      HEAP_END
 #define PAGE_END        ((size_t)PAGE_START + 128 * 1024 * 1024)
 

bsp/nxp/imx/imx91/drivers/serial.c

@@ -26,6 +26,7 @@ struct hw_uart_device
     const char *device_name; /* serial device name */
 
     LPUART_Type* uart_base;
+    LPUART_Type* uart_instance;
     int irqn;
 
     clock_root_t clock_root; /* clock root */
@@ -38,7 +39,8 @@ struct hw_uart_device
 static struct hw_uart_device _uart1_device =
 {
     .device_name = "uart1",
-    .uart_base = LPUART1,
+    .uart_base = RT_NULL,
+    .uart_instance = LPUART1,
     .irqn = LPUART1_IRQn,
     .clock_root = kCLOCK_Root_Lpuart1,
     .clock_mux = kCLOCK_LPUART1_ClockRoot_MuxOsc24M,
@@ -238,38 +240,47 @@ static int uart_putc(struct rt_serial_device *serial, char c)
     return 1;
 }
 
-void imx_uart1_putc(char c)
+volatile LPUART_Type *earlycon_base = LPUART1;
+const size_t earlycon_size = 4096; // sizeof(LPUART_Type);
+
+void rt_hw_earlycon_ioremap(void)
+{
+    earlycon_base = rt_ioremap_early((void *)earlycon_base, earlycon_size);
+    rt_hw_earlycon_print_hex("earlycon_base: ", (rt_base_t)earlycon_base);
+}
+
+void rt_hw_earlycon_putc(char c)
 {
-    LPUART_WriteByte(LPUART1, c);
-    while (!(LPUART_GetStatusFlags(LPUART1) & kLPUART_TxDataRegEmptyFlag));
+    LPUART_WriteByte(earlycon_base, c);
+    while (!(LPUART_GetStatusFlags(earlycon_base) & kLPUART_TxDataRegEmptyFlag));
 }
 
-void imx_uart1_puts(const char *str)
+void rt_hw_earlycon_puts(const char *str)
 {
     int has_cr = 0;
     while (*str) {
         if (*str == '\r') {
             has_cr = 1;
         } else if (*str == '\n') {
             if (!has_cr) {
-                imx_uart1_putc('\r');
+                rt_hw_earlycon_putc('\r');
             }
         }
-        imx_uart1_putc(*str++);
+        rt_hw_earlycon_putc(*str++);
     }
 }
 
-void imx_uart1_print_hex(const char *str, rt_base_t hex)
+void rt_hw_earlycon_print_hex(const char *str, rt_base_t hex)
 {
-    imx_uart1_puts(str);
-    imx_uart1_putc('0');
-    imx_uart1_putc('x');
+    rt_hw_earlycon_puts(str);
+    rt_hw_earlycon_putc('0');
+    rt_hw_earlycon_putc('x');
     for (int i = 60; i >= 0; i -= 4) {
         rt_base_t h = (hex >> i) & 0xF;
-        imx_uart1_putc(h < 10 ? '0' + h : 'A' + h - 10);
+        rt_hw_earlycon_putc(h < 10 ? '0' + h : 'A' + h - 10);
     }
-    imx_uart1_putc('\r');
-    imx_uart1_putc('\n');
+    rt_hw_earlycon_putc('\r');
+    rt_hw_earlycon_putc('\n');
 }
 
 void rt_hw_console_putc(char c)
@@ -340,7 +351,8 @@ int rt_hw_uart_init(void)
         {
             hw_uart_devices[i]->serial.ops = &_uart_ops;
             hw_uart_devices[i]->serial.config = config;
-            // hw_uart_devices[i]->uart_base = rt_ioremap((void *)hw_uart_devices[i]->uart_base, sizeof(LPUART_Type));
+            rt_hw_earlycon_print_hex("ioremap uart_instance: ", (rt_base_t)hw_uart_devices[i]->uart_instance);
+            hw_uart_devices[i]->uart_base = rt_ioremap((void *)hw_uart_devices[i]->uart_instance, 0x1000);
 
             rt_hw_serial_register(&hw_uart_devices[i]->serial, hw_uart_devices[i]->device_name,
                                   RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX, hw_uart_devices[i]);

bsp/nxp/imx/imx91/drivers/serial.h

@@ -17,9 +17,10 @@
 
 int rt_hw_uart_init(void);
 
-void imx_uart1_putc(char c);
-void imx_uart1_puts(const char *str);
-void imx_uart1_print_hex(const char *str, rt_base_t hex);
+void rt_hw_earlycon_ioremap(void);
+void rt_hw_earlycon_putc(char c);
+void rt_hw_earlycon_puts(const char *str);
+void rt_hw_earlycon_print_hex(const char *str, rt_base_t hex);
 
 void rt_hw_console_putc(char c);
 void rt_hw_console_output(const char *str);

bsp/nxp/imx/imx91/rtconfig.py

@@ -38,7 +38,7 @@
     OBJDUMP = PREFIX + 'objdump'
     OBJCPY = PREFIX + 'objcopy'
 
-    DEVICE = ' -march=armv8-a -mtune=cortex-a55 -fno-omit-frame-pointer'
+    DEVICE = ' -march=armv8-a -mtune=cortex-a55'
     CPPFLAGS = ' -E -P -x assembler-with-cpp'
     CFLAGS = DEVICE + ' -Wall -Wno-cpp -D_POSIX_SOURCE'
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -D__ASSEMBLY__'
@@ -50,10 +50,10 @@
     LPATH = ''
 
     if BUILD == 'debug':
-        CFLAGS += ' -O0'
-        CPPFLAGS += ' -O0 -ggdb -gdwarf-2'
+        CFLAGS += ' -O0 -ggdb'
+        CPPFLAGS += ' -O0 -ggdb'
     else:
-        CFLAGS += ' -O2'
+        CFLAGS += ' -O2 -ggdb'
         CPPFLAGS += ' -O2 -ggdb'
 
     POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' +\