Add Device Tree support

The included DTBs correspond to: * <https://github.com/armbian/linux-rockchip/tree/a8384552a2e009797aa5b3e9a046d30e8d2e5d3c/arch/arm64/boot/dts/rockchip> * roc-rk3588s-pc: <https://gitlab.com/firefly-linux/kernel/-/tree/b8646da2122f45a2c02082d949427b80d2e89b1f/arch/arm64/boot/dts/rockchip> See README for more details.
edk2-porting · Oct 6, 2023 · 9b56a31 · 9b56a31
1 parent 6175a50
commit 9b56a31
Show file tree

Hide file tree

Showing 60 changed files with 1,066 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -46,18 +46,24 @@ Applicable to all platforms unless otherwise noted.
 | Voltage regulators (RK806, RK860)  | 🟢 Working     | |
 | FUSB302 USB Type-C Controller      | 🔴 Not working | Required for PD negotiation and connector orientation switching |
 
-## Supported OSes (with ACPI)
+## Supported OSes
+### In ACPI mode
 | OS | Version | Tested/supported hardware | Notes |
 | --- | --- | --- | --- |
 | Windows | 10 (1904x), 11 | [Status](https://github.com/worproject/Rockchip-Windows-Drivers#hardware-support-status) ||
 | NetBSD | 10 | Display, UART, USB, PCIe (incl. NVME), SATA, eMMC, GMAC Ethernet ||
 | VMware ESXi Arm Fling | >= 1.12 | Display, USB | * PCIe devices will hang at boot, need to disable in settings or leave the ports empty.<br>* GMAC Ethernet gets detected but does not work. |
-| Linux | tested Ubuntu 22.04, kernel 5.15.0-75-generic | Display, UART, USB, PCIe (incl. NVME & Ethernet), SATA | For full hardware functionality, use a kernel with RK3588 support and platform Device Tree supplied by Grub. |
+| Linux | tested Ubuntu 22.04, kernel 5.15.0-75-generic | Display, UART, USB, PCIe (incl. NVME & Ethernet), SATA | For full hardware functionality, use a kernel with RK3588 support and switch to Device Tree mode. |
 
 #### Additional limitations when using ACPI
 * Devices behind PCIe switches do not work (e.g. the two NICs on Mixtile Blade 3).
 * GMAC is limited to Gigabit speed (i.e. no 10/100).
 
+### In Device Tree mode
+| OS | Version | Tested/supported hardware | Notes |
+| --- | --- | --- | --- |
+| Rockchip SDK Linux | 5.10 legacy, tested with [Armbian rk3588-live-iso](https://github.com/amazingfate/rk3588-live-iso) | Platform-dependent, most peripherals work. | If using a different kernel, see [Device Tree configuration](#device-tree-configuration). |
+
 ## Getting started
 ### 1. Requirements
 * One of the [supported devices](#supported-platforms).
@@ -105,11 +111,59 @@ Configuration through the user interface is fairly straightforward and help info
 Configuration through the UEFI shell is more advanced and mostly useful for scripts. See [Setting configuration options via the shell](#setting-configuration-options-via-the-shell).
 
 ### Tips
-* If you only wish to boot non-Windows OSes, go to the configuration menu -> `ACPI` and set `USB 2.0 Support` to `Enabled`, in order to get maximum speed from USB 2.0 ports.
+* CPU clocks are set to 816 MHz (boot default) on platforms without a cooling fan included. If you have adequate cooling, go to the configuration menu -> `CPU Performance` and set all Cluster Presets to `Maximum`.
+
+* If you only wish to boot non-Windows OSes in ACPI mode, go to the configuration menu -> `ACPI / Device Tree` and set `USB 2.0 Support` to `Enabled`, in order to get maximum speed from USB 2.0 ports.
 
   Booting Windows with this option enabled will cause it to crash.
 
-* CPU clocks are set to 816 MHz (boot default) on platforms without a cooling fan included. If you have adequate cooling, go to the configuration menu -> `CPU Performance` and set all Cluster Presets to `Maximum`.
+### Device Tree configuration
+For rich Linux support, it is recommended to enable Device Tree mode. You can do so by going to the configuration menu -> `ACPI / Device Tree` and setting `Config Table Mode` to `Device Tree`.
+
+By default, the firmware installs a [DTB compatible with (most) Rockchip SDK Linux 5.10 legacy kernel variants](https://github.com/edk2-porting/edk2-rk3588/tree/master/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree).
+
+#### Custom Device Tree Blob (DTB) override and overlays
+It is also possible to provide a custom DTB and overlays. To enable this, go to the configuration menu -> `ACPI / Device Tree` and set `Support DTB override & overlays` to `Enabled`.
+
+The firmware will now look for overrides in the partition of a selected boot option / OS loader. In most cases this will be the first FAT32 EFI System Partition.
+
+* The base DTB must be located at `\dtb\base\<PLATFORM-DT-NAME>.dtb`.
+
+* The overlays can be placed in:
+  * `\dtb\overlays` - will be applied first, regardless of the platform.
+  * `\dtb\overlays\<PLATFORM-DT-NAME>` - will be applied only to the specified platform.
+
+  and must have the `.dtbo` extension.
+
+The paths above are relative to the root of the file system. That is, the `dtb` directory must not be placed in a sub-directory.
+
+`<PLATFORM-DT-NAME>` can be:
+| Name                                    | Platform                      |
+| --------------------------------------- | ----------------------------- |
+| `rk3588s-9tripod-linux`                 | Indiedroid Nova               |
+| `roc-rk3588s-pc`                        | ROC-RK3588S-PC / Station M3   |
+| `rk3588-nanopc-t6`                      | NanoPC T6                     |
+| `rk3588s-nanopi-r6c`                    | NanoPi R6C                    |
+| `rk3588s-nanopi-r6s`                    | NanoPi R6S                    |
+| `rk3588-hinlink-h88k`                   | H88K                          |
+| `rk3588s-khadas-edge2`                  | Edge2                         |
+| `rk3588-blueberry-minipc-linux`         | R58 Mini                      |
+| `rk3588-blueberry-edge-v12-linux`       | R58X (v1.2)                   |
+| `rk3588-blade3-v101-linux`              | Blade 3                       |
+| `rk3588s-orangepi-5`                    | Orange Pi 5                   |
+| `rk3588-orangepi-5-plus`                | Orange Pi 5 Plus              |
+| `rk3588s-rock-5a`                       | ROCK 5A                       |
+| `rk3588-rock-5b`                        | ROCK 5B                       |
+
+In the absence of a custom base DTB override, the overlays are applied on top of the firmware-provided DTB.
+
+The firmware applies some fix-ups to its own DTB depending on the user settings (e.g. PCIe/SATA/USB selection, making SATA overlays redundant). These fix-ups are not applied to a custom base DTB - overlays must be used instead.
+
+If the application of an overlay fails (e.g. due to it being invalid in regard to the base DTB), all overlays are discarded, including those that got applied up to that point.
+
+If the custom base DTB is invalid, the firmware-provided one will be passed to the OS instead.
+
+This entire process is logged to the [serial console](#advanced-troubleshooting). There's currently no other way to see potential errors.
 
 ## Updating the firmware
 If the storage is only used for UEFI and nothing else, simply download the latest image and flash it as described in the [Getting started](#getting-started) section.
@@ -342,11 +396,21 @@ Default values and supported options depend on the platform. Check documentation
 | ------------- | ------------- | --------------------------------- |
 | Support State | `Pcie30State` | Enabled = `0x00000001`<br> Disabled = `0x00000000` |
 
-### ACPI configuration
+### ACPI / Device Tree
+| Variable          |    NAME           |  VALUE                            |
+| ----------------- | ----------------- | --------------------------------- |
+| Config Table Mode | `ConfigTableMode` | ACPI = `0x00000001`<br> DeviceTree = `0x00000002`<br> Both = `0x00000003` |
+
+#### ACPI Configuration
 | Variable        |    NAME         |  VALUE                            |
 | --------------- | --------------- | --------------------------------- |
 | USB 2.0 Support | `AcpiUsb2State` | Enabled = `0x00000001`<br> Disabled = `0x00000000` |
 
+#### Device Tree Configuration
+| Variable                        |    NAME               |  VALUE                            |
+| ------------------------------- | --------------------- | --------------------------------- |
+| Support DTB override & overlays | `FdtSupportOverrides` | Enabled = `0x01`<br> Disabled = `0x00` |
+
 ### Cooling fan
 | Variable        |    NAME           |  VALUE                            |
 | --------------- | ----------------- | --------------------------------- |
@@ -371,7 +435,7 @@ Some non-critical components have been ported from Rockchip's U-Boot fork and ar
 * UsbDpPhy
 * DwDpLib
 
-The firmware will continue to work without them, minus the additional functionality they provide.
+The files in `edk2-rockchip-non-osi` are licensed as **GPL-2.0-only**.
 
 The license for some of the blobs in the `misc/rkbin/` directory can be found at: <https://github.com/rockchip-linux/rkbin/blob/master/LICENSE>. Note that it also contains binaries built from open-source projects such as U-Boot (SPL), Arm Trusted Firmware and OP-TEE, having a different license.
 

diff --git a/build.sh b/build.sh
@@ -186,7 +186,7 @@ export CROSS_COMPILE="${CROSS_COMPILE:-aarch64-linux-gnu-}"
 export GCC5_AARCH64_PREFIX="${CROSS_COMPILE}"
 export CLANG38_AARCH64_PREFIX="${CROSS_COMPILE}"
 # export PACKAGES_PATH="$_EDK2:$_EDK2_PLATFORMS:$_SIMPLE_INIT:$PWD"
-export PACKAGES_PATH="${ROOTDIR}/edk2:${ROOTDIR}/edk2-platforms:${ROOTDIR}/edk2-rockchip:${ROOTDIR}/edk2-non-osi:${ROOTDIR}:${_SIMPLE_INIT}"
+export PACKAGES_PATH="${ROOTDIR}/edk2:${ROOTDIR}/edk2-platforms:${ROOTDIR}/edk2-rockchip:${ROOTDIR}/edk2-rockchip-non-osi:${ROOTDIR}/edk2-non-osi:${ROOTDIR}:${_SIMPLE_INIT}"
 export WORKSPACE="${OUTDIR}/workspace"
 GITCOMMIT="$(git describe --tags --always)"||GITCOMMIT="unknown"
 export GITCOMMIT

diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/README.md b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/README.md
@@ -0,0 +1,8 @@
+# Rockchip Platform Device Trees
+## Sources
+* <https://github.com/armbian/linux-rockchip/tree/a8384552a2e009797aa5b3e9a046d30e8d2e5d3c/arch/arm64/boot/dts/rockchip>
+
+* roc-rk3588s-pc: <https://gitlab.com/firefly-linux/kernel/-/tree/b8646da2122f45a2c02082d949427b80d2e89b1f/arch/arm64/boot/dts/rockchip>
+
+## License
+SPDX-License-Identifier: GPL-2.0-only
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-blade3-v101-linux.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-blade3-v101-linux.dtb
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-blueberry-edge-v12-linux.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-blueberry-edge-v12-linux.dtb
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-blueberry-minipc-linux.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-blueberry-minipc-linux.dtb
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-hinlink-h88k.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-hinlink-h88k.dtb
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-nanopc-t6.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-nanopc-t6.dtb
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-orangepi-5-plus.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-orangepi-5-plus.dtb
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-rock-5b.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588-rock-5b.dtb
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588s-9tripod-linux.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588s-9tripod-linux.dtb
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588s-khadas-edge2.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588s-khadas-edge2.dtb
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588s-nanopi-r6c.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588s-nanopi-r6c.dtb
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588s-nanopi-r6s.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588s-nanopi-r6s.dtb
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588s-orangepi-5.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588s-orangepi-5.dtb
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588s-rock-5a.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/rk3588s-rock-5a.dtb
diff --git a/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/roc-rk3588s-pc.dtb b/edk2-rockchip-non-osi/Platform/Rockchip/DeviceTree/roc-rk3588s-pc.dtb
diff --git a/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/IndiedroidNova.Modules.fdf.inc b/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/IndiedroidNova.Modules.fdf.inc
@@ -9,5 +9,10 @@
   # ACPI Support
   INF RuleOverride = ACPITABLE $(PLATFORM_DIRECTORY)/AcpiTables/AcpiTables.inf
 
+  # Device Tree Support
+  FILE FREEFORM = gDtPlatformDefaultDtbFileGuid {
+    SECTION RAW = Platform/Rockchip/DeviceTree/rk3588s-9tripod-linux.dtb
+  }
+
   # Splash screen logo
   INF $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/IndiedroidNova.dsc b/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/IndiedroidNova.dsc
@@ -62,7 +62,7 @@
   gRockchipTokenSpaceGuid.PcdPlatformVendorName|"ameriDroid"
   gRockchipTokenSpaceGuid.PcdFamilyName|"Indiedroid"
   gRockchipTokenSpaceGuid.PcdProductUrl|"https://indiedroid.us"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588s-9tripod-linux.dtb"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588s-9tripod-linux"
 
   # I2C
   gRockchipTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x42, 0x43, 0x51 }

diff --git a/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/ROC-RK3588S-PC.Modules.fdf.inc b/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/ROC-RK3588S-PC.Modules.fdf.inc
@@ -9,5 +9,10 @@
   # ACPI Support
   INF RuleOverride = ACPITABLE Platform/Firefly/ROC-RK3588S-PC/AcpiTables/AcpiTables.inf
 
+  # Device Tree Support
+  FILE FREEFORM = gDtPlatformDefaultDtbFileGuid {
+    SECTION RAW = Platform/Rockchip/DeviceTree/roc-rk3588s-pc.dtb
+  }
+
   # Splash screen logo
   INF $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/ROC-RK3588S-PC.dsc b/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/ROC-RK3588S-PC.dsc
@@ -42,4 +42,4 @@
   gRockchipTokenSpaceGuid.PcdPlatformVendorName|"Firefly"
   gRockchipTokenSpaceGuid.PcdFamilyName|"ROC"
   gRockchipTokenSpaceGuid.PcdProductUrl|"https://en.t-firefly.com/product/industry/rocrk3588spc"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"roc-rk3588s-pc.dtb"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"roc-rk3588s-pc"
diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/NanoPC-T6.Modules.fdf.inc b/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/NanoPC-T6.Modules.fdf.inc
@@ -9,5 +9,10 @@
   # ACPI Support
   INF RuleOverride = ACPITABLE $(PLATFORM_DIRECTORY)/AcpiTables/AcpiTables.inf
 
+  # Device Tree Support
+  FILE FREEFORM = gDtPlatformDefaultDtbFileGuid {
+    SECTION RAW = Platform/Rockchip/DeviceTree/rk3588-nanopc-t6.dtb
+  }
+
   # Splash screen logo
   INF MdeModulePkg/Logo/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/NanoPC-T6.dsc b/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/NanoPC-T6.dsc
@@ -60,7 +60,7 @@
   gRockchipTokenSpaceGuid.PcdPlatformVendorName|"FriendlyElec"
   gRockchipTokenSpaceGuid.PcdFamilyName|"NanoPi 6"
   gRockchipTokenSpaceGuid.PcdProductUrl|"https://wiki.friendlyelec.com/wiki/index.php/NanoPC-T6"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-nanopc-t6.dtb"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-nanopc-t6"
 
   # I2C
   gRockchipTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x42, 0x43, 0x51 }

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/NanoPi-R6C.Modules.fdf.inc b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/NanoPi-R6C.Modules.fdf.inc
@@ -10,5 +10,10 @@
   # ACPI Support
   INF RuleOverride = ACPITABLE $(PLATFORM_DIRECTORY)/AcpiTables/AcpiTables.inf
 
+  # Device Tree Support
+  FILE FREEFORM = gDtPlatformDefaultDtbFileGuid {
+    SECTION RAW = Platform/Rockchip/DeviceTree/rk3588s-nanopi-r6c.dtb
+  }
+
   # Splash screen logo
   INF $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/NanoPi-R6C.dsc b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/NanoPi-R6C.dsc
@@ -61,7 +61,7 @@
   gRockchipTokenSpaceGuid.PcdPlatformVendorName|"FriendlyElec"
   gRockchipTokenSpaceGuid.PcdFamilyName|"NanoPi"
   gRockchipTokenSpaceGuid.PcdProductUrl|"https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R6"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588s-nanopi-r6c.dtb"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588s-nanopi-r6c"
 
   # I2C
   gRockchipTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x42, 0x43, 0x51 }

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/NanoPi-R6S.Modules.fdf.inc b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/NanoPi-R6S.Modules.fdf.inc
@@ -9,5 +9,10 @@
   # ACPI Support
   INF RuleOverride = ACPITABLE $(PLATFORM_DIRECTORY)/AcpiTables/AcpiTables.inf
 
+  # Device Tree Support
+  FILE FREEFORM = gDtPlatformDefaultDtbFileGuid {
+    SECTION RAW = Platform/Rockchip/DeviceTree/rk3588s-nanopi-r6s.dtb
+  }
+
   # Splash screen logo
   INF $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/NanoPi-R6S.dsc b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/NanoPi-R6S.dsc
@@ -60,7 +60,7 @@
   gRockchipTokenSpaceGuid.PcdPlatformVendorName|"FriendlyElec"
   gRockchipTokenSpaceGuid.PcdFamilyName|"NanoPi 6"
   gRockchipTokenSpaceGuid.PcdProductUrl|"https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R6S"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588s-nanopi-r6s.dtb"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588s-nanopi-r6s"
 
   # I2C
   gRockchipTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x42, 0x43, 0x51 }

diff --git a/edk2-rockchip/Platform/Hinlink/H88K/H88K.Modules.fdf.inc b/edk2-rockchip/Platform/Hinlink/H88K/H88K.Modules.fdf.inc
@@ -9,5 +9,10 @@
   # ACPI Support
   INF RuleOverride = ACPITABLE $(PLATFORM_DIRECTORY)/AcpiTables/AcpiTables.inf
 
+  # Device Tree Support
+  FILE FREEFORM = gDtPlatformDefaultDtbFileGuid {
+    SECTION RAW = Platform/Rockchip/DeviceTree/rk3588-hinlink-h88k.dtb
+  }
+
   # Splash screen logo
   INF $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/Hinlink/H88K/H88K.dsc b/edk2-rockchip/Platform/Hinlink/H88K/H88K.dsc
@@ -60,7 +60,7 @@
   gRockchipTokenSpaceGuid.PcdPlatformVendorName|"Hinlink"
   gRockchipTokenSpaceGuid.PcdFamilyName|"H88K"
   gRockchipTokenSpaceGuid.PcdProductUrl|"http://www.hinlink.com/"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-hinlink-h88k.dtb"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-hinlink-h88k"
 
   # I2C
   gRockchipTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x42, 0x43, 0x51 }

diff --git a/edk2-rockchip/Platform/Khadas/Edge2/Edge2.Modules.fdf.inc b/edk2-rockchip/Platform/Khadas/Edge2/Edge2.Modules.fdf.inc
@@ -9,6 +9,11 @@
   # ACPI Support
   INF RuleOverride = ACPITABLE $(PLATFORM_DIRECTORY)/AcpiTables/AcpiTables.inf
 
+  # Device Tree Support
+  FILE FREEFORM = gDtPlatformDefaultDtbFileGuid {
+    SECTION RAW = Platform/Rockchip/DeviceTree/rk3588s-khadas-edge2.dtb
+  }
+
   # Splash screen logo
   INF $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf
 

diff --git a/edk2-rockchip/Platform/Khadas/Edge2/Edge2.dsc b/edk2-rockchip/Platform/Khadas/Edge2/Edge2.dsc
@@ -59,7 +59,7 @@
   gRockchipTokenSpaceGuid.PcdPlatformVendorName|"Khadas"
   gRockchipTokenSpaceGuid.PcdFamilyName|"Edge"
   gRockchipTokenSpaceGuid.PcdProductUrl|"https://www.khadas.com/edge2"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588s-khadas-edge2.dtb"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588s-khadas-edge2"
 
   # I2C
   gRockchipTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x42, 0x43, 0x51, 0x18 }

diff --git a/edk2-rockchip/Platform/Mekotronics/R58-Mini/R58-Mini.Modules.fdf.inc b/edk2-rockchip/Platform/Mekotronics/R58-Mini/R58-Mini.Modules.fdf.inc
@@ -9,5 +9,10 @@
   # ACPI Support
   INF RuleOverride = ACPITABLE $(PLATFORM_DIRECTORY)/AcpiTables/AcpiTables.inf
 
+  # Device Tree Support
+  FILE FREEFORM = gDtPlatformDefaultDtbFileGuid {
+    SECTION RAW = Platform/Rockchip/DeviceTree/rk3588-blueberry-minipc-linux.dtb
+  }
+
   # Splash screen logo
   INF $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/Mekotronics/R58-Mini/R58-Mini.dsc b/edk2-rockchip/Platform/Mekotronics/R58-Mini/R58-Mini.dsc
@@ -63,7 +63,7 @@
   gRockchipTokenSpaceGuid.PcdFamilyName|"R58"
   gRockchipTokenSpaceGuid.PcdProductUrl|"https://www.mekotronics.com/h-pd-76.html"
   gRockchipTokenSpaceGuid.PcdBoardName|"MINI-PC-RK3588-4D32-V1.0"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-blueberry-minipc-linux.dtb"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-blueberry-minipc-linux"
 
   # I2C
   gRockchipTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x42, 0x43, 0x51 }

diff --git a/edk2-rockchip/Platform/Mekotronics/R58X/R58X.Modules.fdf.inc b/edk2-rockchip/Platform/Mekotronics/R58X/R58X.Modules.fdf.inc
@@ -9,5 +9,10 @@
   # ACPI Support
   INF RuleOverride = ACPITABLE $(PLATFORM_DIRECTORY)/AcpiTables/AcpiTables.inf
 
+  # Device Tree Support
+  FILE FREEFORM = gDtPlatformDefaultDtbFileGuid {
+    SECTION RAW = Platform/Rockchip/DeviceTree/rk3588-blueberry-edge-v12-linux.dtb
+  }
+
   # Splash screen logo
   INF $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/Mekotronics/R58X/R58X.dsc b/edk2-rockchip/Platform/Mekotronics/R58X/R58X.dsc
@@ -60,7 +60,7 @@
   gRockchipTokenSpaceGuid.PcdFamilyName|"R58"
   gRockchipTokenSpaceGuid.PcdProductUrl|"https://www.mekotronics.com/h-pd-75.html"
   gRockchipTokenSpaceGuid.PcdBoardName|"EDGE-RK3588-4D32-V1.2"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-blueberry-edge-v10-linux.dtb"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-blueberry-edge-v12-linux"
 
   # I2C
   gRockchipTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x42, 0x43, 0x51 }

diff --git a/edk2-rockchip/Platform/Mixtile/Blade3/Blade3.Modules.fdf.inc b/edk2-rockchip/Platform/Mixtile/Blade3/Blade3.Modules.fdf.inc
@@ -9,5 +9,10 @@
   # ACPI Support
   INF RuleOverride = ACPITABLE $(PLATFORM_DIRECTORY)/AcpiTables/AcpiTables.inf
 
+  # Device Tree Support
+  FILE FREEFORM = gDtPlatformDefaultDtbFileGuid {
+    SECTION RAW = Platform/Rockchip/DeviceTree/rk3588-blade3-v101-linux.dtb
+  }
+
   # Splash screen logo
   INF $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/Mixtile/Blade3/Blade3.dsc b/edk2-rockchip/Platform/Mixtile/Blade3/Blade3.dsc
@@ -56,7 +56,7 @@
   gRockchipTokenSpaceGuid.PcdPlatformVendorName|"Mixtile"
   gRockchipTokenSpaceGuid.PcdFamilyName|"Blade"
   gRockchipTokenSpaceGuid.PcdProductUrl|"https://www.mixtile.com/blade-3/"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-blade3-v101-linux.dtb"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-blade3-v101-linux"
 
   # I2C
   gRockchipTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x42, 0x43 }

diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/OrangePi5.Modules.fdf.inc b/edk2-rockchip/Platform/OrangePi/OrangePi5/OrangePi5.Modules.fdf.inc
@@ -9,5 +9,10 @@
   # ACPI Support
   INF RuleOverride = ACPITABLE $(PLATFORM_DIRECTORY)/AcpiTables/AcpiTables.inf
 
+  # Device Tree Support
+  FILE FREEFORM = gDtPlatformDefaultDtbFileGuid {
+    SECTION RAW = Platform/Rockchip/DeviceTree/rk3588s-orangepi-5.dtb
+  }
+
   # Splash screen logo
   INF $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/OrangePi5.dsc b/edk2-rockchip/Platform/OrangePi/OrangePi5/OrangePi5.dsc
@@ -60,7 +60,7 @@
   gRockchipTokenSpaceGuid.PcdPlatformVendorName|"Orange Pi"
   gRockchipTokenSpaceGuid.PcdFamilyName|"Orange Pi 5"
   gRockchipTokenSpaceGuid.PcdProductUrl|"http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-5.html"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588s-orangepi-5.dtb"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588s-orangepi-5"
 
   # I2C
   gRockchipTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x42, 0x43, 0x51 }

diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/OrangePi5Plus.Modules.fdf.inc b/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/OrangePi5Plus.Modules.fdf.inc
@@ -9,5 +9,10 @@
   # ACPI Support
   INF RuleOverride = ACPITABLE $(PLATFORM_DIRECTORY)/AcpiTables/AcpiTables.inf
 
+  # Device Tree Support
+  FILE FREEFORM = gDtPlatformDefaultDtbFileGuid {
+    SECTION RAW = Platform/Rockchip/DeviceTree/rk3588-orangepi-5-plus.dtb
+  }
+
   # Splash screen logo
   INF $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/OrangePi5Plus.dsc b/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/OrangePi5Plus.dsc
@@ -59,7 +59,7 @@
   gRockchipTokenSpaceGuid.PcdPlatformVendorName|"Orange Pi"
   gRockchipTokenSpaceGuid.PcdFamilyName|"Orange Pi 5"
   gRockchipTokenSpaceGuid.PcdProductUrl|"http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-5-plus.html"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-orangepi-5-plus.dtb"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-orangepi-5-plus"
 
   # I2C
   gRockchipTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x42, 0x43, 0x51 }

diff --git a/edk2-rockchip/Platform/Radxa/ROCK5A/ROCK5A.Modules.fdf.inc b/edk2-rockchip/Platform/Radxa/ROCK5A/ROCK5A.Modules.fdf.inc
@@ -9,5 +9,10 @@
   # ACPI Support
   INF RuleOverride = ACPITABLE $(PLATFORM_DIRECTORY)/AcpiTables/AcpiTables.inf
 
+  # Device Tree Support
+  FILE FREEFORM = gDtPlatformDefaultDtbFileGuid {
+    SECTION RAW = Platform/Rockchip/DeviceTree/rk3588s-rock-5a.dtb
+  }
+
   # Splash screen logo
   INF $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/Radxa/ROCK5A/ROCK5A.dsc b/edk2-rockchip/Platform/Radxa/ROCK5A/ROCK5A.dsc
@@ -54,7 +54,7 @@
   gRockchipTokenSpaceGuid.PcdPlatformVendorName|"Radxa"
   gRockchipTokenSpaceGuid.PcdFamilyName|"ROCK 5"
   gRockchipTokenSpaceGuid.PcdProductUrl|"https://wiki.radxa.com/Rock5/hardware/5a"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588s-rock-5a.dtb"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588s-rock-5a"
 
   # I2C
   gRockchipTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x42, 0x43 }