Merge pull request RT-Thread#9228 from messigogogo/master

[BSP/Phytium]适配最新驱动
polarvid · Jul 25, 2024 · bde4817 · bde4817
2 parents 30f995d + 1202d51
commit bde4817
Show file tree

Hide file tree

Showing 52 changed files with 718 additions and 746 deletions.
diff --git a/bsp/phytium/aarch32/.config b/bsp/phytium/aarch32/.config
@@ -8,14 +8,13 @@ CONFIG_RT_NAME_MAX=16
 # CONFIG_RT_USING_NANO is not set
 # CONFIG_RT_USING_AMP is not set
 CONFIG_RT_USING_SMP=y
-CONFIG_RT_CPUS_NR=2
+CONFIG_RT_CPUS_NR=4
 CONFIG_RT_ALIGN_SIZE=4
 # CONFIG_RT_THREAD_PRIORITY_8 is not set
 CONFIG_RT_THREAD_PRIORITY_32=y
 # CONFIG_RT_THREAD_PRIORITY_256 is not set
 CONFIG_RT_THREAD_PRIORITY_MAX=32
 CONFIG_RT_TICK_PER_SECOND=1000
-CONFIG_RT_USING_OVERFLOW_CHECK=y
 CONFIG_RT_USING_HOOK=y
 CONFIG_RT_HOOK_USING_FUNC_PTR=y
 # CONFIG_RT_USING_HOOKLIST is not set
@@ -26,6 +25,8 @@ CONFIG_SYSTEM_THREAD_STACK_SIZE=4096
 CONFIG_RT_USING_TIMER_SOFT=y
 CONFIG_RT_TIMER_THREAD_PRIO=4
 CONFIG_RT_TIMER_THREAD_STACK_SIZE=4096
+# CONFIG_RT_USING_TIMER_ALL_SOFT is not set
+# CONFIG_RT_USING_CPU_USAGE_TRACER is not set
 
 #
 # kservice optimization
@@ -49,6 +50,7 @@ CONFIG_RT_DEBUGING_CONTEXT=y
 # CONFIG_RT_DEBUGING_PAGE_LEAK is not set
 # CONFIG_RT_DEBUGING_SPINLOCK is not set
 # CONFIG_RT_DEBUGING_CRITICAL is not set
+CONFIG_RT_USING_OVERFLOW_CHECK=y
 
 #
 # Inter-Thread communication
@@ -184,6 +186,7 @@ CONFIG_RT_USING_DFS_MQUEUE=y
 # Device Drivers
 #
 # CONFIG_RT_USING_DM is not set
+CONFIG_RT_USING_DEV_BUS=y
 CONFIG_RT_USING_DEVICE_IPC=y
 CONFIG_RT_UNAMED_PIPE_NUMBER=64
 CONFIG_RT_USING_SYSTEM_WORKQUEUE=y
@@ -210,6 +213,8 @@ CONFIG_RT_USING_NULL=y
 CONFIG_RT_USING_ZERO=y
 CONFIG_RT_USING_RANDOM=y
 CONFIG_RT_USING_PWM=y
+# CONFIG_RT_USING_PULSE_ENCODER is not set
+# CONFIG_RT_USING_INPUT_CAPTURE is not set
 # CONFIG_RT_USING_MTD_NOR is not set
 # CONFIG_RT_USING_MTD_NAND is not set
 # CONFIG_RT_USING_PM is not set
@@ -236,21 +241,12 @@ CONFIG_RT_USING_QSPI=y
 # CONFIG_RT_USING_TOUCH is not set
 # CONFIG_RT_USING_LCD is not set
 # CONFIG_RT_USING_HWCRYPTO is not set
-# CONFIG_RT_USING_PULSE_ENCODER is not set
-# CONFIG_RT_USING_INPUT_CAPTURE is not set
-CONFIG_RT_USING_DEV_BUS=y
 # CONFIG_RT_USING_WIFI is not set
 # CONFIG_RT_USING_VIRTIO is not set
 CONFIG_RT_USING_PIN=y
 CONFIG_RT_USING_KTIME=y
 # CONFIG_RT_USING_HWTIMER is not set
-
-#
-# Using USB
-#
-# CONFIG_RT_USING_USB_HOST is not set
-# CONFIG_RT_USING_USB_DEVICE is not set
-# end of Using USB
+# CONFIG_RT_USING_CHERRYUSB is not set
 # end of Device Drivers
 
 #
@@ -422,6 +418,15 @@ CONFIG_RT_USING_ADT_REF=y
 # end of Utilities
 
 # CONFIG_RT_USING_VBUS is not set
+
+#
+# Using USB legacy version
+#
+# CONFIG_RT_USING_USB_HOST is not set
+# CONFIG_RT_USING_USB_DEVICE is not set
+# end of Using USB legacy version
+
+# CONFIG_RT_USING_FDT is not set
 # end of RT-Thread Components
 
 #
@@ -1317,9 +1322,9 @@ CONFIG_RT_USING_UART1=y
 # CONFIG_RT_USING_UART2 is not set
 # CONFIG_RT_USING_UART3 is not set
 CONFIG_BSP_USING_SPI=y
-CONFIG_RT_USING_SPIM0=y
+# CONFIG_RT_USING_SPIM0 is not set
 # CONFIG_RT_USING_SPIM1 is not set
-# CONFIG_RT_USING_SPIM2 is not set
+CONFIG_RT_USING_SPIM2=y
 # CONFIG_RT_USING_SPIM3 is not set
 CONFIG_BSP_USING_CAN=y
 CONFIG_RT_USING_CANFD=y
@@ -1344,8 +1349,8 @@ CONFIG_RT_USING_PWM2=y
 # CONFIG_RT_USING_PWM7 is not set
 CONFIG_BSP_USING_I2C=y
 CONFIG_I2C_USE_MIO=y
-CONFIG_RT_USING_MIO0=y
-CONFIG_RT_USING_MIO1=y
+# CONFIG_RT_USING_MIO0 is not set
+# CONFIG_RT_USING_MIO1 is not set
 # CONFIG_RT_USING_MIO2 is not set
 # CONFIG_RT_USING_MIO3 is not set
 # CONFIG_RT_USING_MIO4 is not set
@@ -1359,7 +1364,7 @@ CONFIG_RT_USING_MIO1=y
 # CONFIG_RT_USING_MIO12 is not set
 # CONFIG_RT_USING_MIO13 is not set
 # CONFIG_RT_USING_MIO14 is not set
-# CONFIG_RT_USING_MIO15 is not set
+CONFIG_RT_USING_MIO15=y
 # CONFIG_I2C_USE_CONTROLLER is not set
 CONFIG_BSP_USING_SDIF=y
 CONFIG_BSP_USING_SDCARD_FATFS=y
@@ -1393,15 +1398,15 @@ CONFIG_USE_AARCH64_L1_TO_AARCH32=y
 # Soc configuration
 #
 # CONFIG_TARGET_PHYTIUMPI is not set
-# CONFIG_TARGET_E2000Q is not set
-CONFIG_TARGET_E2000D=y
+CONFIG_TARGET_E2000Q=y
+# CONFIG_TARGET_E2000D is not set
 # CONFIG_TARGET_E2000S is not set
 # CONFIG_TARGET_FT2004 is not set
 # CONFIG_TARGET_D2000 is not set
 # CONFIG_TARGET_PD2308 is not set
 CONFIG_SOC_NAME="e2000"
-CONFIG_TARGET_TYPE_NAME="d"
-CONFIG_SOC_CORE_NUM=2
+CONFIG_TARGET_TYPE_NAME="q"
+CONFIG_SOC_CORE_NUM=4
 CONFIG_F32BIT_MEMORY_ADDRESS=0x80000000
 CONFIG_F32BIT_MEMORY_LENGTH=0x80000000
 CONFIG_F64BIT_MEMORY_ADDRESS=0x2000000000
@@ -1415,22 +1420,21 @@ CONFIG_DEFAULT_DEBUG_PRINT_UART1=y
 #
 # Board Configuration
 #
-CONFIG_E2000D_DEMO_BOARD=y
 CONFIG_BOARD_NAME="demo"
-
-#
-# IO mux configuration when board start up
-#
 # CONFIG_USE_SPI_IOPAD is not set
 # CONFIG_USE_GPIO_IOPAD is not set
 # CONFIG_USE_CAN_IOPAD is not set
 # CONFIG_USE_QSPI_IOPAD is not set
 # CONFIG_USE_PWM_IOPAD is not set
-# CONFIG_USE_ADC_IOPAD is not set
 # CONFIG_USE_MIO_IOPAD is not set
 # CONFIG_USE_TACHO_IOPAD is not set
 # CONFIG_USE_UART_IOPAD is not set
 # CONFIG_USE_THIRD_PARTY_IOPAD is not set
+CONFIG_E2000Q_DEMO_BOARD=y
+
+#
+# IO mux configuration when board start up
+#
 # end of IO mux configuration when board start up
 
 # CONFIG_CUS_DEMO_BOARD is not set
@@ -1453,10 +1457,4 @@ CONFIG_USE_DEFAULT_INTERRUPT_CONFIG=y
 CONFIG_INTERRUPT_ROLE_MASTER=y
 # CONFIG_INTERRUPT_ROLE_SLAVE is not set
 # end of Sdk common configuration
-
-#
-# Image information configuration
-#
-# CONFIG_IMAGE_INFO is not set
-# end of Image information configuration
 # end of Standalone Setting
diff --git a/bsp/phytium/aarch32/Kconfig b/bsp/phytium/aarch32/Kconfig
@@ -2,8 +2,6 @@ mainmenu "RT-Thread Project Configuration"
 
 RTT_DIR := ../../..
 
-BSP_DIR := ../.
-
 SDK_DIR := .././libraries/phytium_standalone_sdk
 
 PKGS_DIR := packages

diff --git a/bsp/phytium/aarch32/applications/main.c b/bsp/phytium/aarch32/applications/main.c
@@ -58,7 +58,7 @@ static void demo_core_thread(void *parameter)
         level = rt_cpus_lock();
         rt_kprintf("Hi, core%d \r\n", rt_hw_cpu_id());
         rt_cpus_unlock(level);
-        rt_thread_mdelay(200000);
+        rt_thread_mdelay(20000);
     }
 }
 
@@ -80,6 +80,7 @@ void demo_core(void)
 
         rt_thread_control(&test_core[i], RT_THREAD_CTRL_BIND_CPU, (void *)cpu_id);
         rt_thread_startup(&test_core[i]);
+        rt_thread_mdelay(500);
     }
 }
 #endif
@@ -91,4 +92,3 @@ int main(void)
 #endif
     return RT_EOK;
 }
-
diff --git a/bsp/phytium/aarch32/configs/e2000d_demo_rtsmart b/bsp/phytium/aarch32/configs/e2000d_demo_rtsmart
@@ -15,7 +15,6 @@ CONFIG_RT_THREAD_PRIORITY_32=y
 # CONFIG_RT_THREAD_PRIORITY_256 is not set
 CONFIG_RT_THREAD_PRIORITY_MAX=32
 CONFIG_RT_TICK_PER_SECOND=1000
-CONFIG_RT_USING_OVERFLOW_CHECK=y
 CONFIG_RT_USING_HOOK=y
 CONFIG_RT_HOOK_USING_FUNC_PTR=y
 # CONFIG_RT_USING_HOOKLIST is not set
@@ -26,6 +25,8 @@ CONFIG_SYSTEM_THREAD_STACK_SIZE=4096
 CONFIG_RT_USING_TIMER_SOFT=y
 CONFIG_RT_TIMER_THREAD_PRIO=4
 CONFIG_RT_TIMER_THREAD_STACK_SIZE=4096
+# CONFIG_RT_USING_TIMER_ALL_SOFT is not set
+CONFIG_RT_USING_CPU_USAGE_TRACER=y
 
 #
 # kservice optimization
@@ -49,6 +50,7 @@ CONFIG_RT_DEBUGING_CONTEXT=y
 # CONFIG_RT_DEBUGING_PAGE_LEAK is not set
 # CONFIG_RT_DEBUGING_SPINLOCK is not set
 CONFIG_RT_DEBUGING_CRITICAL=y
+CONFIG_RT_USING_OVERFLOW_CHECK=y
 
 #
 # Inter-Thread communication
@@ -193,6 +195,7 @@ CONFIG_RT_PAGECACHE_GC_STOP_LEVEL=70
 # Device Drivers
 #
 # CONFIG_RT_USING_DM is not set
+CONFIG_RT_USING_DEV_BUS=y
 CONFIG_RT_USING_DEVICE_IPC=y
 CONFIG_RT_UNAMED_PIPE_NUMBER=64
 CONFIG_RT_USING_SYSTEM_WORKQUEUE=y
@@ -219,6 +222,8 @@ CONFIG_RT_USING_NULL=y
 CONFIG_RT_USING_ZERO=y
 CONFIG_RT_USING_RANDOM=y
 CONFIG_RT_USING_PWM=y
+# CONFIG_RT_USING_PULSE_ENCODER is not set
+# CONFIG_RT_USING_INPUT_CAPTURE is not set
 # CONFIG_RT_USING_MTD_NOR is not set
 # CONFIG_RT_USING_MTD_NAND is not set
 # CONFIG_RT_USING_PM is not set
@@ -245,21 +250,12 @@ CONFIG_RT_USING_QSPI=y
 # CONFIG_RT_USING_TOUCH is not set
 # CONFIG_RT_USING_LCD is not set
 # CONFIG_RT_USING_HWCRYPTO is not set
-# CONFIG_RT_USING_PULSE_ENCODER is not set
-# CONFIG_RT_USING_INPUT_CAPTURE is not set
-CONFIG_RT_USING_DEV_BUS=y
 # CONFIG_RT_USING_WIFI is not set
 # CONFIG_RT_USING_VIRTIO is not set
 CONFIG_RT_USING_PIN=y
 CONFIG_RT_USING_KTIME=y
 # CONFIG_RT_USING_HWTIMER is not set
-
-#
-# Using USB
-#
-# CONFIG_RT_USING_USB_HOST is not set
-# CONFIG_RT_USING_USB_DEVICE is not set
-# end of Using USB
+# CONFIG_RT_USING_CHERRYUSB is not set
 # end of Device Drivers
 
 #
@@ -454,6 +450,15 @@ CONFIG_LWP_PTY_MAX_PARIS_LIMIT=64
 #
 # CONFIG_RT_USING_MEMBLOCK is not set
 # end of Memory management
+
+#
+# Using USB legacy version
+#
+# CONFIG_RT_USING_USB_HOST is not set
+# CONFIG_RT_USING_USB_DEVICE is not set
+# end of Using USB legacy version
+
+# CONFIG_RT_USING_FDT is not set
 # end of RT-Thread Components
 
 #
@@ -1349,9 +1354,9 @@ CONFIG_RT_USING_UART1=y
 # CONFIG_RT_USING_UART2 is not set
 # CONFIG_RT_USING_UART3 is not set
 CONFIG_BSP_USING_SPI=y
-CONFIG_RT_USING_SPIM0=y
+# CONFIG_RT_USING_SPIM0 is not set
 # CONFIG_RT_USING_SPIM1 is not set
-# CONFIG_RT_USING_SPIM2 is not set
+CONFIG_RT_USING_SPIM2=y
 # CONFIG_RT_USING_SPIM3 is not set
 CONFIG_BSP_USING_CAN=y
 CONFIG_RT_USING_CANFD=y
@@ -1376,8 +1381,8 @@ CONFIG_RT_USING_PWM2=y
 # CONFIG_RT_USING_PWM7 is not set
 CONFIG_BSP_USING_I2C=y
 CONFIG_I2C_USE_MIO=y
-CONFIG_RT_USING_MIO0=y
-CONFIG_RT_USING_MIO1=y
+# CONFIG_RT_USING_MIO0 is not set
+# CONFIG_RT_USING_MIO1 is not set
 # CONFIG_RT_USING_MIO2 is not set
 # CONFIG_RT_USING_MIO3 is not set
 # CONFIG_RT_USING_MIO4 is not set
@@ -1391,7 +1396,7 @@ CONFIG_RT_USING_MIO1=y
 # CONFIG_RT_USING_MIO12 is not set
 # CONFIG_RT_USING_MIO13 is not set
 # CONFIG_RT_USING_MIO14 is not set
-# CONFIG_RT_USING_MIO15 is not set
+CONFIG_RT_USING_MIO15=y
 # CONFIG_I2C_USE_CONTROLLER is not set
 CONFIG_BSP_USING_SDIF=y
 CONFIG_BSP_USING_SDCARD_FATFS=y
@@ -1485,10 +1490,4 @@ CONFIG_USE_DEFAULT_INTERRUPT_CONFIG=y
 CONFIG_INTERRUPT_ROLE_MASTER=y
 # CONFIG_INTERRUPT_ROLE_SLAVE is not set
 # end of Sdk common configuration
-
-#
-# Image information configuration
-#
-# CONFIG_IMAGE_INFO is not set
-# end of Image information configuration
 # end of Standalone Setting