[bsp][zynqmp-a53-dfzu2eg] enable full dm

This is a builtin fdt example BSP

Signed-off-by: GuEe-GUI <2991707448@qq.com>

Author: GuEe-GUI

.github/ALL_BSP_COMPILE.json

@@ -390,7 +390,8 @@
         "qemu-virt64-aarch64",
         "raspberry-pi/raspi3-64",
         "raspberry-pi/raspi4-64",
-        "nxp/imx/imx91"
+        "nxp/imx/imx91",
+        "zynqmp-a53-dfzu2eg"
       ]
     },
     {

.github/workflows/utest_auto_run.yml

@@ -55,6 +55,10 @@ jobs:
           - { UTEST: "AARCH64-rtsmart", RTT_BSP: "bsp/qemu-virt64-aarch64", QEMU_ARCH: "aarch64", QEMU_MACHINE: "virt",        SD_FILE: "sd.bin", KERNEL: "rtsmart",  "SMP_RUN":"" }
           - { UTEST: "AARCH64-smp",   RTT_BSP: "bsp/qemu-virt64-aarch64",   QEMU_ARCH: "aarch64", QEMU_MACHINE: "virt",        SD_FILE: "sd.bin", KERNEL: "standard",  "SMP_RUN":"smp" }
 
+          - { UTEST: "AARCH64",       RTT_BSP: "bsp/zynqmp-a53-dfzu2eg",   QEMU_ARCH: "aarch64", QEMU_MACHINE: "xlnx-zcu102",  SD_FILE: "None", KERNEL: "standard",  "SMP_RUN":"" }
+          - { UTEST: "AARCH64-rtsmart", RTT_BSP: "bsp/zynqmp-a53-dfzu2eg", QEMU_ARCH: "aarch64", QEMU_MACHINE: "xlnx-zcu102",  SD_FILE: "None", KERNEL: "rtsmart",  "SMP_RUN":"" }
+          - { UTEST: "AARCH64-smp",   RTT_BSP: "bsp/zynqmp-a53-dfzu2eg",   QEMU_ARCH: "aarch64", QEMU_MACHINE: "xlnx-zcu102",  SD_FILE: "None", KERNEL: "standard",  "SMP_RUN":"smp" }
+
         config_file:
           - "default.cfg"
 
@@ -97,7 +101,7 @@ jobs:
         shell: bash
         run: |
           sudo apt-get update
-          sudo apt-get -yqq install scons qemu-system git
+          sudo apt-get -yqq install scons qemu-system git device-tree-compiler
           pip3 install kconfiglib
 
       - name: Install ToolChains
@@ -223,10 +227,23 @@ jobs:
           fi
 
           if [[ "${{ matrix.platform.QEMU_ARCH }}"  == "aarch64" ]]; then 
-            qemu-system-$TEST_QEMU_ARCH -M virt,gic-version=2 -cpu cortex-a53 -smp 4 -kernel $TEST_BSP_ROOT/rtthread.bin  -nographic \
-            -drive if=none,file=$TEST_BSP_ROOT/sd.bin,format=raw,id=blk0 -device virtio-blk-device,drive=blk0,bus=virtio-mmio-bus.0 \
-            -netdev user,id=net0 -device virtio-net-device,netdev=net0,bus=virtio-mmio-bus.1 \
-            > qemu_output_$TEST_QEMU_ARCH.log  2>&1 &
+            if [[ "${{ matrix.platform.QEMU_MACHINE }}"  == "virt" ]]; then
+              qemu-system-$TEST_QEMU_ARCH -M virt,gic-version=2 -cpu cortex-a53 -smp 4 -kernel $TEST_BSP_ROOT/rtthread.bin  -nographic \
+              -drive if=none,file=$TEST_BSP_ROOT/sd.bin,format=raw,id=blk0 -device virtio-blk-device,drive=blk0,bus=virtio-mmio-bus.0 \
+              -netdev user,id=net0 -device virtio-net-device,netdev=net0,bus=virtio-mmio-bus.1 \
+              > qemu_output_$TEST_QEMU_ARCH.log  2>&1 &
+            elif [[ "${{ matrix.platform.QEMU_MACHINE }}"  == "xlnx-zcu102" ]]; then
+              heap=$(grep -E '^#define[[:space:]]+ARCH_HEAP_SIZE' $TEST_BSP_ROOT/rtconfig.h | awk '{print $3}')
+              page=$(grep -E '^#define[[:space:]]+ARCH_INIT_PAGE_SIZE' $TEST_BSP_ROOT/rtconfig.h | awk '{print $3}')
+              heap=$(echo "$heap" | tr -d '()')
+              page=$(echo "$page" | tr -d '()')
+              heap_val=$((heap))
+              page_val=$((page))
+              mem=$((heap_val + page_val))
+              mem=$((128 + mem / (1024 * 1024)))
+              qemu-system-$TEST_QEMU_ARCH -M xlnx-zcu102 -m $mem -kernel $TEST_BSP_ROOT/rtthread.bin -nographic \
+              > qemu_output_$TEST_QEMU_ARCH.log  2>&1 &
+            fi
           elif [[ "${{ matrix.platform.UTEST }}"  == "XUANTIE-rtsmart" ]]; then
             sudo apt-get install -y dos2unix libcapstone-dev libbrlapi-dev
             wget -q https://occ-oss-prod.oss-cn-hangzhou.aliyuncs.com/resource//1736318325160/Xuantie-qemu-x86_64-Ubuntu-20.04-V5.0.5-B20250108-0335.tar.gz

bsp/zynqmp-a53-dfzu2eg/.config

@@ -11,18 +11,8 @@
 # rt_vsnprintf options
 #
 # CONFIG_RT_KLIBC_USING_LIBC_VSNPRINTF is not set
-CONFIG_RT_KLIBC_USING_VSNPRINTF_LONGLONG=y
-CONFIG_RT_KLIBC_USING_VSNPRINTF_STANDARD=y
-CONFIG_RT_KLIBC_USING_VSNPRINTF_DECIMAL_SPECIFIERS=y
-CONFIG_RT_KLIBC_USING_VSNPRINTF_EXPONENTIAL_SPECIFIERS=y
-CONFIG_RT_KLIBC_USING_VSNPRINTF_WRITEBACK_SPECIFIER=y
-CONFIG_RT_KLIBC_USING_VSNPRINTF_CHECK_NUL_IN_FORMAT_SPECIFIER=y
-# CONFIG_RT_KLIBC_USING_VSNPRINTF_MSVC_STYLE_INTEGER_SPECIFIERS is not set
-CONFIG_RT_KLIBC_USING_VSNPRINTF_INTEGER_BUFFER_SIZE=32
-CONFIG_RT_KLIBC_USING_VSNPRINTF_DECIMAL_BUFFER_SIZE=32
-CONFIG_RT_KLIBC_USING_VSNPRINTF_FLOAT_PRECISION=6
-CONFIG_RT_KLIBC_USING_VSNPRINTF_MAX_INTEGRAL_DIGITS_FOR_DECIMAL=9
-CONFIG_RT_KLIBC_USING_VSNPRINTF_LOG10_TAYLOR_TERMS=4
+# CONFIG_RT_KLIBC_USING_VSNPRINTF_LONGLONG is not set
+# CONFIG_RT_KLIBC_USING_VSNPRINTF_STANDARD is not set
 # end of rt_vsnprintf options
 
 #
@@ -121,8 +111,8 @@ CONFIG_RT_NAME_MAX=16
 # CONFIG_RT_USING_NANO is not set
 # CONFIG_RT_USING_SMART is not set
 # CONFIG_RT_USING_AMP is not set
-# CONFIG_RT_USING_SMP is not set
-CONFIG_RT_CPUS_NR=1
+CONFIG_RT_USING_SMP=y
+CONFIG_RT_CPUS_NR=4
 CONFIG_RT_ALIGN_SIZE=8
 # CONFIG_RT_THREAD_PRIORITY_8 is not set
 CONFIG_RT_THREAD_PRIORITY_32=y
@@ -136,11 +126,12 @@ CONFIG_RT_HOOK_USING_FUNC_PTR=y
 CONFIG_RT_USING_IDLE_HOOK=y
 CONFIG_RT_IDLE_HOOK_LIST_SIZE=4
 CONFIG_IDLE_THREAD_STACK_SIZE=8192
+CONFIG_SYSTEM_THREAD_STACK_SIZE=8192
 CONFIG_RT_USING_TIMER_SOFT=y
 CONFIG_RT_TIMER_THREAD_PRIO=4
 CONFIG_RT_TIMER_THREAD_STACK_SIZE=8192
 # CONFIG_RT_USING_TIMER_ALL_SOFT is not set
-# CONFIG_RT_USING_CPU_USAGE_TRACER is not set
+CONFIG_RT_USING_CPU_USAGE_TRACER=y
 
 #
 # kservice options
@@ -153,6 +144,8 @@ CONFIG_RT_DEBUGING_ASSERT=y
 CONFIG_RT_DEBUGING_COLOR=y
 CONFIG_RT_DEBUGING_CONTEXT=y
 # CONFIG_RT_DEBUGING_AUTO_INIT is not set
+# CONFIG_RT_DEBUGING_SPINLOCK is not set
+CONFIG_RT_DEBUGING_CRITICAL=y
 # CONFIG_RT_USING_CI_ACTION is not set
 
 #
@@ -194,7 +187,8 @@ CONFIG_RT_USING_INTERRUPT_INFO=y
 CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=256
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
-CONFIG_RT_VER_NUM=0x50201
+CONFIG_RT_USING_CONSOLE_OUTPUT_CTL=y
+CONFIG_RT_VER_NUM=0x50300
 CONFIG_RT_USING_STDC_ATOMIC=y
 CONFIG_RT_BACKTRACE_LEVEL_MAX_NR=32
 # end of RT-Thread Kernel
@@ -295,7 +289,7 @@ CONFIG_RT_USING_DFS_ROMFS=y
 #
 # Device Drivers
 #
-# CONFIG_RT_USING_DM is not set
+CONFIG_RT_USING_DM=y
 CONFIG_RT_USING_DEV_BUS=y
 CONFIG_RT_USING_DEVICE_IPC=y
 CONFIG_RT_UNAMED_PIPE_NUMBER=64
@@ -307,9 +301,14 @@ CONFIG_RT_USING_SERIAL_V1=y
 # CONFIG_RT_USING_SERIAL_V2 is not set
 CONFIG_RT_SERIAL_USING_DMA=y
 CONFIG_RT_SERIAL_RB_BUFSZ=256
-# CONFIG_RT_USING_SERIAL_BYPASS is not set
+CONFIG_RT_USING_SERIAL_BYPASS=y
+# CONFIG_RT_SERIAL_EARLY_HVC is not set
+# CONFIG_RT_SERIAL_PL011 is not set
+# CONFIG_RT_SERIAL_8250 is not set
+CONFIG_RT_SERIAL_XILINX_PS=y
 # CONFIG_RT_USING_CAN is not set
-# CONFIG_RT_USING_CPUTIME is not set
+CONFIG_RT_USING_CLOCK_TIME=y
+CONFIG_RT_CLOCK_TIME_ARM_ARCH=y
 # CONFIG_RT_USING_I2C is not set
 # CONFIG_RT_USING_PHY is not set
 # CONFIG_RT_USING_PHY_V2 is not set
@@ -323,38 +322,68 @@ CONFIG_RT_USING_RANDOM=y
 # 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=y
-CONFIG_PM_TICKLESS_THRESHOLD_TIME=2
-# CONFIG_PM_USING_CUSTOM_CONFIG is not set
-# CONFIG_PM_ENABLE_DEBUG is not set
-# CONFIG_PM_ENABLE_SUSPEND_SLEEP_MODE is not set
-# CONFIG_PM_ENABLE_THRESHOLD_SLEEP_MODE is not set
+# CONFIG_RT_USING_PM is not set
 CONFIG_RT_USING_RTC=y
-# CONFIG_RT_USING_ALARM is not set
-CONFIG_RT_USING_SOFT_RTC=y
+CONFIG_RT_USING_ALARM=y
+CONFIG_RT_ALARM_STACK_SIZE=8192
+CONFIG_RT_ALARM_TIMESLICE=5
+CONFIG_RT_ALARM_PRIORITY=10
+# CONFIG_RT_ALARM_USING_LOCAL_TIME is not set
+# CONFIG_RT_USING_SOFT_RTC is not set
+# CONFIG_RT_RTC_GOLDFISH is not set
+# CONFIG_RT_RTC_PL031 is not set
+CONFIG_RT_RTC_ZYNQMP=y
 # CONFIG_RT_USING_SDIO is not set
 # CONFIG_RT_USING_SPI is not set
 # CONFIG_RT_USING_WDT is not set
 # CONFIG_RT_USING_AUDIO is not set
 # CONFIG_RT_USING_SENSOR is not set
 # CONFIG_RT_USING_TOUCH is not set
-# CONFIG_RT_USING_LCD is not set
+# CONFIG_RT_USING_GRAPHIC is not set
 # CONFIG_RT_USING_HWCRYPTO is not set
 # CONFIG_RT_USING_WIFI is not set
+# CONFIG_RT_USING_LED is not set
+# CONFIG_RT_USING_INPUT is not set
+# CONFIG_RT_USING_MBOX is not set
+# CONFIG_RT_USING_HWSPINLOCK is not set
+# CONFIG_RT_USING_PHYE is not set
 # CONFIG_RT_USING_BLK is not set
-CONFIG_RT_USING_VIRTIO=y
-CONFIG_RT_USING_VIRTIO10=y
-CONFIG_RT_USING_VIRTIO_MMIO_ALIGN=y
-CONFIG_RT_USING_VIRTIO_BLK=y
-# CONFIG_RT_USING_VIRTIO_NET is not set
-CONFIG_RT_USING_VIRTIO_CONSOLE=y
-CONFIG_RT_USING_VIRTIO_CONSOLE_PORT_MAX_NR=4
-CONFIG_RT_USING_VIRTIO_GPU=y
-CONFIG_RT_USING_VIRTIO_INPUT=y
-CONFIG_RT_USING_PIN=y
-CONFIG_RT_USING_KTIME=y
-# CONFIG_RT_USING_HWTIMER is not set
+# CONFIG_RT_USING_SCSI is not set
+# CONFIG_RT_USING_FIRMWARE is not set
+# CONFIG_RT_USING_HWCACHE is not set
+# CONFIG_RT_USING_REGULATOR is not set
+CONFIG_RT_USING_RESET=y
+# CONFIG_RT_RESET_SIMPLE is not set
+
+#
+# Power Management (PM) Domains device drivers
+#
+# end of Power Management (PM) Domains device drivers
+
+# CONFIG_RT_USING_POWER_RESET is not set
+# CONFIG_RT_USING_POWER_SUPPLY is not set
+# CONFIG_RT_USING_THERMAL is not set
+# CONFIG_RT_USING_DMA is not set
+# CONFIG_RT_USING_MFD is not set
+CONFIG_RT_USING_OFW=y
+CONFIG_RT_USING_BUILTIN_FDT=y
+CONFIG_RT_BUILTIN_FDT_PATH="zynqmp.dtb"
+CONFIG_RT_FDT_EARLYCON_MSG_SIZE=128
+CONFIG_RT_USING_OFW_BUS_RANGES_NUMBER=8
+# CONFIG_RT_USING_PCI is not set
+CONFIG_RT_USING_PIC=y
+# CONFIG_RT_USING_PIC_STATISTICS is not set
+CONFIG_MAX_HANDLERS=256
+CONFIG_RT_PIC_ARM_GIC=y
+# CONFIG_RT_PIC_ARM_GIC_V3 is not set
+CONFIG_RT_PIC_ARM_GIC_MAX_NR=1
+# CONFIG_RT_USING_PIN is not set
+CONFIG_RT_USING_CLK=y
 # CONFIG_RT_USING_CHERRYUSB is not set
+
+#
+# SoC (System on Chip) Drivers
+#
 # end of Device Drivers
 
 #
@@ -445,14 +474,14 @@ CONFIG_RT_USING_ADT_REF=y
 # CONFIG_RT_USING_RT_LINK is not set
 # end of Utilities
 
-# CONFIG_RT_USING_VBUS is not set
-
 #
 # Memory management
 #
+# CONFIG_RT_PAGE_MPR_SIZE_DYNAMIC is not set
 CONFIG_RT_PAGE_AFFINITY_BLOCK_SIZE=0x1000
 CONFIG_RT_PAGE_MAX_ORDER=11
-# CONFIG_RT_USING_MEMBLOCK is not set
+CONFIG_RT_USING_MEMBLOCK=y
+CONFIG_RT_INIT_MEMORY_REGIONS=128
 
 #
 # Debugging
@@ -471,6 +500,7 @@ CONFIG_RT_PAGE_MAX_ORDER=11
 # end of Using USB legacy version
 
 # CONFIG_RT_USING_FDT is not set
+# CONFIG_RT_USING_RUST is not set
 # end of RT-Thread Components
 
 #
@@ -1506,14 +1536,3 @@ CONFIG_RT_PAGE_MAX_ORDER=11
 # end of RT-Thread online packages
 
 CONFIG_SOC_ZYNQMP_AARCH64=y
-
-#
-# Hardware Drivers Config
-#
-CONFIG_BSP_SUPPORT_FPU=y
-CONFIG_BSP_USING_UART=y
-CONFIG_BSP_USING_UART0=y
-CONFIG_BSP_USING_GIC=y
-CONFIG_BSP_USING_GICV2=y
-# CONFIG_BSP_USING_GICV3 is not set
-# end of Hardware Drivers Config

bsp/zynqmp-a53-dfzu2eg/Kconfig

@@ -6,20 +6,18 @@ RTT_DIR := ../../
 
 PKGS_DIR := packages
 
+SOC_DM_RTC_DIR      := $(BSP_DIR)/drivers/rtc
+SOC_DM_SERIAL_DIR   := $(BSP_DIR)/drivers/serial
+
 source "$(RTT_DIR)/Kconfig"
 osource "$PKGS_DIR/Kconfig"
 
 config SOC_ZYNQMP_AARCH64
     bool
     select ARCH_ARMV8
-    select ARCH_CPU_64BIT
-    select ARCH_ARM_MMU
-    select RT_USING_CACHE
     select RT_USING_COMPONENTS_INIT
     select RT_USING_USER_MAIN
-    select RT_USING_GIC
-    select BSP_USING_GIC
-    select ARCH_MM_MMU
+    select ARCH_CPU_64BIT
+    select RT_USING_CACHE
+    select RT_USING_STDC_ATOMIC
     default y
-
-source "$(BSP_DIR)/drivers/Kconfig"

bsp/zynqmp-a53-dfzu2eg/README.md

@@ -95,7 +95,7 @@ setenv gatewayip 192.168.1.1
 setenv netmask 255.255.255.0
 setenv serverip 192.168.1.3
 tftpboot 0x00200000 rtthread.bin
-go 0x00200000
+booti 0x00200000 - ${fdt_addr}
 ```
 
 其中`192.168.1.3`为TFTP服务器的PC机的IP地址，大家可以根据自己的实际情况进行修改。
@@ -141,6 +141,7 @@ msh />
 | 驱动 | 支持情况  |  备注  |
 | ------ | ----  | :------:  |
 | UART | 支持 | UART0 |
+| RTC | 支持 | - |
 | GPIO | 暂不支持 | - |
 | SPI | 暂不支持 | - |
 | SDIO | 暂不支持 | - |

bsp/zynqmp-a53-dfzu2eg/SConstruct

@@ -11,6 +11,9 @@ else:
 
 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
 from building import *
+import dtc
+
+dtc.dts_to_dtb(RTT_ROOT, ["zynqmp.dts"], include_paths = [os.getcwd()], ignore_warning = ["simple_bus_reg", "unit_address_vs_reg", "clocks_is_cell", "gpios_property"])
 
 TARGET = 'rtthread.' + rtconfig.TARGET_EXT
 TRACE_CONFIG = ""

bsp/zynqmp-a53-dfzu2eg/drivers/Kconfig

@@ -4,7 +4,13 @@ from building import *
 
 cwd     = GetCurrentDir()
 src     = Glob('*.c')
-CPPPATH = [cwd , cwd + '/zynqmp']
+CPPPATH = [cwd, cwd + "/../../../components/drivers/rtc"]
+
+if GetDepend(['RT_RTC_ZYNQMP']):
+    src += ['rtc/rtc-zynqmp.c']
+
+if GetDepend(['RT_SERIAL_XILINX_PS']):
+    src += ['serial/xilinx_uartps.c']
 
 group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)