Update README.md

Signed-off-by: Mario Bălănică <mariobalanica02@gmail.com>

.github/workflows/build.yml

@@ -1,30 +1,62 @@
 name: Build
 on:
   push:
+    paths-ignore:
+      - '**.md'
     branches:
       - master
   pull_request:
+    paths-ignore:
+      - '**.md'
     branches:
       - master
   workflow_call:
+    inputs:
+      build-configs:
+        type: string
+        required: true
+  workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        PLATFORM: [rock-5b, orangepi-5] # rk3588-evb is currently failing
-        CONFIGURATION: [Debug, Release]
+        PLATFORM:
+          - aio-3588q
+          - blade3
+          - edge2
+          - fydetab-duo
+          - h88k
+          - indiedroid-nova
+          - itx-3588j
+          - nanopc-cm3588-nas
+          - nanopc-t6
+          - nanopi-m6
+          - nanopi-r6c
+          - nanopi-r6s
+          - orangepi-5
+          - orangepi-5plus
+          - powerstation-6
+          - r58-mini
+          - r58x
+          - roc-rk3588s-pc
+          - rock-5-itx
+          - rock-5a
+          - rock-5b
+          - rock-5bplus
+          - station-m3
+        CONFIGURATION: ${{ fromJSON(format('[{0}]', inputs.build-configs || '"Debug"')) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Submodule init
-        shell: bash
-        run: git submodule update --init --recursive
-        
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
       - name: Install dependencies
         shell: bash
         run: |
+          sudo apt-get update && \
           sudo apt-get install -y \
           acpica-tools \
           binutils-aarch64-linux-gnu \
@@ -35,21 +67,44 @@ jobs:
           gcc-aarch64-linux-gnu \
           libc6-dev-arm64-cross \
           python3 \
-          python3-pyelftools
-          
+          python3-pyelftools \
+          uuid-dev
+
       - name: Get version tag
         id: get_version_tag
         shell: bash
         run: echo "version=$(git describe --tags --always)" >> $GITHUB_OUTPUT
-        
+
+      - name: Set up Secure Boot default keys
+        run: |
+          mkdir keys
+          # We don't really need a usable PK, so just generate a public key for it and discard the private key
+          openssl req -new -x509 -newkey rsa:2048 -subj "/CN=Rockchip Platform Key/" -keyout /dev/null -outform DER -out keys/pk.cer -days 7300 -nodes -sha256
+          curl -L https://go.microsoft.com/fwlink/?LinkId=321185 -o keys/ms_kek.cer
+          curl -L https://go.microsoft.com/fwlink/?linkid=321192 -o keys/ms_db1.cer
+          curl -L https://go.microsoft.com/fwlink/?linkid=321194 -o keys/ms_db2.cer
+          curl -L https://uefi.org/sites/default/files/resources/dbxupdate_arm64.bin -o keys/arm64_dbx.bin
+
       - name: Build platform
         shell: bash
-        run: |  
-         ./build.sh --device ${{matrix.PLATFORM}} --release ${{matrix.CONFIGURATION}}
+        run: |
+          export EDK2_SECUREBOOT_FLAGS=" \
+              -D DEFAULT_KEYS=TRUE \
+              -D PK_DEFAULT_FILE=keys/pk.cer \
+              -D KEK_DEFAULT_FILE1=keys/ms_kek.cer \
+              -D DB_DEFAULT_FILE1=keys/ms_db1.cer \
+              -D DB_DEFAULT_FILE2=keys/ms_db2.cer \
+              -D DBX_DEFAULT_FILE1=keys/arm64_dbx.bin \
+              -D SECURE_BOOT_ENABLE=TRUE"
+
+          export EDK2_BUILD_FLAGS=" \
+              ${EDK2_SECUREBOOT_FLAGS}"
+
+          ./build.sh --device ${{matrix.PLATFORM}} --release ${{matrix.CONFIGURATION}} --edk2-flags "${EDK2_BUILD_FLAGS}"
           mv RK3588_NOR_FLASH.img ${{matrix.PLATFORM}}_UEFI_${{matrix.CONFIGURATION}}_${{steps.get_version_tag.outputs.version}}.img
-        
+
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{matrix.PLATFORM}} UEFI ${{matrix.CONFIGURATION}} image
           path: ./*.img

.github/workflows/nightly.yml

@@ -0,0 +1,41 @@
+name: Nightly
+run-name: Nightly build
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - name: Delete previous cancelled runs
+        uses: Mattraks/delete-workflow-runs@v2
+        with:
+          retain_days: 0
+          keep_minimum_runs: 0
+          delete_workflow_pattern: ${{ github.workflow }}
+          delete_run_by_conclusion_pattern: cancelled
+
+      - name: Check for new commits
+        id: check-new-commits
+        uses: adriangl/check-new-commits-action@v1
+        with:
+          seconds: 86400 # One day in seconds
+          branch: 'master'
+
+      - name: Cancel action if no new commits
+        if: ${{ steps.check-new-commits.outputs.has-new-commits != 'true' }}
+        uses: andymckay/cancel-action@0.3
+
+      - name: Wait for cancellation
+        if: ${{ steps.check-new-commits.outputs.has-new-commits != 'true' }}
+        shell: bash
+        run: while true; do echo "Waiting for job to be cancelled"; sleep 5; done
+
+  build_for_nightly:
+    needs: prepare
+    uses: ./.github/workflows/build.yml
+    with:
+      build-configs: '"Debug", "Release"'

.github/workflows/release.yml

@@ -1,13 +1,15 @@
 name: Release
-on:  
+on:
   push:
     tags:
       - '*'
-      
+
 jobs:
   build_for_release:
     uses: ./.github/workflows/build.yml
-  
+    with:
+      build-configs: '"Debug", "Release"'
+
   release:
     runs-on: ubuntu-latest
     needs: build_for_release
@@ -15,20 +17,12 @@ jobs:
       contents: write
     steps:
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v3
-          
+        uses: actions/download-artifact@v4
+
       - name: Create release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           draft: true
           prerelease: false
           files: "*/*Release*.img"
           fail_on_unmatched_files: true
-          generate_release_notes: true
-          append_body: true
-          body: |
-            ## Usage
-            Flash the board-specific image to SPINOR with rkdevtool / rkdeveloptool or to an EMMC / SD card.
-            If your board is not yet supported, using a similar image may work but beware of potential issues.
-
-            Debug builds can be found in the artifacts of the workflow run for this release.

.gitignore

@@ -6,7 +6,6 @@ workspace
 ramdisk
 .cache
 .vscode
-*.dts
 *.swp
 *.rej
 *.orig

.gitmodules

@@ -1,4 +1,16 @@
-[submodule "simple-init"]
-	path = simple-init
-	url = https://github.com/BigfootACA/simple-init.git
-	branch = master
+[submodule "edk2"]
+	path = edk2
+	url = https://github.com/tianocore/edk2.git
+[submodule "edk2-non-osi"]
+	path = edk2-non-osi
+	url = https://github.com/tianocore/edk2-non-osi.git
+[submodule "misc/rkbin"]
+	path = misc/rkbin
+	url = https://github.com/rockchip-linux/rkbin.git
+[submodule "arm-trusted-firmware"]
+	path = arm-trusted-firmware
+	url = https://github.com/worproject/arm-trusted-firmware
+	branch = rk3588
+[submodule "devicetree/mainline/upstream"]
+	path = devicetree/mainline/upstream
+	url = https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git

README.md

@@ -1,65 +1,454 @@
-# EDK2 UEFI firmware for Rockchip RK35xx platforms
+# EDK2 UEFI firmware for Rockchip RK3588 platforms
+This repository contains an UEFI firmware implementation based on EDK2 for various RK3588 boards.
 
-**WARNING: This repo is highly experimental**
+It delivers a PC-like standardized boot experience, supporting multiple operating systems, such as Windows, Linux, BSD and VMware ESXi.
 
-## Description
+![EDK2 Front Page](images/edk2-frontpage.png)
 
-This repository is based on the official open-source UEFI implementation from Rockchip, which is under active development.
+# Supported platforms
+Support levels are categorized into two tiers: Platinum and Bronze.
 
-Therefore, to keep up with the work from Rockchip, we should avoid modifying code from Rockchip in most cases.
+Platinum devices are considered to have the best overall support, based on factors such as:
+- Device Tree and peripherals compatible with mainline Linux. [**Required**]
+- Active interest from the vendor in supporting their hardware.
+- Hardware design choices:
+  - If an Ethernet port is present, Realtek PCIe NIC or integrated GMAC. [**Required**]
+  - SPI NOR flash for dedicated firmware storage. [Preferred]
 
-Discussion thread: [Windows / UEFI on Rock 5 (Mega thread)](https://forum.radxa.com/t/windows-uefi-on-rock-5-mega-thread/12924)
+Bronze devices may have limitations such as:
+- Missing one or more required features listed above.
+- Low interest from vendors and/or the community.
+- Lack of proper validation, potentially affecting functionality.
 
-## Building
+Note that this list is subject to change at any time as devices gain better support or fall behind.
 
-Using Arch Linux as example
+## Platinum
+- [Radxa ROCK 5B](https://radxa.com/products/rock5/5b/)
+- [Radxa ROCK 5A](https://radxa.com/products/rock5/5a/)
+- [Radxa ROCK 5 ITX](https://radxa.com/products/rock5/5itx/)
+- [Orange Pi 5](http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-5.html)
+- [Orange Pi 5 Plus](http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-5-plus.html)
+- [Khadas Edge2](https://www.khadas.com/edge2)
+- [BuzzTV P6](https://buzztvglobal.com/products/powerstation-6)
+- [FriendlyELEC NanoPC T6](https://wiki.friendlyelec.com/wiki/index.php/NanoPC-T6)
+- [FriendlyELEC NanoPi R6C](https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R6C)
+- [FriendlyELEC NanoPi R6S](https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R6S)
+- [FriendlyELEC NanoPC CM3588-NAS](https://wiki.friendlyelec.com/wiki/index.php/CM3588_NAS_Kit)
+- [ameriDroid Indiedroid Nova](https://indiedroid.us)
 
-Install required packages:
+## Bronze
+- [Radxa ROCK 5B+](https://radxa.com/products/rock5/5bp)
+- [Fydetab Duo](https://fydetabduo.com/)
+- [Firefly AIO-3588Q](https://en.t-firefly.com/product/industry/aio3588q)
+- [Firefly ITX-3588J](https://en.t-firefly.com/product/industry/itx3588j)
+- [Firefly ROC-RK3588S-PC](https://en.t-firefly.com/product/industry/rocrk3588spc) / [StationPC Station M3](https://www.stationpc.com/product/stationm3)
+- [Mekotronics R58X](https://www.mekotronics.com/h-pd-75.html)
+- [Mekotronics R58 Mini](https://www.mekotronics.com/h-pd-76.html)
+- [Mixtile Blade 3](https://www.mixtile.com/blade-3)
+- [FriendlyELEC NanoPi M6](https://wiki.friendlyelec.com/wiki/index.php/NanoPi_M6)
+- [Hinlink H88K](http://www.hinlink.com)
+
+# Supported OSes
+## In ACPI mode
+| OS | Version | Tested/supported hardware | Notes |
+| --- | --- | --- | --- |
+| Windows | 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 switch to Device Tree mode. |
+
+> [!NOTE]
+> ACPI support is only being developed and tested against Windows. There are no plans to further improve functionality for other OSes. Consider using Device Tree instead (where applicable, for instance Linux).
+
+## In Device Tree mode
+### Vendor compatibility mode
+| OS | Version | Tested/supported hardware | Notes |
+| --- | --- | --- | --- |
+| Rockchip SDK Linux | Kernel 5.10/6.1<br> Tested with:<br> - [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). |
+
+### Mainline compatibility mode
+| OS | Version | Tested/supported hardware | Notes |
+| --- | --- | --- | --- |
+| Generic upstream Linux | Kernel 6.10 or newer.<br> Tested with:<br> - Ubuntu 24.10<br> - Fedora Workstation 41<br> - Fedora Workstation Rawhide | Platform and kernel version dependent, see [Collabora's RK3588 upstream status](https://gitlab.collabora.com/hardware-enablement/rockchip-3588/notes-for-rockchip-3588/-/blob/main/mainline-status.md). | * Kernels older than 6.13 lack HDMI output. To work around this, see: [Device Tree configuration](#device-tree-configuration). |
+
+> [!NOTE]
+> Mainline support is only available on [Platinum](#platinum) platforms.
+
+# Supported peripherals in UEFI
+
+> [!NOTE]
+> Applicable to all platforms unless otherwise noted.
+>
+> Only devices relevant to the firmware itself (not OS) are listed below.
+
+| Device | Status | Notes |
+| --- | --- | --- |
+| USB 3 / 2.0 / 1.1                     | 🟢 Working     | Host-mode only, USB 3 devices connected to a Type-C port only work in one orientation. |
+| PCIe 3.0 / 2.1                        | 🟢 Working     | |
+| SATA                                  | 🟢 Working     | |
+| SD/eMMC                               | 🟢 Working     | |
+| HDMI output                           | 🟢 Working     | |
+| DisplayPort output (USB-C)            | 🟡 Partial     | No hot-plug detect & EDID. Only works in one orientation of the Type-C port. Some displays may not work regardless. |
+| eDP output                            | 🟡 Partial     | Disabled, requires manual configuration depending on the platform and panel. |
+| DSI output                            | 🟢 Working     | Only enabled on Fydetab Duo. Requires manual configuration depending on the platform and panel. |
+| GMAC Ethernet                         | 🟢 Working     | |
+| Realtek PCIe Ethernet                 | 🟢 Working     | Some platforms don't have MAC addresses set, networking may not work in that case. |
+| Low-speed (GPIO/UART/I2C/SPI/PWM)     | 🟢 Working     | UART2 console available at 1500000 baud rate |
+| SPI NOR Flash                         | 🟢 Working     | |
+| HYM8563 real-time clock               | 🟢 Working     | |
+| RNG                                   | 🟢 Working     | |
+| Cooling fan                           | 🟢 Working     | Supported on most platforms. Fan connector where present, otherwise available at the GPIO header for 3-pin PWM fans (do *not* connect 2-pin fans there!):<br>* Orange Pi 5: `GPIO4_B2`<br>* Indiedroid Nova: `GPIO4_B4` |
+| Status LED                            | 🟢 Working     | |
+| Voltage regulators (RK806/RK860)      | 🟢 Working     | |
+| FUSB302 USB Type-C Controller         | 🔴 Not working | Required for PD negotiation and connector orientation switching |
+
+# Getting started
+## 1. Requirements
+* One of the [supported devices](#supported-platforms).
+* Storage for the firmware: SPI NOR flash (included with some devices), SD card or eMMC.
+* Quality power supply that can provide at least 15 W. Depending on the peripherals you use, more may be needed.
+
+  Note: on Mixtile Blade 3, a fixed voltage *higher than* 5V must be supplied. The board cannot power any external peripherals if the input voltage is just 5V. USB-PD negotiation is not supported by firmware.
+* HDMI (preferred) or DisplayPort (USB-C) screen.
+* Optionally, if display is not available or for debugging purposes, an UART adapter capable of 1500000 baud rate (e.g. USB CH340, CP2104).
+
+## 2. Download the firmware image
+The latest version can be obtained from <https://github.com/edk2-porting/edk2-rk3588/releases>.
+
+If your platform is not yet supported, using an image meant for another device is **NOT** recommended. Although they are generally similar, voltage setup can happen to be different and you may risk damaging the board. External peripherals are unlikely to work either.
+
+## 3. Flash the firmware
+UEFI can be flashed to either an SPI NOR flash, SD card or eMMC module:
+* For removable SD or eMMC (easiest), you can simply use balenaEtcher, RPi Imager or dd.
+* For SPI NOR or soldered eMMC, instructions can be found at: <https://wiki.radxa.com/Rock5/install/spi>.
+
+  In short, you can flash the image from Linux booted on the device or by using RKDevTool on another computer. The latter requires entering Maskrom mode on the device. The way to do this slightly varies across platforms, refer to your vendor documentation.
+
+**Warning:** these operations will erase data on the storage device. Make a backup first!
+
+If you wish to have both UEFI and an OS on the same SD or eMMC device: flash UEFI first, then create any additional partitions without touching the first, reserved one. Steps for updating the firmware in this case can be found [here](#updating-the-firmware).
+
+Note: Using SPI NOR (if present) is recommeded, as it leaves the other storage options free for other purposes. Additionally, SD/eMMC will limit the firmware's ability to access its own storage (variable store) when an OS is running. This feature is mostly used by OS installers to create the boot menu options, it is not mandatory.
+
+## 4. Connect peripherals and power on the device
+If the flashing process has been done correctly, you should see the status LED blinking (if present), and shortly after, the platform's boot logo with a progress bar at the bottom on the connected display.
+
+At this stage, you can press <kbd>Esc</kbd> to enter the firmware setup, <kbd>F1</kbd> to launch the UEFI Shell, or, provided you also have an UEFI bootloader/app on a storage device, you can let the system automatically run that, which is the default behavior if no action is taken.
+
+Check the [Supported OSes](#supported-oses) and [Supported peripherals in UEFI](#supported-peripherals-in-uefi) sections to see what's currently possible with this firmware.
+
+Also check the configuration options described below, some of which may need to be changed depending on the OS used.
+
+If you experience any issues, please see the [Troubleshooting](#troubleshooting) section.
+
+# Configuration settings
+The UEFI provides a few configuration options, like CPU frequency, PCIe/SATA selection for an M.2 port, fan control, etc. These can be viewed and changed using the UI configuration menu (under `Device Manager`->`Rockchip Platform Configuration`).
+
+Configuration through the user interface is fairly straightforward and help/navigation information is provided around the menus.
+
+## Tips
+### Boot time optimization
+* If there are unused M.2/PCIe slots, you can disable them to skip initialization: `Device Manager`->`Rockchip Platform Configuration`->`PCIe/SATA/USB Combo PIPE PHY` and set the relevant PHYs to `Unconnected`. Do the same for `PCI Express 3.0` by setting `Support State` to `Disabled`.
+
+* Auto boot time-out can be decreased from `Boot Maintenance Manager`.
+
+* If network boot is not used, it can be disabled: `Device Manager`->`Network Stack Configuration` then uncheck `Network Stack`.
+
+* If you do not need the ability to hot-plug displays or use DisplayPort while in the firmware: `Device Manager`->`Rockchip Platform Configuration`->`Display` and set `Force Output` to `Disabled`. This will skip display initialization when none is connected.
+
+* By default, the firmware connects all boot devices regardless of whether they are needed for the current boot. This is done to address potential compatibility issues and generally takes a negligible amount of time, thus it is recommended to not change it. However, it is still possible to do so: `Boot Maintenance Manager`->`Boot Discovery Policy`.
+
+### Linux boot
+* If you're getting a Synchronous Exception when booting certain distros, go to `Device Manager`->`EFI Memory Attribute Protocol` and uncheck `Enable Protocol`.
+
+## Device Tree configuration
+For rich Linux support, it is recommended to enable Device Tree mode. You can do so by going to `Device Manager`->`Rockchip Platform Configuration`->`ACPI / Device Tree` and setting `Config Table Mode` to `Device Tree`.
+
+The firmware provides two compatibility modes:
+* `Vendor` - compatible with Rockchip SDK Linux 5.10/6.1 kernel only.
+* `Mainline` - compatible with generic upstream Linux 6.10 or newer kernel. This option is under active development and may lack certain features. Therefore, it is always recommended to use the latest kernel and firmware available in order to benefit from better device support.
+
+[Platinum](#platinum) platforms will have the `Mainline` option enabled by default, while [Bronze](#bronze) ones will fall back to `Vendor`.
+
+> [!TIP]
+> In `Mainline` mode with generic Linux kernels older than 6.13, the HDMI output will not be usable. To use the UEFI-initialized display instead, go to `Device Manager`->`Rockchip Platform Configuration`->`ACPI / Device Tree` and enable `Force UEFI GOP Display`. Note that GPU acceleration cannot work in this mode.
+
+### Custom Device Tree Blob (DTB) override and overlays
+It is also possible to provide a custom DTB and overlays. To enable this, go to `Device Manager`->`Rockchip Platform Configuration`->`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.
+
+**Important:** The `dtb` directory must be placed at the root of the partition. It should not be inside any sub-directory.
+
+* 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.
+
+`<PLATFORM-DT-NAME>` can be:
+| Name                                    | Platform                      |
+| --------------------------------------- | ----------------------------- |
+| `rk3588-rock-5b`                        | ROCK 5B                       |
+| `rk3588-rock-5bp`                       | ROCK 5B+                      |
+| `rk3588s-rock-5a`                       | ROCK 5A                       |
+| `rk3588-rock-5-itx`                     | ROCK 5 ITX                    |
+| `rk3588s-orangepi-5`                    | Orange Pi 5                   |
+| `rk3588-orangepi-5-plus`                | Orange Pi 5 Plus              |
+| `rk3588s-9tripod-linux`                 | Indiedroid Nova               |
+| `rk3588s-fydetab-duo`                   | Fydetab Duo                   |
+| `rk3588-buzztv-p6`                      | PowerStation 6                |
+| `aio-3588q`                             | Firefly AIO-3588Q             |
+| `itx-3588j`                             | Firefly ITX-3588J             |
+| `roc-rk3588s-pc`                        | ROC-RK3588S-PC / Station M3   |
+| `rk3588-blueberry-edge-v12-linux`       | R58X (v1.2)                   |
+| `rk3588-blueberry-minipc-linux`         | R58 Mini                      |
+| `rk3588s-khadas-edge2`                  | Edge2                         |
+| `rk3588-blade3-v101-linux`              | Blade 3                       |
+| `rk3588-nanopc-t6`                      | NanoPC T6                     |
+| `rk3588-nanopc-cm3588-nas`              | NanoPC CM3588-NAS             |
+| `rk3588s-nanopi-r6c`                    | NanoPi R6C                    |
+| `rk3588s-nanopi-r6s`                    | NanoPi R6S                    |
+| `rk3588s-nanopi-m6`                     | NanoPi M6                     |
+| `rk3588-hinlink-h88k`                   | H88K                          |
+
+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.
+
+If it is also used by an OS and has additional partitions, only part of the image needs to be applied. This can be done with the `dd` tool:
 ```bash
-sudo pacman -Syu
-sudo pacman -S git base-devel gcc dtc aarch64-linux-gnu-binutils aarch64-linux-gnu-gcc aarch64-linux-gnu-glibc python python-pyelftools iasl --needed
+dd if=FIRMWARE.img of=DESTINATION bs=512 skip=64 seek=64 conv=notrunc
 ```
 
-Required packages for Ubuntu/Debian:
+`FIRMWARE.img` is the firmware image for your platform. E.g. `edge2_UEFI_Release_v0.8.img`.
+
+`DESTINATION` is the destination storage that you wish to update the firmware on. E.g. `/dev/sdb`.
+
+Here we skip the GPT and copy the firmware starting at offset 0x8000 (`64` blocks * `512` bytes block size) until its end. See [Flash layout](#flash-layout) for more details.
+
+## Flash SPI NOR from the UEFI Shell
+1) Copy the firmware image to a FAT32 partition on a storage drive and connect it to the device.
+
+2) Launch the UEFI Shell (press <kbd>F1</kbd> during boot or go to `Boot Manager`->`UEFI Shell`).
+
+3) Navigate to the partition / file system containing the firmware image:
+   * Use the `map` command to list all mounted file systems, e.g. `fs0:`, `fs1:`, etc. Type the file system name and press <kbd>Enter</kbd> to change directory to it.
+
+   * If you're unsure which file system to use, run `ls fsX:` (replace `X` with the actual number) to list its contents.
+
+4) Run `sf updatefile FIRMWARE.img 0x0` and wait for the update process to complete.
+
+5) Reboot the device.
+
+# Troubleshooting
+
+> [!IMPORTANT]
+> First of all, make sure your device can only possibly load the UEFI firmware and nothing else.
+>
+> **U-Boot must not be present on either SPI NOR, SD or eMMC, otherwise it could take precedence and cause issues.**
+
+Below you can find some basic debugging information. If none of this helps, please see the [Advanced troubleshooting](#advanced-troubleshooting) section.
+
+## Meaning of the Status LED
+If your device has an activity LED, the firmware will blink it in different patterns to indicate the current system status.
+
+1. Immediately after power on, the LED should start pulsing quickly. This indicates that the firmware is initializing.
+
+2. After initialization (usually takes less than 5 seconds), the LED will switch to a short pulsing every 2 seconds or so. This indicates that the firmware is ready and waiting for user action or the countdown to boot automatically. The display output should also be enabled at this point.
+
+3. When the firmware boots an OS and is about to exit, the LED will stop blinking.
+
+If the LED:
+* does not light up after power on, this means the firmware has not managed to load up at all.
+* gets stuck in either on or off state after blinking a few times and never recovers, something went wrong and the firmware has crashed or frozen.
+
+  Note that it is only expected to stop as described at point 3) above.
+
+## Recovery
+In case you don't have easy access to the MaskROM button, UEFI provides a boot option for that purpose, accessible either via the Boot Manager or <kbd>F4</kbd> key during splash screen.
+
+Additionally, holding the Recovery (or volume up) button while powering on the device will also enter MaskROM mode.
+
+## Common issues
+### Nothing shows up on the screen
+Make sure you've flashed the firmware correctly and that it is the version designed for your device. In most cases this is the culprit.
+
+Assuming the firmware loads fine:
+* The display must support a resolution of at least 640 x 480 at 60 Hz.
+
+* Try booting without any display connected, then plug it in after a couple of seconds (when the status LED pattern changes). This will force the firmware to output at the minimum supported resolution. You can then increase the resolution by going to `Device Manager`->`Rockchip Platform Configuration`->`Display`.
+
+* If you're using USB-C to DisplayPort, only one orientation of the USB-C connector will work. Check both.
+
+If you are still not able to get any display output, the only way to interact with UEFI is via the [serial console](#advanced-troubleshooting).
+
+### Configuration settings do not get saved
+This has been observed in cases where firmware was present on more than one device (SPI NOR, eMMC or SD). This is not a supported scenario, because UEFI will be unable to accurately determine the boot device it belongs to. The solution is to unplug or erase devices that may have other firmware on them.
+
+### USB 3 devices do not work
+* Try a different port.
+* If you're using USB-C, 3.0 devices will only work in one orientation of the connector. Check both.
+* Make sure the power supply and cable are good.
+
+### Networking does not work
+* Only integrated Gigabit Ethernet (GMAC), Realtek PCIe and USB controllers are supported.
+
+* Some boards with Realtek NICs do not have a MAC address set at factory and will show-up as being all zeros in UEFI, possibly preventing the adapter from obtaining an IP address.
+
+  You can easily fix this by writing the MAC address manually:
+
+  1. Boot into Linux and open up a terminal. The commands below apply to Armbian with legacy kernel.
+
+  2. Install the headers for your kernel version:
+      ```bash
+      sudo apt install -y linux-headers-legacy-rk35xx
+      ```
+
+  3. Clone Realtek PGTool and build the driver:
+      ```bash
+      git clone https://github.com/redchenjs/rtnicpg
+      cd rtnicpg
+      make
+      ```
+
+  4. Unload all Realtek modules and load the driver built above:
+      ```bash
+      sudo rmmod pgdrv
+      sudo ./pgload.sh
+      ```
+      Note: make sure there aren't any remaining Realtek modules loaded after this, except for the new `pgdrv`.<br> If you have `r8125` built-in, you might have to reboot with `initcall_blacklist=rtl8125_init_module` as a kernel parameter (in Grub).
+
+   5. Burn a MAC address into the eFuses:
+
+      For only one NIC:
+      ```bash
+      sudo ./rtnicpg-aarch64-linux-gnu /efuse /nodeid 00E04C001234
+      ```
+      For two or more:
+      ```bash
+      sudo ./rtnicpg-aarch64-linux-gnu /efuse /# 1 /nodeid 00E04C001234
+      sudo ./rtnicpg-aarch64-linux-gnu /efuse /# 2 /nodeid 00E04C001235
+      ```
+      `00E04C001234` is an example address. You can generate random and unique ones using: <https://www.macvendorlookup.com/mac-address-generator>
+
+  **Note:** the number of eFuses is limited, thus MAC addresses can only be changed a few times.
+
+### Wi-Fi / Bluetooth not working on mainline Linux
+The most likely cause is missing upstream firmware support. Check `dmesg` for messages that indicate firmware load errors.
+
+This can usually be fixed by manually copying the necessary blobs to `/usr/lib/firmware`.
+
+For instance, on Khadas Edge2 with an onboard AP6275P module (BCM/SYN43752):
 ```bash
-sudo apt install git gcc g++ build-essential gcc-aarch64-linux-gnu iasl python3-pyelftools
+sudo wget https://github.com/armbian/firmware/raw/refs/heads/master/brcm/brcmfmac43752-pcie.bin -P /usr/lib/firmware/brcm/
+sudo wget https://github.com/armbian/firmware/raw/refs/heads/master/brcm/brcmfmac43752-pcie.clm_blob -P /usr/lib/firmware/brcm/
+sudo wget https://github.com/armbian/firmware/raw/refs/heads/master/brcm/brcmfmac43752-pcie.txt -P /usr/lib/firmware/brcm/
+sudo wget https://github.com/armbian/firmware/raw/refs/heads/master/brcm/BCM4362A2.hcd -P /usr/lib/firmware/brcm/
 ```
+then reboot.
 
-Clone the repository:
-```bash
-git clone https://github.com/edk2-porting/edk2-rk35xx.git --recursive
-cd edk2-rk35xx
-```
+## Advanced troubleshooting
+The firmware will log detailed information to the serial console when using a debug version. See the [release notes](https://github.com/edk2-porting/edk2-rk3588/releases) for details on how to obtain this version.
 
-Build UEFI (ROCK 5B for example):
-```bash
-./build.sh -d rock-5b
-```
+1. The debug image needs to be flashed in place of the existing one.
 
-## TODO
- - Create gpt image in build process instead of using the prebuilt one
- - Fix resetting to maskrom
+2. Connect the **UART2** RX, TX and GND pins on your device (check vendor documentation) to the UART adapter on your other computer.
 
-## Notes
+3. Open up a serial terminal (`PuTTY` on Windows, `stty` on Linux) set to 1500000 baud rate and 8n1 (default).
 
-### Flash layout
+4. Power on the device.
 
+You should be able to see many debug messages being printed to the console. If that's not the case, double check the connections (swap RX/TX), make sure the adapter is functional and configured correctly.
+
+The logs should give an insight of what's going on. If you need help analyzing them, feel free to open an issue ticket.
+
+# Reporting issues
+You can open issues related to UEFI at <https://github.com/edk2-porting/edk2-rk3588/issues>.
+
+Please include as many details as possible: expected behavior, what actually happens, steps to reproduce, [serial logs](#advanced-troubleshooting), etc.
+
+Also check the existing issues in case yours might be already reported.
+
+# Building
+The firmware can only be built on Linux currently. For Windows use WSL.
+
+1. Install required packages:
+
+   For Ubuntu/Debian:
+   ```bash
+   sudo apt install git gcc g++ build-essential gcc-aarch64-linux-gnu acpica-tools python3-pyelftools uuid-dev python-is-python3 device-tree-compiler
+   ```
+   For Arch Linux:
+   ```bash
+   sudo pacman -Syu
+   sudo pacman -S git base-devel gcc dtc aarch64-linux-gnu-binutils aarch64-linux-gnu-gcc aarch64-linux-gnu-glibc python python-pyelftools iasl --needed
+   ```
+
+2. Clone the repository:
+   ```bash
+   git clone https://github.com/edk2-porting/edk2-rk3588.git --recursive
+   cd edk2-rk3588
+   ```
+
+3. Build UEFI (ROCK 5B for example, check [list of platform configs](https://github.com/edk2-porting/edk2-rk3588/tree/master/configs)):
+   ```bash
+   ./build.sh --device rock-5b --release Release # (or Debug)
+   ```
+
+If you get build errors, it is very likely that you're still missing some dependencies. The list of packages above is not complete and depending on the distro you may need to install additional ones. In most cases, looking up the error messages on the internet will point you at the right packages.
+
+# Notes
+
+## Flash layout
 | Address    | Size       | Desc                  | File                   |
-| ---------- | :--------- | --------------------- | ---------------------- |
+| ---------- | ---------- | --------------------- | ---------------------- |
 | 0x00000000 | 0x00004400 | GPT Table             | rk3588_spi_nor_gpt.img |
 | 0x00008000 |            | IDBlock               | idblock.bin            |
-| 0x00088000 |            | IDBlock               | idblock.bin            |
 | 0x00100000 | 0x00500000 | BL33_AP_UEFI FV       | ${DEVICE}_EFI.itb      |
 | 0x007C0000 | 0x00010000 | NV_VARIABLE_STORE     |                        |
-| 0x007D0000 | 0x00010000 | NV_FTW_WORKING header |                        |
-| 0x007E0000 | 0x00010000 | NV_FTW_WORKING data   | NV_DATA.img            |
+| 0x007D0000 | 0x00010000 | NV_FTW_WORKING        |                        |
+| 0x007E0000 | 0x00010000 | NV_FTW_SPARE          |                        |
 
-### Memory Map
+The variable store is not included in the flash image, in order to prevent overwriting it and to maintain the user settings across updates.
 
-| Address    | Size | Desc          | File                |
-| ---------- | :--: | ------------- | ------------------- |
-| 0x00040000 |      | ATF           | bl31_0x00040000.bin |
-| 0x000f0000 |      | ATF           | bl31_0x000f0000.bin |
-| 0x00200000 |      | UEFI FV       | BL33_AP_UEFI.Fv     |
-| 0x08400000 |      | OP-TEE        | bl32.bin            |
-| 0xff100000 |      | ATF (PMU_MEM) | bl31_0xff100000.bin |
+The firmware expects these exact offsets, do not change them.
+
+## Memory Map
+| Address    | Size       | Desc                  | File                |
+| ---------- | ---------  | --------------------- | ------------------- |
+| 0x00040000 |            | ATF                   | bl31_0x00040000.bin |
+| 0x000f0000 |            | ATF                   | bl31_0x000f0000.bin |
+| 0x00200000 | 0x00500000 | UEFI FV               | BL33_AP_UEFI.Fv     |
+| 0x007C0000 | 0x00010000 | NV_VARIABLE_STORE     |                     |
+| 0x007D0000 | 0x00010000 | NV_FTW_WORKING        |                     |
+| 0x007E0000 | 0x00010000 | NV_FTW_SPARE          |                     |
+| 0x08400000 |            | OP-TEE                | bl32.bin            |
+| 0xff100000 |            | ATF (PMU_MEM)         | bl31_0xff100000.bin |
+
+## Licenses
+Most of the UEFI code is licensed under the default EDK2 license, which is [BSD-2-Clause-Patent](https://github.com/tianocore/edk2/blob/master/License.txt).
+
+Some components ported from Linux and Rockchip's U-Boot fork are licensed as **GPL-2.0** (check `SPDX-License-Identifier`).
+
+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.
+
+## Community
+* Hack w/ Rockchip Telegram: <https://t.me/UEFIonRockchip>
+* Windows on R Discord: <https://discord.gg/vjHwptUCa3>
+
+## Credits & alternatives
+This firmware is based on Rockchip's initial efforts at <https://gitlab.com/rk3588_linux/rk/uefi-monorepo>.
+
+For RK356x, check out the Quartz64-UEFI project at https://github.com/jaredmcneill/quartz64_uefi, from which we also reused some code.

build.sh

@@ -1,215 +1,256 @@
 #!/bin/bash
 
 function _help(){
-	echo "Usage: build.sh --device DEV"
-	echo
-	echo "Build edk2 for Rockchip RK35xx platforms."
-	echo
-	echo "Options: "
-	echo "	--device DEV, -d DEV:    build for DEV."
-	echo "	--all, -a:               build all devices."
-	echo "	--release MODE, -r MODE: Release mode for building, default is 'DEBUG', 'RELEASE' alternatively."
-	echo "	--toolchain TOOLCHAIN:   Set toolchain, default is 'GCC5'."
-	echo " 	--skip-rootfs-gen:       skip generating SimpleInit rootfs to speed up building."
-	echo "	--clean, -C:             clean workspace and output."
-	echo "	--distclean, -D:         clean up all files that are not in repo."
-	echo "	--outputdir, -O:         output folder."
-	echo "	--help, -h:              show this help."
-	echo
-	exit "${1}"
+    echo
+    echo "Build EDK2 for Rockchip RK3588 platforms."
+    echo
+    echo "Usage: build.sh [options]"
+    echo
+    echo "Options:"
+    echo "  -d, --device DEV            Build for DEV, or 'all'."
+    echo "  -r, --release MODE          Release mode for building, default is 'DEBUG', 'RELEASE' alternatively."
+    echo "  -t, --toolchain TOOLCHAIN   Set toolchain, default is 'GCC'."
+    echo "  --open-tfa ENABLE           Use open-source TF-A submodule. Default: ${OPEN_TFA}"
+    echo "  -C, --clean                 Clean workspace and output."
+    echo "  -D, --distclean             Clean up all files that are not in repo."
+    echo "  --tfa-flags \"FLAGS\"         Flags appended to open TF-A build process."
+    echo "  --edk2-flags \"FLAGS\"        Flags appended to the EDK2 build process."
+    echo "  -h, --help                  Show this help."
+    echo
+    exit "${1}"
 }
 
-function _error(){ echo "${@}" >&2;exit 1; }
+function _error() { echo "${@}" >&2; exit 1; }
 
-function _build_idblock(){
-	echo " => Building idblock.bin"
-	pushd ${WORKSPACE}
-	FLASHFILES="FlashHead.bin FlashData.bin FlashBoot.bin"
-	rm -f rk35*_spl_loader_*.bin idblock.bin rk35*_ddr_*.bin rk35*_usbplug*.bin UsbHead.bin ${FLASHFILES}
+function _build_idblock() {
+    echo " => Building idblock.bin"
+    pushd ${WORKSPACE}
 
-	# Create idblock.bin
-	${ROOTDIR}/misc/rkbin/tools/mkimage -n rk3588 -T rksd -d ${ROOTDIR}/misc/rkbin/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.09.bin:${ROOTDIR}/misc/rkbin/bin/rk35/rk3588_spl_v1.11.bin idblock.bin
-	popd
-	echo " => idblock.bin build done"
+    FLASHFILES="FlashHead.bin FlashData.bin FlashBoot.bin"
+    rm -f rk35*_spl_loader_*.bin idblock.bin rk35*_ddr_*.bin rk35*_usbplug*.bin UsbHead.bin ${FLASHFILES}
+
+    DDRBIN_RKBIN=$(grep '^FlashData' ${ROOTDIR}/misc/rkbin/RKBOOT/${MINIALL_INI} | cut -d = -f 2-)
+    SPL_RKBIN=$(grep '^FlashBoot' ${ROOTDIR}/misc/rkbin/RKBOOT/${MINIALL_INI} | cut -d = -f 2-)
+
+    DDRBIN="${ROOTDIR}/misc/rkbin/${DDRBIN_RKBIN}"
+
+    #
+    # SPL v1.13 has broken SD card support!
+    # Use v1.12 instead.
+    #
+    # SPL="${ROOTDIR}/misc/rkbin/${SPL_RKBIN}"
+    SPL="${ROOTDIR}/misc/rk3588_spl_v1.12.bin"
+
+    # Create idblock.bin
+    ${ROOTDIR}/misc/tools/${MACHINE_TYPE}/mkimage -n rk3588 -T rksd -d ${DDRBIN}:${SPL} idblock.bin
+
+    popd
+    echo " => idblock.bin build done"
 }
 
-function _build_fit(){
-	echo " => Building FIT"
-	pushd ${WORKSPACE}
-	BL31=$(grep '^PATH=.*_bl31_' ${ROOTDIR}/misc/rkbin/RKTRUST/${TRUST_INI} | cut -d = -f 2-)
-	BL32=$(grep '^PATH=.*_bl32_' ${ROOTDIR}/misc/rkbin/RKTRUST/${TRUST_INI} | cut -d = -f 2-)
-	rm -f bl31_0x*.bin ${WORKSPACE}/BL33_AP_UEFI.Fv ${SOC_L}_${DEVICE}_EFI.its
+function _build_fit() {
+    echo " => Building FIT"
+    pushd ${WORKSPACE}
 
-	${ROOTDIR}/misc/extractbl31.py ${ROOTDIR}/misc/rkbin/${BL31}
-	cp ${ROOTDIR}/misc/rkbin/${BL32} ${WORKSPACE}/bl32.bin
-	cp ${ROOTDIR}/misc/${SOC_L}_spl.dtb ${WORKSPACE}/${DEVICE}.dtb
-	cp ${WORKSPACE}/Build/${PLATFORM_NAME}/${_MODE}_${TOOLCHAIN}/FV/BL33_AP_UEFI.Fv ${WORKSPACE}/
-	cat ${ROOTDIR}/misc/uefi_${SOC_L}.its | sed "s,@DEVICE@,${DEVICE},g" > ${SOC_L}_${DEVICE}_EFI.its
-	${ROOTDIR}/misc/rkbin/tools/mkimage -f ${SOC_L}_${DEVICE}_EFI.its -E ${DEVICE}_EFI.itb
+    BL31_RKBIN=$(grep '^PATH=.*_bl31_' ${ROOTDIR}/misc/rkbin/RKTRUST/${TRUST_INI} | cut -d = -f 2-)
+    BL32_RKBIN=$(grep '^PATH=.*_bl32_' ${ROOTDIR}/misc/rkbin/RKTRUST/${TRUST_INI} | cut -d = -f 2-)
 
-	popd
-	echo " => FIT build done"
+    BL31="${ROOTDIR}/misc/rkbin/${BL31_RKBIN}"
+    BL32="${ROOTDIR}/misc/rkbin/${BL32_RKBIN}"
+
+    if [ ${OPEN_TFA} == 1 ]; then
+        BL31="${ROOTDIR}/arm-trusted-firmware/build/${TFA_PLAT}/${RELEASE_TYPE,,}/bl31/bl31.elf"
+    fi
+
+    rm -f bl31_0x*.bin ${WORKSPACE}/BL33_AP_UEFI.Fv ${SOC_L}_${DEVICE}_EFI.its
+
+    ${ROOTDIR}/misc/extractbl31.py ${BL31}
+    if [ ! -f bl31_0x000f0000.bin ]; then
+        # Not used but FIT expects it.
+        touch bl31_0x000f0000.bin
+    fi
+
+    cp ${BL32} ${WORKSPACE}/bl32.bin
+    cp ${ROOTDIR}/misc/${SOC_L}_spl.dtb ${WORKSPACE}/${DEVICE}.dtb
+    cp ${WORKSPACE}/Build/${PLATFORM_NAME}/${RELEASE_TYPE}_${TOOLCHAIN}/FV/BL33_AP_UEFI.Fv ${WORKSPACE}/
+    cat ${ROOTDIR}/misc/uefi_${SOC_L}.its | sed "s,@DEVICE@,${DEVICE},g" > ${SOC_L}_${DEVICE}_EFI.its
+    ${ROOTDIR}/misc/tools/${MACHINE_TYPE}/mkimage -f ${SOC_L}_${DEVICE}_EFI.its -E ${DEVICE}_EFI.itb
+
+    popd
+    echo " => FIT build done"
 }
 
-function _pack(){
-	_build_idblock
-	_build_fit
+function _pack_image() {
+    _build_idblock
+    _build_fit
 
-	echo " => Building 8MB NOR FLASH IMAGE"
-	cp ${WORKSPACE}/Build/${PLATFORM_NAME}/${_MODE}_${TOOLCHAIN}/FV/NOR_FLASH_IMAGE.fd ${WORKSPACE}/RK3588_NOR_FLASH.img
+    echo " => Building 8MB NOR FLASH IMAGE"
+    cp ${WORKSPACE}/Build/${PLATFORM_NAME}/${RELEASE_TYPE}_${TOOLCHAIN}/FV/NOR_FLASH_IMAGE.fd ${WORKSPACE}/RK3588_NOR_FLASH.img
 
-	# backup NV_DATA at 0x007C0000
-	dd if=${WORKSPACE}/RK3588_NOR_FLASH.img of=${WORKSPACE}/NV_DATA.img bs=1K skip=7936
-	# might be GPT table? size:0x4400
-	dd if=${ROOTDIR}/misc/rk3588_spi_nor_gpt.img of=${WORKSPACE}/RK3588_NOR_FLASH.img
-	# idblock at 0x8000 and 0x88000
-	dd if=${WORKSPACE}/idblock.bin of=${WORKSPACE}/RK3588_NOR_FLASH.img bs=1K seek=32
-	dd if=${WORKSPACE}/idblock.bin of=${WORKSPACE}/RK3588_NOR_FLASH.img bs=1K seek=544
-	# FIT Image at 0x100000
-	dd if=${WORKSPACE}/${DEVICE}_EFI.itb of=${WORKSPACE}/RK3588_NOR_FLASH.img bs=1K seek=1024
-	# restore NV_DATA at 0x007C0000
-	dd if=${WORKSPACE}/NV_DATA.img of=${WORKSPACE}/RK3588_NOR_FLASH.img bs=1K seek=7936
-	cp ${WORKSPACE}/RK3588_NOR_FLASH.img ${ROOTDIR}/
+    # GPT at 0x0, size:0x4400
+    dd if=${ROOTDIR}/misc/rk3588_spi_nor_gpt.img of=${WORKSPACE}/RK3588_NOR_FLASH.img
+    # idblock at 0x8000
+    dd if=${WORKSPACE}/idblock.bin of=${WORKSPACE}/RK3588_NOR_FLASH.img bs=1K seek=32
+    # FIT Image at 0x100000
+    dd if=${WORKSPACE}/${DEVICE}_EFI.itb of=${WORKSPACE}/RK3588_NOR_FLASH.img bs=1K seek=1024
+    cp ${WORKSPACE}/RK3588_NOR_FLASH.img ${ROOTDIR}/
 }
 
 function _build(){
-	local DEVICE="${1}"
-	shift
-	[ -d "${WORKSPACE}/Conf" ]||mkdir -p "${WORKSPACE}/Conf"
-	source "${ROOTDIR}/edk2/edksetup.sh"
-	[ -d "${WORKSPACE}" ]||mkdir "${WORKSPACE}"
-	set -x
-	make -C "${ROOTDIR}/edk2/BaseTools"||exit "$?"
+    local DEVICE="${1}"; shift
 
-	EXT=""
+    #
+    # Grab platform parameters
+    #
+    if [ -f "configs/${DEVICE}.conf" ]
+    then source "configs/${DEVICE}.conf"
+    else _error "Device configuration not found"
+    fi
+    if [ -f "configs/${SOC}.conf" ]
+    then source "configs/${SOC}.conf"
+    else _error "SoC configuration not found"
+    fi
+    typeset -l SOC_L="$SOC"
 
-	if [ -f "configs/${DEVICE}.conf" ]
-	then source "configs/${DEVICE}.conf"
-	else _error "Device configuration not found"
-	fi
-	if [ -f "configs/${SOC}.conf" ]
-	then source "configs/${SOC}.conf"
-	else _error "SoC configuration not found"
-	fi
-	typeset -l SOC_L="$SOC"
+    rm -f "${OUTDIR}/RK35*_NOR_FLASH.img"
 
-	# based on the instructions from edk2-platform
-	rm -f "${OUTDIR}/RK35*_NOR_FLASH.img"
+    #
+    # Build TF-A
+    #
+    if [ ${OPEN_TFA} == 1 ]; then
+        pushd arm-trusted-firmware
 
-	case "${MODE}" in
-		RELEASE) _MODE=RELEASE;;
-		*) _MODE=DEBUG;;
-	esac
+        if [ ${RELEASE_TYPE} == "DEBUG" ]; then
+            DEBUG=1
+        else
+            DEBUG=0
+        fi
 
-	build \
-		-s \
-		-n 0 \
-		-a AARCH64 \
-		-t "${TOOLCHAIN}" \
-		-p "${ROOTDIR}/${DSC_FILE}" \
-		-b "${_MODE}" \
-		-D FIRMWARE_VER="${GITCOMMIT}" \
-		||return "$?"
+        make PLAT=${TFA_PLAT} DEBUG=${DEBUG} all ${TFA_FLAGS}
 
-	_pack
-	set +x
+        popd
+    fi
 
-	echo "Build done: RK3588_NOR_FLASH.img"
+    #
+    # Build EDK2
+    #
+    [ -d "${WORKSPACE}/Conf" ] || mkdir -p "${WORKSPACE}/Conf"
+
+    export GCC_AARCH64_PREFIX="${CROSS_COMPILE}"
+    export CLANG38_AARCH64_PREFIX="${CROSS_COMPILE}"
+    export PACKAGES_PATH="${ROOTDIR}/edk2:${ROOTDIR}/edk2-rockchip:${ROOTDIR}/devicetree:${ROOTDIR}/edk2-non-osi:${ROOTDIR}"
+
+    make -C "${ROOTDIR}/edk2/BaseTools"
+    source "${ROOTDIR}/edk2/edksetup.sh"
+
+    build \
+        -s \
+        -n 0 \
+        -a AARCH64 \
+        -t "${TOOLCHAIN}" \
+        -p "${ROOTDIR}/${DSC_FILE}" \
+        -b "${RELEASE_TYPE}" \
+        -D FIRMWARE_VER="${GIT_COMMIT}" \
+        -D NETWORK_ALLOW_HTTP_CONNECTIONS=TRUE \
+        -D NETWORK_ISCSI_ENABLE=TRUE \
+        -D INCLUDE_TFTP_COMMAND=TRUE \
+        --pcd gRockchipTokenSpaceGuid.PcdFitImageFlashAddress=0x100000 \
+        ${EDK2_FLAGS}
+
+    #
+    # Compile final image
+    #
+    _pack_image
+
+    echo "Build done: RK3588_NOR_FLASH.img"
 }
 
-function _clean(){ rm --one-file-system --recursive --force "${WORKSPACE}" "${OUTDIR}"/boot-*.img "${OUTDIR}"/uefi-*.img*; }
+function _clean() { rm --one-file-system --recursive --force "${OUTDIR}"/workspace "${OUTDIR}"/RK3588_*.img; }
+function _distclean() { if [ -d .git ]; then git clean -xdf; else _clean; fi; }
 
-function _distclean(){ if [ -d .git ];then git clean -xdf;else _clean;fi; }
-
-OUTDIR="${PWD}"
-ROOTDIR="$(realpath "$(dirname "$0")")"
-cd "${ROOTDIR}"||exit 1
+#
+# Default variables
+#
 typeset -l DEVICE
-typeset -u MODE
+typeset -u RELEASE_TYPE
 DEVICE=""
-MODE=DEBUG
+RELEASE_TYPE=DEBUG
+TOOLCHAIN=GCC
+OPEN_TFA=1
+TFA_FLAGS=""
+EDK2_FLAGS=""
 CLEAN=false
 DISTCLEAN=false
-TOOLCHAIN=GCC5
-export ROOTDIR OUTDIR
-export GEN_ROOTFS=true
-OPTS="$(getopt -o t:d:haCDO:r -l toolchain:,device:,help,all,skip-rootfs-gen,clean,distclean,outputdir:,release: -n 'build.sh' -- "$@")"||exit 1
+OUTDIR="${PWD}"
+
+#
+# Get options
+#
+OPTS=$(getopt -o "d:r:t:CDh" -l "device:,release:,toolchain:,open-tfa:,tfa-flags:,edk2-flags:,clean,distclean,help" -n build.sh -- "${@}") || _help $?
 eval set -- "${OPTS}"
-while true
-do	case "${1}" in
-		-d|--device) DEVICE="${2}";shift 2;;
-		-a|--all) DEVICE=all;shift;;
-		-C|--clean) CLEAN=true;shift;;
-		-D|--distclean) DISTCLEAN=true;shift;;
-		-O|--outputdir) OUTDIR="${2}";shift 2;;
-		--skip-rootfs-gen) GEN_ROOTFS=false;shift;;
-		-r|--release) MODE="${2}";shift 2;;
-		-t|--toolchain) TOOLCHAIN="${2}";shift 2;;
-		-h|--help) _help 0;shift;;
-		--) shift;break;;
-		*) _help 1;;
-	esac
+while true; do
+    case "${1}" in
+        -d|--device) DEVICE="${2}"; shift 2 ;;
+        -r|--release) RELEASE_TYPE="${2}"; shift 2 ;;
+        -t|--toolchain) TOOLCHAIN="${2}"; shift 2 ;;
+        --open-tfa) OPEN_TFA="${2}"; shift 2 ;;
+        --tfa-flags) TFA_FLAGS="${2}"; shift 2 ;;
+        --edk2-flags) EDK2_FLAGS="${2}"; shift 2 ;;
+        -C|--clean) CLEAN=true; shift ;;
+        -D|--distclean) DISTCLEAN=true; shift ;;
+        -h|--help) _help 0; shift ;;
+        --) shift; break ;;
+        *) break ;;
+    esac
 done
-if "${DISTCLEAN}";then _distclean;exit "$?";fi
-if "${CLEAN}";then _clean;exit "$?";fi
-[ -z "${DEVICE}" ]&&_help 1
-
-if ! [ -f Common/edk2/edksetup.sh ] && ! [ -f ../edk2/edksetup.sh ]
-then
-	set -e
-	echo "SKIP Updating submodules"
-	set +e
+if [[ -n "${@}" ]]; then
+    echo "Invalid additional arguments '${@}'"
+    _help 1
 fi
 
-for i in "${SIMPLE_INIT}" ./simple-init ../simple-init
-do
-	if [ -n "${i}" ]&&[ -f "${i}/SimpleInit.inc" ]
-	then
-		_SIMPLE_INIT="$(realpath "${i}")"
-		break
-	fi
-done
+if "${DISTCLEAN}"; then _distclean; exit "$?"; fi
+if "${CLEAN}"; then _clean; exit "$?"; fi
 
-[ -n "${_SIMPLE_INIT}" ]||_error "SimpleInit not found, please see README.md"
-[ -f "configs/${DEVICE}.conf" ]||_error "Device configuration not found"
+[ -z "${DEVICE}" ] && _help 1
+[ -f "configs/${DEVICE}.conf" ] || [ "${DEVICE}" == "all" ] || _error "Device configuration not found"
+
+#
+# Get machine architecture
+#
+MACHINE_TYPE=$(uname -m)
+
+# Fix-up possible differences in reported arch
+if [ ${MACHINE_TYPE} == 'arm64' ]; then
+    MACHINE_TYPE='aarch64'
+elif [ ${MACHINE_TYPE} == 'amd64' ]; then
+    MACHINE_TYPE='x86_64'
+fi
+
+if [ ${MACHINE_TYPE} != 'aarch64' ]; then
+    export CROSS_COMPILE="${CROSS_COMPILE:-aarch64-linux-gnu-}"
+fi
+
+GIT_COMMIT="$(git describe --tags --always)" || GIT_COMMIT="unknown"
 
-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-non-osi:${ROOTDIR}:${_SIMPLE_INIT}"
 export WORKSPACE="${OUTDIR}/workspace"
-GITCOMMIT="$(git describe --tags --always)"||GITCOMMIT="unknown"
-export GITCOMMIT
+[ -d "${WORKSPACE}" ] || mkdir "${WORKSPACE}"
+
+ROOTDIR="$(realpath "$(dirname "$0")")"
+cd "${ROOTDIR}" || exit 1
+
+# Exit on first error
 set -e
 
-mkdir -p "${_SIMPLE_INIT}/build" "${_SIMPLE_INIT}/root/usr/share/locale"
-for i in "${_SIMPLE_INIT}/po/"*.po
-do
-	[ -f "${i}" ]||continue
-	_name="$(basename "$i" .po)"
-	_path="${_SIMPLE_INIT}/root/usr/share/locale/${_name}/LC_MESSAGES"
-	mkdir -p "${_path}"
-	msgfmt -o "${_path}/simple-init.mo" "${i}"
-done
-
-if "${GEN_ROOTFS}"
-then
-	 bash "${_SIMPLE_INIT}/scripts/gen-rootfs-source.sh" \
-		"${_SIMPLE_INIT}" \
-		"${_SIMPLE_INIT}/build"
-fi
-
 if [ "${DEVICE}" == "all" ]
 then
-	E=0
-	for i in configs/*.conf
-	do
-		DEV="$(basename "$i" .conf)"
-		echo "Building ${DEV}"
-		_build "${DEV}"||E="$?"
-	done
-	exit "${E}"
+    for i in configs/*.conf; do
+        DEV="$(basename "$i" .conf)"
+        if [ "${DEV}" != "RK3588" ]
+        then
+            echo "Building ${DEV}"
+            _build "${DEV}"
+        fi
+    done
 else
-	_build "${DEVICE}"
+    _build "${DEVICE}"
 fi

configs/RK3588.conf

@@ -1,2 +1,3 @@
 MINIALL_INI=RK3588MINIALL.ini
 TRUST_INI=RK3588TRUST.ini
+TFA_PLAT=rk3588_reference_pmic

configs/aio-3588q.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/Firefly/AIO-3588Q/AIO-3588Q.dsc
+PLATFORM_NAME=AIO-3588Q
+SOC=RK3588

configs/blade3.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/Mixtile/Blade3/Blade3.dsc
+PLATFORM_NAME=Blade3
+SOC=RK3588

configs/edge2.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/Khadas/Edge2/Edge2.dsc
+PLATFORM_NAME=Edge2
+SOC=RK3588

configs/fydetab-duo.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/FydeInnovations/FydetabDuo/FydetabDuo.dsc
+PLATFORM_NAME=FydetabDuo
+SOC=RK3588

configs/h88k.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/Hinlink/H88K/H88K.dsc
+PLATFORM_NAME=H88K
+SOC=RK3588

configs/indiedroid-nova.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/Ameridroid/IndiedroidNova/IndiedroidNova.dsc
+PLATFORM_NAME=IndiedroidNova
+SOC=RK3588

configs/itx-3588j.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/Firefly/ITX-3588J/ITX-3588J.dsc
+PLATFORM_NAME=ITX-3588J
+SOC=RK3588

configs/nanopc-cm3588-nas.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/FriendlyElec/NanoPC-CM3588-NAS/NanoPC-CM3588-NAS.dsc
+PLATFORM_NAME=NanoPC-CM3588-NAS
+SOC=RK3588

configs/nanopc-t6.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/NanoPC-T6.dsc
+PLATFORM_NAME=NanoPC-T6
+SOC=RK3588

configs/nanopi-m6.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/FriendlyElec/NanoPi-M6/NanoPi-M6.dsc
+PLATFORM_NAME=NanoPi-M6
+SOC=RK3588

configs/nanopi-r6c.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/NanoPi-R6C.dsc
+PLATFORM_NAME=NanoPi-R6C
+SOC=RK3588

configs/nanopi-r6s.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/NanoPi-R6S.dsc
+PLATFORM_NAME=NanoPi-R6S
+SOC=RK3588

configs/orangepi-5.conf

@@ -1,3 +1,3 @@
-DSC_FILE=edk2-platforms/Platform/OrangePi/OrangePi5/OrangePi5.dsc
+DSC_FILE=edk2-rockchip/Platform/OrangePi/OrangePi5/OrangePi5.dsc
 PLATFORM_NAME=OrangePi5
 SOC=RK3588

configs/orangepi-5plus.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/OrangePi/OrangePi5Plus/OrangePi5Plus.dsc
+PLATFORM_NAME=OrangePi5Plus
+SOC=RK3588

configs/powerstation-6.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/BuzzTV/PowerStation6/PowerStation6.dsc
+PLATFORM_NAME=PowerStation6
+SOC=RK3588

configs/r58-mini.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/Mekotronics/R58-Mini/R58-Mini.dsc
+PLATFORM_NAME=R58-Mini
+SOC=RK3588

configs/r58x.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/Mekotronics/R58X/R58X.dsc
+PLATFORM_NAME=R58X
+SOC=RK3588

configs/rk3588-evb.conf

@@ -1,3 +0,0 @@
-DSC_FILE=edk2-platforms/Platform/Rockchip/RK3588/RK3588.dsc
-PLATFORM_NAME=RK3588
-SOC=RK3588

configs/roc-rk3588s-pc.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/ROC-RK3588S-PC.dsc
+PLATFORM_NAME=ROC-RK3588S-PC
+SOC=RK3588

configs/rock-5-itx.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/Radxa/ROCK5ITX/ROCK5ITX.dsc
+PLATFORM_NAME=ROCK5ITX
+SOC=RK3588

configs/rock-5a.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/Radxa/ROCK5A/ROCK5A.dsc
+PLATFORM_NAME=ROCK5A
+SOC=RK3588

configs/rock-5b.conf

@@ -1,3 +1,3 @@
-DSC_FILE=edk2-platforms/Platform/Radxa/ROCK5B/ROCK5B.dsc
+DSC_FILE=edk2-rockchip/Platform/Radxa/ROCK5B/ROCK5B.dsc
 PLATFORM_NAME=ROCK5B
 SOC=RK3588

configs/rock-5bplus.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/Radxa/ROCK5BPlus/ROCK5BPlus.dsc
+PLATFORM_NAME=ROCK5BPlus
+SOC=RK3588

configs/station-m3.conf

@@ -0,0 +1,3 @@
+DSC_FILE=edk2-rockchip/Platform/StationPC/StationM3/StationM3.dsc
+PLATFORM_NAME=StationM3
+SOC=RK3588

devicetree/mainline/README.md

@@ -0,0 +1,2 @@
+# Rockchip Mainline Device Trees
+New board files, small additions and fixes reusing existing bindings are accepted here, but only as a stopgap until they get merged upstream.

devicetree/mainline/rk3588-buzztv-p6.dts

@@ -0,0 +1,950 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2024, Mario Bălănică <mariobalanica02@gmail.com>
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/leds/common.h>
+#include <dt-bindings/soc/rockchip,vop2.h>
+#include <dt-bindings/usb/pd.h>
+#include "rk3588.dtsi"
+
+/ {
+	model = "BuzzTV P6";
+	compatible = "buzztv,p6", "rockchip,rk3588";
+
+	aliases {
+		ethernet0 = &gmac1;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
+	};
+
+	chosen {
+		stdout-path = "serial2:1500000n8";
+	};
+
+	hdmi0-con {
+		compatible = "hdmi-connector";
+		type = "a";
+
+		port {
+			hdmi0_con_in: endpoint {
+				remote-endpoint = <&hdmi0_out_con>;
+			};
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&led_pins>;
+
+		green_led: led-0 {
+			color = <LED_COLOR_ID_GREEN>;
+			gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_LOW>;
+			default-state = "on";
+		};
+
+		red_led: led-1 {
+			color = <LED_COLOR_ID_RED>;
+			gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	ir-receiver {
+		compatible = "gpio-ir-receiver";
+		gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&ir_receiver_pin>;
+	};
+
+	vcc12v_dcin: regulator-vcc12v-dcin {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc12v_dcin";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
+	vcc5v0_sys: regulator-vcc5v0-sys {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc12v_dcin>;
+	};
+
+	vcc5v0_usb: regulator-vcc5v0-usb {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_usb";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc12v_dcin>;
+	};
+
+	vcc5v0_host: regulator-vcc5v0-host {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_host";
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc5v0_host_en>;
+		vin-supply = <&vcc5v0_usb>;
+	};
+
+	vbus5v0_typec: regulator-vbus5v0-typec {
+		compatible = "regulator-fixed";
+		regulator-name = "vbus5v0_typec";
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&typec5v_pwren>;
+		vin-supply = <&vcc5v0_usb>;
+	};
+
+	vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_pcie30";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		enable-active-high;
+		gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pcie3_vcc3v3_en>;
+		startup-delay-us = <5000>;
+		vin-supply = <&vcc5v0_sys>;
+	};
+
+	vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_3v3_sd_s0";
+		regulator-boot-on;
+		regulator-max-microvolt = <3300000>;
+		regulator-min-microvolt = <3300000>;
+		enable-active-high;
+		gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&sd_s0_pwr>;
+		vin-supply = <&vcc_3v3_s3>;
+	};
+
+	vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_1v1_nldo_s3";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <1100000>;
+		regulator-max-microvolt = <1100000>;
+		vin-supply = <&vcc5v0_sys>;
+	};
+};
+
+&combphy1_ps {
+	status = "okay";
+};
+
+&cpu_b0 {
+	cpu-supply = <&vdd_cpu_big0_s0>;
+};
+
+&cpu_b1 {
+	cpu-supply = <&vdd_cpu_big0_s0>;
+};
+
+&cpu_b2 {
+	cpu-supply = <&vdd_cpu_big1_s0>;
+};
+
+&cpu_b3 {
+	cpu-supply = <&vdd_cpu_big1_s0>;
+};
+
+&cpu_l0 {
+	cpu-supply = <&vdd_cpu_lit_s0>;
+};
+
+&cpu_l1 {
+	cpu-supply = <&vdd_cpu_lit_s0>;
+};
+
+&cpu_l2 {
+	cpu-supply = <&vdd_cpu_lit_s0>;
+};
+
+&cpu_l3 {
+	cpu-supply = <&vdd_cpu_lit_s0>;
+};
+
+&gpu {
+	mali-supply = <&vdd_gpu_s0>;
+	status = "okay";
+};
+
+&hdmi0 {
+	status = "okay";
+};
+
+&hdmi0_in {
+	hdmi0_in_vp0: endpoint {
+		remote-endpoint = <&vp0_out_hdmi0>;
+	};
+};
+
+&hdmi0_out {
+	hdmi0_out_con: endpoint {
+		remote-endpoint = <&hdmi0_con_in>;
+	};
+};
+
+&hdptxphy_hdmi0 {
+	status = "okay";
+};
+
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0m2_xfer>;
+	status = "okay";
+
+	vdd_cpu_big0_s0: regulator@42 {
+		compatible = "rockchip,rk8602";
+		reg = <0x42>;
+		fcs,suspend-voltage-selector = <1>;
+		regulator-name = "vdd_cpu_big0_s0";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <550000>;
+		regulator-max-microvolt = <1050000>;
+		regulator-ramp-delay = <2300>;
+		vin-supply = <&vcc5v0_sys>;
+
+		regulator-state-mem {
+			regulator-off-in-suspend;
+		};
+	};
+
+	vdd_cpu_big1_s0: regulator@43 {
+		compatible = "rockchip,rk8603", "rockchip,rk8602";
+		reg = <0x43>;
+		fcs,suspend-voltage-selector = <1>;
+		regulator-name = "vdd_cpu_big1_s0";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <550000>;
+		regulator-max-microvolt = <1050000>;
+		regulator-ramp-delay = <2300>;
+		vin-supply = <&vcc5v0_sys>;
+
+		regulator-state-mem {
+			regulator-off-in-suspend;
+		};
+	};
+};
+
+&i2c1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c1m2_xfer>;
+	status = "okay";
+
+	vdd_npu_s0: regulator@42 {
+		compatible = "rockchip,rk8602";
+		reg = <0x42>;
+		fcs,suspend-voltage-selector = <1>;
+		regulator-name = "vdd_npu_s0";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <550000>;
+		regulator-max-microvolt = <950000>;
+		regulator-ramp-delay = <2300>;
+		vin-supply = <&vcc5v0_sys>;
+
+		regulator-state-mem {
+			regulator-off-in-suspend;
+		};
+	};
+};
+
+&i2c6 {
+	status = "okay";
+
+	fusb302: typec-portc@22 {
+		compatible = "fcs,fusb302";
+		reg = <0x22>;
+		interrupt-parent = <&gpio0>;
+		interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&usbc0_int>;
+		vbus-supply = <&vbus5v0_typec>;
+
+		usb_con: connector {
+			compatible = "usb-c-connector";
+			data-role = "dual";
+			label = "USB-C";
+			power-role = "source";
+			source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>;
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				port@0 {
+					reg = <0>;
+
+					usbc0_orien_sw: endpoint {
+						remote-endpoint = <&usbdp_phy0_orientation_switch>;
+					};
+				};
+
+				port@1 {
+					reg = <1>;
+
+					usbc0_role_sw: endpoint {
+						remote-endpoint = <&dwc3_0_role_switch>;
+					};
+				};
+
+				port@2 {
+					reg = <2>;
+
+					dp_altmode_mux: endpoint {
+						remote-endpoint = <&usbdp_phy0_dp_altmode_mux>;
+					};
+				};
+			};
+		};
+	};
+
+	hym8563: rtc@51 {
+		compatible = "haoyu,hym8563";
+		reg = <0x51>;
+		#clock-cells = <0>;
+		clock-output-names = "hym8563";
+		pinctrl-names = "default";
+		pinctrl-0 = <&hym8563_int>;
+		interrupt-parent = <&gpio0>;
+		interrupts = <RK_PB0 IRQ_TYPE_LEVEL_LOW>;
+		wakeup-source;
+	};
+};
+
+/* RTL8852BE */
+&pcie2x1l0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie2_0_rst>;
+	reset-gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+};
+
+&pcie30phy {
+	/*
+	 * pcie3x4 is limited to 3x2 and requires x2 x2 PHY bifurcation to work.
+	 * pcie3x2, however, is unused and needs to remain disabled.
+	 */
+	data-lanes = <1 1 2 2>;
+	status = "okay";
+};
+
+/* M.2 M key */
+&pcie3x4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie3_rst>;
+	reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
+	vpcie3v3-supply = <&vcc3v3_pcie30>;
+	status = "okay";
+};
+
+&gmac1 {
+	clock_in_out = "output";
+	phy-handle = <&rgmii_phy1>;
+	phy-mode = "rgmii";
+	pinctrl-names = "default";
+	pinctrl-0 = <&gmac1_miim
+		     &gmac1_tx_bus2
+		     &gmac1_rx_bus2
+		     &gmac1_rgmii_clk
+		     &gmac1_rgmii_bus>;
+	rx_delay = <0x00>;
+	tx_delay = <0x43>;
+	status = "okay";
+};
+
+&mdio1 {
+	/* RTL8211F */
+	rgmii_phy1: ethernet-phy@1 {
+		compatible = "ethernet-phy-id001c.c916";
+		reg = <0x1>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&rtl8211f_rst>;
+		reset-assert-us = <20000>;
+		reset-deassert-us = <100000>;
+		reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
+	};
+};
+
+&pinctrl {
+	hym8563 {
+		hym8563_int: hym8563-int {
+			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	leds {
+		led_pins: led-pins {
+			rockchip,pins = <3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>,
+					<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	ir-receiver {
+		ir_receiver_pin: ir-receiver-pin {
+			rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	pcie2 {
+		pcie2_0_rst: pcie2-0-rst {
+			rockchip,pins = <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	pcie3 {
+		pcie3_rst: pcie3-rst {
+			rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		pcie3_vcc3v3_en: pcie3-vcc3v3-en {
+			rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	rtl8211f {
+		rtl8211f_rst: rtl8211f-rst {
+			rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	usb {
+		vcc5v0_host_en: vcc5v0-host-en {
+			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	usb-typec {
+		usbc0_int: usbc0-int {
+			rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		typec5v_pwren: typec5v-pwren {
+			rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	sdmmc {
+		sd_s0_pwr: sd-s0-pwr {
+			rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	bluetooth {
+		bt_reset: bt-reset {
+			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		bt_host_wake: bt-host-wake {
+			rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		bt_dev_wake: bt-dev-wake {
+			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
+&saradc {
+	vref-supply = <&avcc_1v8_s0>;
+	status = "okay";
+};
+
+&sdhci {
+	bus-width = <8>;
+	no-sdio;
+	no-sd;
+	non-removable;
+	mmc-hs400-1_8v;
+	mmc-hs400-enhanced-strobe;
+	status = "okay";
+};
+
+&sdmmc {
+	max-frequency = <200000000>;
+	no-sdio;
+	no-mmc;
+	bus-width = <4>;
+	cap-mmc-highspeed;
+	cap-sd-highspeed;
+	cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
+	disable-wp;
+	sd-uhs-sdr104;
+	vmmc-supply = <&vcc_3v3_sd_s0>;
+	vqmmc-supply = <&vccio_sd_s0>;
+	status = "okay";
+};
+
+&spi2 {
+	status = "okay";
+	assigned-clocks = <&cru CLK_SPI2>;
+	assigned-clock-rates = <200000000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>;
+	num-cs = <1>;
+
+	pmic@0 {
+		compatible = "rockchip,rk806";
+		spi-max-frequency = <1000000>;
+		reg = <0x0>;
+
+		interrupt-parent = <&gpio0>;
+		interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
+			    <&rk806_dvs2_null>, <&rk806_dvs3_null>;
+
+		system-power-controller;
+
+		vcc1-supply = <&vcc5v0_sys>;
+		vcc2-supply = <&vcc5v0_sys>;
+		vcc3-supply = <&vcc5v0_sys>;
+		vcc4-supply = <&vcc5v0_sys>;
+		vcc5-supply = <&vcc5v0_sys>;
+		vcc6-supply = <&vcc5v0_sys>;
+		vcc7-supply = <&vcc5v0_sys>;
+		vcc8-supply = <&vcc5v0_sys>;
+		vcc9-supply = <&vcc5v0_sys>;
+		vcc10-supply = <&vcc5v0_sys>;
+		vcc11-supply = <&vcc_2v0_pldo_s3>;
+		vcc12-supply = <&vcc5v0_sys>;
+		vcc13-supply = <&vcc_1v1_nldo_s3>;
+		vcc14-supply = <&vcc_1v1_nldo_s3>;
+		vcca-supply = <&vcc5v0_sys>;
+
+		gpio-controller;
+		#gpio-cells = <2>;
+
+		rk806_dvs1_null: dvs1-null-pins {
+			pins = "gpio_pwrctrl1";
+			function = "pin_fun0";
+		};
+
+		rk806_dvs2_null: dvs2-null-pins {
+			pins = "gpio_pwrctrl2";
+			function = "pin_fun0";
+		};
+
+		rk806_dvs3_null: dvs3-null-pins {
+			pins = "gpio_pwrctrl3";
+			function = "pin_fun0";
+		};
+
+		regulators {
+			vdd_gpu_s0: vdd_gpu_mem_s0: dcdc-reg1 {
+				regulator-boot-on;
+				regulator-min-microvolt = <550000>;
+				regulator-max-microvolt = <950000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vdd_gpu_s0";
+				regulator-enable-ramp-delay = <400>;
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_cpu_lit_s0: vdd_cpu_lit_mem_s0: dcdc-reg2 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <550000>;
+				regulator-max-microvolt = <950000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vdd_cpu_lit_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_log_s0: dcdc-reg3 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <675000>;
+				regulator-max-microvolt = <750000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vdd_log_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+					regulator-suspend-microvolt = <750000>;
+				};
+			};
+
+			vdd_vdenc_s0: vdd_vdenc_mem_s0: dcdc-reg4 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <550000>;
+				regulator-max-microvolt = <950000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vdd_vdenc_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_ddr_s0: dcdc-reg5 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <675000>;
+				regulator-max-microvolt = <900000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vdd_ddr_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+					regulator-suspend-microvolt = <850000>;
+				};
+			};
+
+			vdd2_ddr_s3: dcdc-reg6 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-name = "vdd2_ddr_s3";
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+				};
+			};
+
+			vcc_2v0_pldo_s3: dcdc-reg7 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <2000000>;
+				regulator-max-microvolt = <2000000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vdd_2v0_pldo_s3";
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <2000000>;
+				};
+			};
+
+			vcc_3v3_s3: dcdc-reg8 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-name = "vcc_3v3_s3";
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <3300000>;
+				};
+			};
+
+			vddq_ddr_s0: dcdc-reg9 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-name = "vddq_ddr_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc_1v8_s3: dcdc-reg10 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc_1v8_s3";
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			avcc_1v8_s0: pldo-reg1 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "avcc_1v8_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc_1v8_s0: pldo-reg2 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc_1v8_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			avdd_1v2_s0: pldo-reg3 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <1200000>;
+				regulator-name = "avdd_1v2_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vcc_3v3_s0: pldo-reg4 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vcc_3v3_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vccio_sd_s0: pldo-reg5 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-ramp-delay = <12500>;
+				regulator-name = "vccio_sd_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			pldo6_s3: pldo-reg6 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "pldo6_s3";
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <1800000>;
+				};
+			};
+
+			vdd_0v75_s3: nldo-reg1 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <750000>;
+				regulator-max-microvolt = <750000>;
+				regulator-name = "vdd_0v75_s3";
+
+				regulator-state-mem {
+					regulator-on-in-suspend;
+					regulator-suspend-microvolt = <750000>;
+				};
+			};
+
+			vdd_ddr_pll_s0: nldo-reg2 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <850000>;
+				regulator-max-microvolt = <850000>;
+				regulator-name = "vdd_ddr_pll_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+					regulator-suspend-microvolt = <850000>;
+				};
+			};
+
+			avdd_0v75_s0: nldo-reg3 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <750000>;
+				regulator-max-microvolt = <750000>;
+				regulator-name = "avdd_0v75_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_0v85_s0: nldo-reg4 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <850000>;
+				regulator-max-microvolt = <850000>;
+				regulator-name = "vdd_0v85_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+
+			vdd_0v75_s0: nldo-reg5 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <750000>;
+				regulator-max-microvolt = <750000>;
+				regulator-name = "vdd_0v75_s0";
+
+				regulator-state-mem {
+					regulator-off-in-suspend;
+				};
+			};
+		};
+	};
+};
+
+&tsadc {
+	status = "okay";
+};
+
+&uart2 {
+	pinctrl-0 = <&uart2m0_xfer>;
+	status = "okay";
+};
+
+&uart9 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart9m0_xfer>, <&uart9m0_rtsn>, <&uart9m0_ctsn>;
+	uart-has-rtscts;
+	status = "okay";
+
+	bluetooth {
+		compatible = "realtek,rtl8852bs-bt", "realtek,rtl8822cs-bt";
+		enable-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
+		host-wake-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
+		device-wake-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&bt_reset>, <&bt_host_wake>, <&bt_dev_wake>;
+	};
+};
+
+&u2phy0 {
+	status = "okay";
+};
+
+&u2phy0_otg {
+	status = "okay";
+};
+
+&u2phy1 {
+	status = "okay";
+};
+
+&u2phy1_otg {
+	phy-supply = <&vcc5v0_host>;
+	status = "okay";
+};
+
+&u2phy2 {
+	status = "okay";
+};
+
+&u2phy2_host {
+	phy-supply = <&vcc5v0_host>;
+	status = "okay";
+};
+
+&usbdp_phy0 {
+	mode-switch;
+	orientation-switch;
+	sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
+	sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		usbdp_phy0_orientation_switch: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&usbc0_orien_sw>;
+		};
+
+		usbdp_phy0_dp_altmode_mux: endpoint@1 {
+			reg = <1>;
+			remote-endpoint = <&dp_altmode_mux>;
+		};
+	};
+};
+
+&usbdp_phy1 {
+	phy-supply = <&vcc5v0_host>;
+	status = "okay";
+};
+
+/* Front USB Type-C port */
+&usb_host0_xhci {
+	usb-role-switch;
+	status = "okay";
+
+	port {
+		dwc3_0_role_switch: endpoint {
+			remote-endpoint = <&usbc0_role_sw>;
+		};
+	};
+};
+
+/* Front USB 2.0 port */
+&usb_host0_ehci {
+	status = "okay";
+};
+
+&usb_host0_ohci {
+	status = "okay";
+};
+
+/* Front USB 3.0 port */
+&usb_host1_xhci {
+	dr_mode = "host";
+	status = "okay";
+};
+
+&vop_mmu {
+	status = "okay";
+};
+
+&vop {
+	status = "okay";
+};
+
+&vp0 {
+	vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
+		reg = <ROCKCHIP_VOP2_EP_HDMI0>;
+		remote-endpoint = <&hdmi0_in_vp0>;
+	};
+};

devicetree/mainline/rk3588-rock-5-itx-fixup.dts

@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#include "rk3588-rock-5-itx.dts"
+
+/ {
+	/delete-node/ pcie-oscillator;
+};
+
+/*
+ * Remove the "pcie30_refclk" gated-fixed-clock to maintain compatibility
+ * with kernels older than v6.13-rc1. It is backed by a GPIO regulator
+ * anyway, so simply referencing it in vpcie3v3-supply also addresses
+ * the potential issue where pcie3x2 might probe earlier than pcie3x4 and
+ * hang on DBI access because the clock didn't have a chance to be enabled.
+ */
+&pcie3x2 {
+	clocks = <&cru ACLK_PCIE_2L_MSTR>, <&cru ACLK_PCIE_2L_SLV>,
+		 <&cru ACLK_PCIE_2L_DBI>, <&cru PCLK_PCIE_2L>,
+		 <&cru CLK_PCIE_AUX1>, <&cru CLK_PCIE2L_PIPE>;
+	clock-names = "aclk_mst", "aclk_slv",
+		      "aclk_dbi", "pclk",
+		      "aux", "pipe";
+	vpcie3v3-supply = <&vcc3v3_pi6c_05>;
+};
+
+&pcie3x4 {
+	clocks = <&cru ACLK_PCIE_4L_MSTR>, <&cru ACLK_PCIE_4L_SLV>,
+		 <&cru ACLK_PCIE_4L_DBI>, <&cru PCLK_PCIE_4L>,
+		 <&cru CLK_PCIE_AUX0>, <&cru CLK_PCIE4L_PIPE>;
+	clock-names = "aclk_mst", "aclk_slv",
+		      "aclk_dbi", "pclk",
+		      "aux", "pipe";
+};

devicetree/mainline/rk3588s-khadas-edge2-fixup.dts

@@ -0,0 +1,271 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#include <dt-bindings/soc/rockchip,vop2.h>
+#include <dt-bindings/usb/pd.h>
+#include "rk3588s-khadas-edge2.dts"
+
+/ {
+	analog-sound {
+		compatible = "audio-graph-card";
+		label = "rk3588-es8316";
+
+		widgets = "Microphone", "Mic Jack",
+			  "Headphone", "Headphones";
+
+		routing = "MIC2", "Mic Jack",
+			  "Headphones", "HPOL",
+			  "Headphones", "HPOR";
+
+		dais = <&i2s0_8ch_p0>;
+		hp-det-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&hp_detect>;
+	};
+
+	hdmi0-con {
+		compatible = "hdmi-connector";
+		type = "a";
+
+		port {
+			hdmi0_con_in: endpoint {
+				remote-endpoint = <&hdmi0_out_con>;
+			};
+		};
+	};
+
+	vbus5v0_typec: regulator-vbus5v0-typec {
+		compatible = "regulator-fixed";
+		regulator-name = "vbus5v0_typec";
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		gpio = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&typec5v_pwren>;
+		vin-supply = <&vcc5v0_sys>;
+	};
+};
+
+&i2c2 {
+	fusb302: typec-portc@22 {
+		compatible = "fcs,fusb302";
+		reg = <0x22>;
+		interrupt-parent = <&gpio1>;
+		interrupts = <RK_PB5 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&usbc0_int>;
+		vbus-supply = <&vbus5v0_typec>;
+
+		usb_con: connector {
+			compatible = "usb-c-connector";
+			data-role = "dual";
+			label = "USB-C";
+			power-role = "dual";
+			try-power-role = "source";
+			op-sink-microwatt = <1000000>;
+			sink-pdos =
+				<PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)
+				 PDO_FIXED(9000, 3000, PDO_FIXED_USB_COMM)
+				 PDO_FIXED(12000, 3000, PDO_FIXED_USB_COMM)>;
+			source-pdos =
+				<PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				port@0 {
+					reg = <0>;
+
+					usbc0_orien_sw: endpoint {
+						remote-endpoint = <&usbdp_phy0_orientation_switch>;
+					};
+				};
+
+				port@1 {
+					reg = <1>;
+
+					usbc0_role_sw: endpoint {
+						remote-endpoint = <&dwc3_0_role_switch>;
+					};
+				};
+
+				port@2 {
+					reg = <2>;
+
+					dp_altmode_mux: endpoint {
+						remote-endpoint = <&usbdp_phy0_dp_altmode_mux>;
+					};
+				};
+			};
+		};
+	};
+};
+
+&i2c3 {
+	status = "okay";
+
+	es8316: audio-codec@10 {
+		compatible = "everest,es8316";
+		reg = <0x10>;
+		clocks = <&cru I2S0_8CH_MCLKOUT>;
+		clock-names = "mclk";
+		assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
+		assigned-clock-rates = <12288000>;
+		#sound-dai-cells = <0>;
+
+		port {
+			es8316_p0_0: endpoint {
+				remote-endpoint = <&i2s0_8ch_p0_0>;
+			};
+		};
+	};
+};
+
+&i2s0_8ch {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2s0_lrck
+		     &i2s0_mclk
+		     &i2s0_sclk
+		     &i2s0_sdi0
+		     &i2s0_sdo0>;
+	status = "okay";
+
+	i2s0_8ch_p0: port {
+		i2s0_8ch_p0_0: endpoint {
+			dai-format = "i2s";
+			mclk-fs = <256>;
+			remote-endpoint = <&es8316_p0_0>;
+		};
+	};
+};
+
+&pinctrl {
+	usb-typec {
+		usbc0_int: usbc0-int {
+			rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		typec5v_pwren: typec5v-pwren {
+			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	sound {
+		hp_detect: hp-detect {
+			rockchip,pins = <1 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	bluetooth {
+		bt_reset: bt-reset {
+			rockchip,pins = <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		bt_dev_wake: bt-dev-wake {
+			rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		bt_host_wake: bt-host-wake {
+			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+	};
+};
+
+&uart9 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart9m2_xfer>, <&uart9m2_rtsn>, <&uart9m2_ctsn>;
+	uart-has-rtscts;
+
+	bluetooth {
+		compatible = "brcm,bcm43752-bt", "cypress,cyw4373a0-bt";
+		max-speed = <4000000>;
+		clocks = <&hym8563>;
+		clock-names = "lpo";
+		shutdown-gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
+		device-wakeup-gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>;
+		interrupt-parent = <&gpio0>;
+		interrupts = <RK_PD5 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "host-wakeup";
+		pinctrl-names = "default";
+		pinctrl-0 = <&bt_reset>, <&bt_dev_wake>, <&bt_host_wake>;
+	};
+};
+
+&u2phy0 {
+	status = "okay";
+};
+
+&u2phy0_otg {
+	status = "okay";
+};
+
+&usbdp_phy0 {
+	mode-switch;
+	orientation-switch;
+	sbu1-dc-gpios = <&gpio4 RK_PA0 GPIO_ACTIVE_HIGH>;
+	sbu2-dc-gpios = <&gpio4 RK_PA1 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		usbdp_phy0_orientation_switch: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&usbc0_orien_sw>;
+		};
+
+		usbdp_phy0_dp_altmode_mux: endpoint@1 {
+			reg = <1>;
+			remote-endpoint = <&dp_altmode_mux>;
+		};
+	};
+};
+
+&usb_host0_xhci {
+	usb-role-switch;
+	status = "okay";
+
+	port {
+		dwc3_0_role_switch: endpoint {
+			remote-endpoint = <&usbc0_role_sw>;
+		};
+	};
+};
+
+&hdmi0 {
+	status = "okay";
+};
+
+&hdmi0_in {
+	hdmi0_in_vp0: endpoint {
+		remote-endpoint = <&vp0_out_hdmi0>;
+	};
+};
+
+&hdmi0_out {
+	hdmi0_out_con: endpoint {
+		remote-endpoint = <&hdmi0_con_in>;
+	};
+};
+
+&hdptxphy_hdmi0 {
+	status = "okay";
+};
+
+&vop_mmu {
+	status = "okay";
+};
+
+&vop {
+	status = "okay";
+};
+
+&vp0 {
+	vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
+		reg = <ROCKCHIP_VOP2_EP_HDMI0>;
+		remote-endpoint = <&hdmi0_in_vp0>;
+	};
+};

devicetree/vendor/README.md

@@ -0,0 +1,20 @@
+# Rockchip Vendor BSP Device Trees
+## Sources
+* <https://github.com/armbian/linux-rockchip/tree/f3fb30ac9de06b41fb621d17bc53603f1f48ac90/arch/arm64/boot/dts/rockchip>
+  * Updated to `rk-6.1-rkr1` branch, currently called `vendor` branch in armbian/build
+
+* roc-rk3588s-pc: <https://gitlab.com/firefly-linux/kernel/-/tree/b8646da2122f45a2c02082d949427b80d2e89b1f/arch/arm64/boot/dts/rockchip>
+
+* itx-3588j: <https://gitlab.com/firefly-linux/kernel/-/tree/e14c28295dd7ee8f807899e9b0b7da5f79742e4f/arch/arm64/boot/dts/rockchip>
+  (note: in the dtb given here, the builtin bootargs in the source above were commented out
+   before building. Not sure if that was a necessary step - SS)
+
+* rk3588-firefly-aio-3588q: <https://gitlab.com/firefly-linux/kernel/-/tree/fa0e053fd911339b825407cb6d4b167fad7cdc49/arch/arm64/boot/dts/rockchip>
+
+* rk3588-rock-5b-plus: <https://github.com/radxa/kernel/blob/3b95df6d8bf567857b69e5266f1cb0651a6cfb3e/arch/arm64/boot/dts/rockchip/>
+
+* rk3588s-fydetab-duo: <https://github.com/Linux-for-Fydetab-Duo/linux-rockchip/tree/14294048d2a0deb7f38c890329aded87038d3299/arch/arm64/boot/dts/rockchip>
+  (note: dtb taken from the `noble` branch which is based on the rockchip 6.1 rkr3 bsp kernel)
+
+## License
+SPDX-License-Identifier: GPL-2.0-only

edk2-non-osi/Drivers/ASpeed/ASpeedGopBinPkg/ASpeedAst2500GopDxe.inf

@@ -1,23 +0,0 @@
-## @file
-#  Component description file for ASPEED Graphics Controller Driver.
-#
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-#  Copyright (c) 2020, ASPEED Technology Inc. All rights reserved.<BR>
-#  Copyright (c) 2021, American Megatrends International LLC.<BR>
-#
-#  SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-##
-
-[Defines]
-  INF_VERSION                    = 0x0001001B
-  BASE_NAME                      = ASpeedAst2500GopDxe
-  FILE_GUID                      = 7F81D838-F91D-4C44-8552-8FB912122FDD
-  MODULE_TYPE                    = UEFI_DRIVER
-  VERSION_STRING                 = 1.1
-
-[Binaries.AArch64]
-  PE32|AArch64/ASpeedAst2500Gop.efi|*
-
-[Binaries.X64]
-  PE32|X64/ASpeedAst2500Gop.efi|*

edk2-non-osi/Drivers/ASpeed/License.txt

@@ -1,25 +0,0 @@
-Copyright (c) 2020, ASPEED Technology Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.

edk2-non-osi/Drivers/Realtek/Bus/Usb/UsbNetworking/RtkUsbUndiDxe.inf

@@ -1,24 +0,0 @@
-#/** @file
-#
-#    Copyright (c) 2020 Realtek Semiconductor Corp. All rights reserved.
-#
-#    This program and the accompanying materials
-#    are licensed and made available under the terms and conditions of the BSD License
-#    which accompanies this distribution. The full text of the license may be found at
-#    http://opensource.org/licenses/bsd-license.php
-#
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#**/
-
-
-[Defines]
-  INF_VERSION                    = 1.27
-  BASE_NAME                      = RtkUsbUndiDxe
-  FILE_GUID                      = 2EB8953E-C191-4A5E-B2AC-705EFB14A613
-  MODULE_TYPE                    = UEFI_DRIVER
-  VERSION_STRING                 = 1.0
-
-[Binaries.AARCH64]
-  PE32|AArch64/RtkUsbUndiDxe.efi|*

edk2-non-osi/Drivers/Realtek/License.txt

@@ -1,25 +0,0 @@
-Copyright (c) 2020 Realtek Semiconductor Corp. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.

edk2-non-osi/Emulator/X86EmulatorDxe/LICENSE

@@ -1,504 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-(This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.)
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    {description}
-    Copyright (C) {year} {fullname}
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-    USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random
-  Hacker.
-
-  {signature of Ty Coon}, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!

edk2-non-osi/Emulator/X86EmulatorDxe/README.md

@@ -1,7 +0,0 @@
-Binary build of the QEMU based x86 PE/COFF emulator for AARCH64
-
-Repo:   http://github.com/ardbiesheuvel/X86EmulatorPkg.git
-Commit: 5f4deb30eb935f9004b93d97712cc3ac3ae1ca97
-
-Repo:   http://github.com/tiancore/edk2.git
-Commit: 2e21e8c4b89656897797019a9c56bc5ccbf12df1

edk2-non-osi/Emulator/X86EmulatorDxe/X86EmulatorDxe.inf

@@ -1,21 +0,0 @@
-#/** @file
-#
-#  Copyright (c) 2017 - 2019, Linaro Limited. All rights reserved.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#**/
-
-[Defines]
-  INF_VERSION                    = 1.27
-  BASE_NAME                      = X86EmulatorDxe
-  FILE_GUID                      = E6727A5E-CBCD-44C8-B37F-78BC3A0C16C8
-  MODULE_TYPE                    = UEFI_DRIVER
-  VERSION_STRING                 = 1.0
-
-[Binaries.common.AARCH64]
-  PE32|X86EmulatorDxe.efi|*
-  DXE_DEPEX|X86EmulatorDxe.depex|*

edk2-non-osi/Maintainers.txt

@@ -1,88 +0,0 @@
-EDK II Maintainers
-==================
-
-This file provides information about the primary maintainers for
-EDK II.
-
-In general, you should not privately email the maintainer. You should
-email the edk2-devel list, but you can also Cc the maintainer.
-
-Descriptions of section entries:
-
-  L: Mailing list that is relevant to this area (default is edk2-devel)
-     Patches and questions should be sent to the email list.
-  M: Cc address for patches and questions (ie, the package maintainer)
-  W: Web-page with status/info
-  T: SCM tree type and location.  Type is one of: git, svn.
-  S: Status, one of the following:
-     Supported:  Someone is actually paid to look after this.
-     Maintained: Someone actually looks after it.
-     Odd Fixes:  It has a maintainer but they don't have time to do
-                 much other than throw the odd patch in. See below.
-     Orphan:     No current maintainer [but maybe you could take the
-                 role as you write your new code].
-     Obsolete:   Old code. Something tagged obsolete generally means
-                 it has been replaced by a better system and you
-                 should be using that.
-
-EDK II
-------
-W: http://www.tianocore.org/edk2/
-L: https://lists.sourceforge.net/lists/listinfo/edk2-devel
-T: git - https://github.com/tianocore/edk2-non-osi.git
-T: git - https://bitbucket.org/tianocore/edk2-non-osi.git
-T: git - http://git.code.sf.net/p/tianocore/edk2-non-osi
-T: svn - https://svn.code.sf.net/p/edk2/code/trunk/edk2-non-osi
-
-Responsible Disclosure, Reporting Security Issues
--------------------------------------------------
-W: https://github.com/tianocore/tianocore.github.io/wiki/Security
-
-EDK II Packages:
-----------------
-
-Platform/Intel/KabylakeOpenBoardBinPkg
-M: Chasel Chiu <chasel.chiu@intel.com>
-M: Nate DeSimone <nathaniel.l.desimone@intel.com>
-
-Platform/Intel/WhitleyOpenBoardBinPkg
-M: Isaac Oram <isaac.w.oram@intel.com>
-M: Nate DeSimone <nathaniel.l.desimone@intel.com>
-M: Chasel Chiu <chasel.chiu@intel.com>
-
-Platform/Intel/CoffeelakeSiliconBinPkg
-M: Chasel Chiu <chasel.chiu@intel.com>
-M: Sai Chaganty <rangasai.v.chaganty@intel.com>
-
-Platform/Intel/CometlakeSiliconBinPkg
-M: Kathappan Esakkithevar <kathappan.esakkithevar@intel.com>
-M: Sai Chaganty <rangasai.v.chaganty@intel.com>
-
-Silicon/Intel/ElkhartlakeSiliconBinPkg
-M: Nate DeSimone <nathaniel.l.desimone@intel.com>
-M: Sai Chaganty <rangasai.v.chaganty@intel.com>
-M: Jin Jhu Lim <jin.jhu.lim@intel.com>
-
-Silicon/Intel/KabylakeSiliconBinPkg
-M: Chasel Chiu <chasel.chiu@intel.com>
-M: Sai Chaganty <rangasai.v.chaganty@intel.com>
-
-Silicon/Intel/PurleySiliconBinPkg
-M: Nate DeSimone <nathaniel.l.desimone@intel.com>
-M: Isaac W Oram <isaac.w.oram@intel.com>
-
-Silicon/Intel/WhitleySiliconBinPkg
-M: Nate DeSimone <nathaniel.l.desimone@intel.com>
-M: Isaac W Oram <isaac.w.oram@intel.com>
-
-Silicon/Intel/QuarkSocBinPkg
-M: Michael D Kinney <michael.d.kinney@intel.com>
-M: Kelly Steele <kelly.steele@intel.com>
-
-Silicon/Intel/Vlv2SocBinPkg
-M: Zailiang Sun <zailiang.sun@intel.com>
-M: Yi Qian <yi.qian@intel.com>
-
-Silicon/Intel/TigerlakeSiliconBinPkg
-M: Sai Chaganty <rangasai.v.chaganty@intel.com>
-M: Nate DeSimone <nathaniel.l.desimone@intel.com>

edk2-non-osi/Platform/AMD/License.txt

@@ -1,25 +0,0 @@
-Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.

edk2-non-osi/Platform/ARM/Juno/License.txt

@@ -1,361 +0,0 @@
-From http://community.arm.com/docs/DOC-8402, dated 4 Jul 2014.
-
-Juno Software EULA
-
-THIS END USER LICENCE AGREEMENT ("LICENCE") IS A LEGAL AGREEMENT BETWEEN YOU
-(EITHER A SINGLE INDIVIDUAL, OR SINGLE LEGAL ENTITY) AND ARM LIMITED ("ARM") FOR
-THE USE OF THE DELIVERABLES ACCOMPANYING THIS LICENCE. ARM IS ONLY WILLING TO
-LICENSE THE DELIVERABLES TO YOU ON CONDITION THAT YOU ACCEPT ALL OF THE TERMS IN
-THIS LICENCE. BY CLICKING "I AGREE" OR BY INSTALLING OR OTHERWISE USING OR
-COPYING THE DELIVERABLES YOU INDICATE THAT YOU AGREE TO BE BOUND BY ALL THE
-TERMS OF THIS LICENCE. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENCE, ARM IS
-UNWILLING TO LICENSE THE DELIVERABLES TO YOU AND YOU MAY NOT INSTALL, USE OR
-COPY THE DELIVERABLES, BUT YOU SHOULD PROMPTLY RETURN THE DELIVERABLES TO YOUR
-SUPPLIER AND ASK FOR A REFUND OF ANY LICENCE FEE PAID.
-
-"Juno ARM Development Platform" means a hardware development board purchased
-directly from ARM or its authorised distributors.
-
-"Deliverables" means any software, firmware, boardfiles, data and documentation
-accompanying this Licence, any printed, electronic or online documentation
-supplied with it, and any updates, patches and modifications ARM may make
-available to you under the terms of this Licence, in all cases relating to the
-supporting deliverables for the Juno ARM Development Platform
-
-"Separate Files" means the separate files identified in Part D of the Schedule.
-
-1.  LICENCE GRANTS.
-
-(i)  DELIVERABLES: ARM hereby grants to you, subject to the terms and conditions
-of this Licence, a non-exclusive, non-transferable licence solely for use on a
-Juno ARM Development Platform and only for the purposes of your internal
-development, testing and debugging of software applications that are designed to
-run solely on microprocessors manufactured under licence from ARM, to:
-
-(a) use and copy the Deliverables identified in Part A of the Schedule;
-
-(b) use, copy and modify the Deliverables identified in Part B and Part C of the
-Schedule;
-
-(c) distribute and sub-license to third parties the right to use, copy and
-modify the Deliverables identified in Part C(i) of the Schedule, or your
-derivatives thereof, as part of your own products ("Licensed Products")
-provided you comply with the terms of Clause 1(ii);
-
-(d) permit either or both your customers and your authorised distributors to
-redistribute the Deliverables identified in Part C(i) of the Schedule, or your
-derivatives thereof, solely as part of Licensed Products developed by you or
-your permitted users (identified in clause 2 paragraph three below).
-
-Except as permitted by clause 1(i)(b) above, you shall not modify the
-Deliverables.  Except as permitted by clauses 1(i)(c) and 1(i)(d) above, you
-shall not redistribute any of the Deliverables.
-
-(ii)  FURTHER CONDITIONS APPLICABLE TO REDISTRIBUTION AND SUB-LICENSING: If you
-choose to redistribute the Deliverables identified in Part C(i) of the Schedule
-("Example Code") you agree: (a) to ensure that they are licensed for use only as
-part of Licensed Products and only on microprocessors manufactured or simulated
-under licence from ARM; (b) not to use ARM’s or any of its licensors names,
-logos or trademarks to market the Licensed Products; (c) to include valid
-copyright notices on the Licensed Products, and preserve any copyright notices
-which are included with, or in, the Example Code; (d) to comply with all the
-other terms of this Licence; and (e) to ensure that any further redistribution
-is limited to redistribution by either or both your customers and your
-authorised distributors only as part of Licensed Products developed by you or
-your permitted users and only for use on microprocessors manufactured or
-simulated under licence from ARM and  that your customers  and authorised
-distributors comply with the terms of this clause 1(ii).
-
-2.  RESTRICTIONS ON USE OF THE DELIVERABLES.
-
-COPYING: You shall not use or copy the Deliverables except as expressly
-authorised in this Licence. You may make one additional copy of the delivered
-Deliverables media or image for backup or archival purposes.
-
-PERMITTED USERS: The Deliverables shall be used only by your employees, or by
-your bona fide sub-contractors for whose acts and omissions you hereby agree to
-be responsible to ARM to the same extent as you are for any acts and omissions
-of your employees, and provided always that such sub-contractors; (i) work only
-onsite at your premises; (ii) comply with the terms of this Licence; (iii) are
-contractually obligated to use the Deliverables only for your benefit, and (iv)
-agree to assign all their work product and any rights they create therein in
-the supply of such work to you. Only the single individual, company or other
-legal entity to whom ARM is supplying this Licence may use the Deliverables.
-Except as provided in this clause, you shall not allow third parties (including
-but not limited to any subsidiary, parent or affiliated companies, or offsite
-contractors you may have) to use the Deliverables unless ARM specifically agrees
-otherwise with you on a case by case basis.
-
-NO REMOTE USE: The Deliverables shall only be used onsite at your premises and
-only for your benefit.
-
-MULTIPLE VERSIONS: The media on which the Deliverables resides may contain more
-than one version of the Deliverables, each of which is compatible with a
-different operating system (such as Microsoft Windows XP Professional and Red
-Hat Linux).
-
-ACADEMIC OR EDUCATIONAL USERS ONLY: If you or your employer or institution paid
-academic or educational pricing for the Deliverables, or the Deliverables are
-identified as an academic or educational version (together "Academic Software"),
-then notwithstanding anything else in this Licence, YOU AGREE TO USE THE
-ACADEMIC SOFTWARE ONLY FOR ACADEMIC, NON-COMMERCIAL PURPOSES, AND ARM DOES NOT
-GRANT YOU ANY RIGHTS TO DISTRIBUTE OR SUB-LICENSE ANY APPLICATIONS DEVELOPED
-USING THE ACADEMIC SOFTWARE UNDER THIS LICENCE.
-
-REVERSE ENGINEERING: Except to the extent that such activity is permitted by
-applicable law you shall not reverse engineer, decompile or disassemble any of
-the Deliverables. If the Deliverables were provided to you in Europe you shall
-not reverse engineer, decompile or disassemble any of the Deliverables for the
-purposes of error correction.
-
-BENCHMARKING: This licence does not prevent you from using the Deliverables for
-internal benchmarking purposes. However, you shall treat any and all
-benchmarking data, and any other results of your use or testing of the
-Deliverables which are indicative of performance, efficacy, reliability or
-quality, as confidential information and you shall not disclose such information
-to any third party without the express written permission of ARM.
-
-RESTRICTIONS ON TRANSFER OF LICENSED RIGHTS: The rights granted to you under
-this Licence may not be assigned, sublicensed or otherwise transferred by you
-to any third party without the prior written consent of ARM. An assignment shall
-be deemed to include, without limitation; (i) any transaction or series of
-transactions whereby a third party acquires, directly or indirectly, the power
-to control the management and policies of you, whether through the acquisition
-of voting securities, by contract or otherwise; or (ii) the sale of more than
-fifty percent (50%) of the your assets whether in a single transaction or series
-of transactions.  You shall not rent or lease the Deliverables. You shall not
-share the Deliverables with contractors (except as identified in the ‘PERMITTED
-USERS’ clause above) or other third parties.
-
-COPYRIGHT AND RESERVATION OF RIGHTS: The Deliverables are owned by ARM or its
-licensors and are protected by copyright and other intellectual property laws
-and international treaties. The Deliverables are licensed not sold. You acquire
-no rights to the Deliverables other than as expressly provided by this Licence.
-You shall not remove from the Deliverables any copyright notice or other notice
-and shall ensure that any such notice is reproduced in any copies of the whole
-or any part of the Deliverables made by you or your permitted users.
-
-3.  SUPPORT AND MAINTENANCE.
-
-If you purchased the Deliverables directly from ARM, and you are not receiving
-them as an update or upgrade or as Academic Software (defined in Clause 2), you
-are entitled to reasonable support and maintenance for the Deliverables for the
-period of one (1) year from the date of purchase. The support will be provided
-on any version of the Deliverables which, at the date of your support request,
-are either; (a) the current version made generally available by ARM; or (b) the
-previous version made generally available by ARM at some time during the
-previous ninety (90) days.
-
-Support will be provided by telephone, email or other written format designated
-by ARM, prioritised at ARM’s discretion, and may not be used as a substitute for
-training or as additional resource for your programming projects.  Maintenance
-will be provided in the form of upgrades, updates and patch releases to the
-Deliverables as and when they are made generally available from ARM.
-
-ARM’s obligation under this Clause 3 is limited to the provision of support and
-maintenance to you and ARM is under no obligation to provide any support and
-maintenance to any third parties under this Licence. If you purchase support and
-maintenance for additional years it will be provided pursuant to this Clause 3
-and will be subject to the terms and conditions of this Licence.
-
-If; (i) you obtained the Deliverables from an ARM authorised reseller or other
-third party; (ii) Deliverables were provided free of charge or for evaluation;
-or (iii) it is Academic Software, you are not entitled to any support for the
-Deliverables from ARM, but ARM may, at its sole discretion provide limited
-support to you. The vendor of the Deliverables may or may not offer support to
-you for the Deliverables. Please refer to the Technical Support area of
-http://www.arm.com for contact details for ARM’s support service and (if
-applicable) other authorised support channels.  ARM shall be under no obligation
-to provide support in respect of any modifications (where permitted) to the
-Deliverables.
-
-4.  CONFIDENTIALITY.
-
-You acknowledge that the Deliverables and any benchmarking data and related
-information mentioned in Clause 2 contains trade secrets and confidential
-material, and you agree to maintain all such information in confidence and
-apply security measures no less stringent than the measures which you apply to
-protect your own like information, but not less than a reasonable degree of
-care, to prevent their unauthorised disclosure and use. Subject to any
-restrictions imposed by applicable law, the period of confidentiality shall be
-indefinite. You agree that you shall not use any such information other than in
-normal use of the Deliverables under the licences granted in this Licence.
-
-Notwithstanding the foregoing you may disclose the Deliverables identified in
-Part C(i) of the Schedule to third parties solely in exercise of the licence
-rights contained in Clause 1(i)(c) of this Licence.
-
-5.  LIMITED WARRANTIES.
-
-For the period of ninety (90) days from the date of receipt by you of the
-Deliverables, ARM warrants to you that (i) the media on which the Deliverables
-are provided shall be free from defects in materials and workmanship under
-normal use; and (ii) the Deliverables will perform substantially in accordance
-with the accompanying documentation (if any). ARM's total liability and your
-exclusive remedy for breach of these limited warranties shall be limited to ARM,
-at ARM's option; (a) replacing the defective Deliverables; or (b) using
-reasonable efforts to correct material, documented, reproducible defects in the
-Deliverables and delivering such corrected Deliverables to you. Any replacement
-Deliverables will be warranted for the remainder of the original warranty
-period or thirty (30) days, whichever is the longer.
-
-EXCEPT AS PROVIDED ABOVE, YOU AGREE THAT THE DELIVERABLES ARE LICENSED "AS IS",
-AND THAT ARM EXPRESSLY DISCLAIMS ALL REPRESENTATIONS, WARRANTIES, CONDITIONS OR
-OTHER TERMS, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION THE
-IMPLIED WARRANTIES OF NON- INFRINGEMENT, SATISFACTORY QUALITY, AND FITNESS FOR A
-PARTICULAR PURPOSE.
-
-YOU EXPRESSLY ASSUME ALL LIABILITIES AND RISKS, FOR USE OR OPERATION OF SOFTWARE
-APPLICATIONS, INCLUDING WITHOUT LIMITATION, APPLICATIONS DESIGNED OR INTENDED
-FOR MISSION CRITICAL APPLICATIONS, SUCH AS PACEMAKERS, WEAPONARY, AIRCRAFT
-NAVIGATION, FACTORY CONTROL SYSTEMS, ETC. SHOULD THE DELIVERABLES PROVE
-DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR
-CORRECTION.
-
-6.  LIMITATION OF LIABILITY.
-
-TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL ARM BE
-LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCLUDING
-LOSS OF PROFITS) ARISING OUT OF THE USE OR INABILITY TO USE THE DELIVERABLES
-WHETHER BASED ON A CLAIM UNDER CONTRACT, TORT OR OTHER LEGAL THEORY, EVEN IF ARM
-WAS ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-ARM does not seek to limit or exclude liability for death or personal injury
-arising from ARM's negligence or ARM’s fraud and because some jurisdictions do
-not permit the exclusion or limitation of liability for consequential or
-incidental damages the above limitation relating to liability for consequential
-damages may not apply to you.
-
-NOTWITHSTANDING ANYTHING TO THE CONTRARY CONTAINED IN THIS LICENCE, THE MAXIMUM
-LIABILITY OF ARM TO YOU IN AGGREGATE FOR ALL CLAIMS MADE AGAINST ARM IN CONTRACT
-TORT OR OTHERWISE UNDER OR IN CONNECTION WITH THE SUBJECT MATTER OF THIS LICENCE
-SHALL NOT EXCEED THE GREATER OF; (I) THE TOTAL OF SUMS PAID BY YOU TO ARM (IF
-ANY) FOR THIS LICENCE; AND (II) $10 USD.
-
-THE EXISTENCE OF MORE THAN ONE CLAIM WILL NOT ENLARGE OR EXTEND THE LIMIT.
-
-7.  THIRD PARTY RIGHTS.
-
-The Separate Files are delivered subject to and your use is governed by their
-own separate licence agreements. This Licence does not apply to such Separate
-Files and they are not included in the term "Deliverables" under this Licence.
-You agree to comply with all terms and conditions imposed on you in respect of
-such Separate Files including those identified in the Schedule ("Third Party
-Terms").
-
-ARM HEREBY DISCLAIMS ANY AND ALL WARRANTIES EXPRESS OR IMPLIED FROM ANY THIRD
-PARTIES REGARDING ANY SEPARATE FILES, ANY THIRD PARTY MATERIALS INCLUDED IN THE
-DELIVERABLES, ANY THIRD PARTY MATERIALS FROM WHICH THE DELIVERABLES ARE DERIVED
-(COLLECTIVELY "OTHER CODE"), AND THE USE OF ANY OR ALL THE OTHER CODE IN
-CONNECTION WITH THE DELIVERABLES, INCLUDING (WITHOUT LIMITATION) ANY WARRANTIES
-OF SATISFACTORY QUALITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-NO THIRD PARTY LICENSORS OF OTHER CODE SHALL HAVE ANY LIABILITY FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND WHETHER MADE UNDER
-CONTRACT, TORT OR OTHER LEGAL THEORY, ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE OTHER CODE OR THE EXERCISE OF ANY RIGHTS GRANTED UNDER
-EITHER OR BOTH THIS LICENCE AND THE LEGAL TERMS APPLICABLE TO ANY SEPARATE
-FILES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-8.  GOVERNMENT END USERS.
-
-US Government Restrictions: Use, duplication, reproduction, release,
-modification, disclosure or transfer of the Deliverables is restricted in
-accordance with the terms of this Licence.
-
-9.  TERM AND TERMINATION.
-
-This Licence shall remain in force until terminated by you or by ARM. Without
-prejudice to any of its other rights if you are in breach of any of the terms
-and conditions of this Licence then ARM may terminate this Licence immediately
-upon giving written notice to you. You may terminate this Licence at any time.
-Upon termination of this Licence by you or by ARM you shall stop using the
-Deliverables and confidential information and destroy all copies of the
-Deliverables and confidential information in your possession together with all
-documentation and related materials. Notwithstanding the foregoing, except where
-ARM has terminated this Licence for your breach, your rights to distribute the
-Example Code as part of Licensed Products developed prior to termination shall
-survive termination of this Licence, subject to the terms of this Licence. The
-provisions of Clauses 4, 6, 7, 8, 9 and 10 shall survive termination of this
-Licence.
-
-10.  GENERAL.
-
-This Licence is governed by English Law. Except where ARM agrees otherwise in;
-(i) a written contract signed by you and ARM; or (ii) a written contract
-provided by ARM and accepted by you, this is the only agreement between you and
-ARM relating to the Deliverables and it may only be modified by written
-agreement between you and ARM. This Licence may not be modified by purchase
-orders, advertising or other representation by any person. If any clause or
-sentence in this Licence is held by a court of law to be illegal or
-unenforceable the remaining provisions of this Licence shall not be affected
-thereby. The failure by ARM to enforce any of the provisions of this Licence,
-unless waived in writing, shall not constitute a waiver of ARM's rights to
-enforce such provision or any other provision of this Licence in the future.
-
-The Deliverables provided under this Licence are subject to U.S. export control
-laws, including the U.S. Export Administration Act and its associated
-regulations, and may be subject to export or import regulations in other
-countries. You agree to comply fully with all laws and regulations of the United
-States and other countries ("Export Laws") to assure that the Deliverables, are
-not (1) exported, directly or indirectly, in violation of Export Laws, either to
-any countries that are subject to U.S.A. export restrictions or to any end user
-who has been prohibited from participating in the U.S.A. export transactions by
-any federal agency of the U.S.A. government; or (2) intended to be used for any
-purpose prohibited by Export Laws, including, without limitation, nuclear,
-chemical, or biological weapons proliferation.
-
-To the extent that the provisions contained in this Licence conflict with any
-provisions of any other licence you have entered with ARM governing the
-Deliverables the provisions contained in this Licence shall prevail over and
-shall supersede any such conflicting provisions.
-
-
-SCHEDULE
-
-Part A
-
-Hardware Binaries:
-FPGA bitstream file for any or all of the Hardware Source identified below in
-this Part A
-
-Software Binaries:
-Motherboard configuration controller
-Daughterboard configuration controller
-Daughterboard Application note SelfTest
-SCP firmware
-Mali GPU driver
-
-Documentation:
-Documentation, provided as PDF
-
-Hardware Source
-Hardware netlists of the ARM CoreLink peripheral technology and components known as TLX-400, NIC-400, and PL330
-
-Part B
-
-Wrapper:
-Application Note wrapper file provided as hardware source files and netlists.
-
-Part C: Example Code
-(i) Platform specific libraries and source code.
-(ii)    ARM source code of Application note SelfTest.
-
-Part D: Separate Files
-A.    UEFI firmware, including drivers for third party components licensed to
-you under BSD 3-Clause.
-B.    Linux kernel licensed to you under the GNU General Public License version
-2.0
-
-To the extent that ARM is obliged to do so, ARM hereby offers to supply the
-files which are subject to the GNU General Public Licence version 2 (identified
-above), in source code form, subject to the terms of the GNU General Public
-License version 2, upon request. This offer is valid for three (3) years from
-the date of your acceptance of this Licence.
-
-C.    ARM Trusted Firmware licensed to you under BSD 3-Clause.
-
-/end
-
-ARM contract references: LES-PRE-20435 JUNO ARM DEVELOPMENT PLATFORM DELIVERABLES

edk2-non-osi/Platform/Hisilicon/D03/Drivers/GetInfoFromBmc/GetInfoFromBmc.depex

@@ -1 +0,0 @@
-

edk2-non-osi/Platform/Hisilicon/D03/Drivers/GetInfoFromBmc/GetInfoFromBmc.inf

@@ -1,26 +0,0 @@
-#/** @file
-#
-#    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
-#    Copyright (c) 2016, Linaro Limited. All rights reserved.
-#
-#    This program and the accompanying materials
-#    are licensed and made available under the terms and conditions of the BSD License
-#    which accompanies this distribution. The full text of the license may be found at
-#    http://opensource.org/licenses/bsd-license.php
-#
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#**/
-
-[Defines]
-  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = GetInfoFromBmc
-  FILE_GUID                      = 43B59C81-9C5F-4021-B0F2-947DB839B781
-  MODULE_TYPE                    = DXE_DRIVER
-  VERSION_STRING                 = 1.0
-  ENTRY_POINT                    = GetBmcInfoDriverEntry
-
-[Binaries]
-  PE32|GetInfoFromBmc.efi|*
-  DXE_DEPEX|GetInfoFromBmc.depex|*

edk2-non-osi/Platform/Hisilicon/D03/Drivers/Ipmi/IpmiInterfacePei/IpmiInterfacePei.inf

@@ -1,32 +0,0 @@
-#/** @file
-#
-#    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
-#    Copyright (c) 2016, Linaro Limited. All rights reserved.
-#
-#    This program and the accompanying materials
-#    are licensed and made available under the terms and conditions of the BSD License
-#    which accompanies this distribution. The full text of the license may be found at
-#    http://opensource.org/licenses/bsd-license.php
-#
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#**/
-
-
-[Defines]
-  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = IpmiInterfacePei
-  FILE_GUID                      = 269702AF-8004-4570-A08E-00762AE65D15
-  MODULE_TYPE                    = PEIM
-  VERSION_STRING                 = 1.0
-  ENTRY_POINT                    = IpmiInterfacePeiEntry
-
-[Sources]
-
-[Binaries.AARCH64]
-  TE|IpmiInterfacePei.efi|*
-
-[Depex]
-  TRUE
-

edk2-non-osi/Platform/Hisilicon/D03/Drivers/Ipmi/ipmiInterfaceDxe/IpmiInterfaceDxe.depex

@@ -1 +0,0 @@
-

edk2-non-osi/Platform/Hisilicon/D03/Drivers/Ipmi/ipmiInterfaceDxe/IpmiInterfaceDxe.inf

@@ -1,28 +0,0 @@
-#/** @file
-#
-#    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
-#    Copyright (c) 2016, Linaro Limited. All rights reserved.
-#
-#    This program and the accompanying materials
-#    are licensed and made available under the terms and conditions of the BSD License
-#    which accompanies this distribution. The full text of the license may be found at
-#    http://opensource.org/licenses/bsd-license.php
-#
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#**/
-
-
-[Defines]
-  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = IpmiInterfaceDxe
-  FILE_GUID                      = EF5483F8-68AD-4D71-9A23-674D2E9C013E
-  MODULE_TYPE                    = DXE_DRIVER
-  VERSION_STRING                 = 1.0
-
-[Binaries.common]
-  PE32|IpmiInterfaceDxe.efi|*
-  DXE_DEPEX|IpmiInterfaceDxe.depex|*
-
-

edk2-non-osi/Platform/Hisilicon/D03/Drivers/IpmiMiscOpDxe/IpmiMiscOpDxe.depex

@@ -1 +0,0 @@
-

edk2-non-osi/Platform/Hisilicon/D03/Drivers/IpmiMiscOpDxe/IpmiMiscOpDxe.inf

@@ -1,27 +0,0 @@
-#/** @file
-#
-#    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
-#    Copyright (c) 2016, Linaro Limited. All rights reserved.
-#
-#    This program and the accompanying materials
-#    are licensed and made available under the terms and conditions of the BSD License
-#    which accompanies this distribution. The full text of the license may be found at
-#    http://opensource.org/licenses/bsd-license.php
-#
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#**/
-
-
-[Defines]
-  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = IpmiMiscOp
-  FILE_GUID                      = EC68451C-6D10-4ba2-9862-D27D4D6090DB
-  MODULE_TYPE                    = DXE_DRIVER
-  VERSION_STRING                 = 1.0
-  ENTRY_POINT                    = IpmiMiscOpEntry
-
-[Binaries]
-  PE32|IpmiMiscOp.efi|*
-  DXE_DEPEX|IpmiMiscOpDxe.depex|*

edk2-non-osi/Platform/Hisilicon/D03/Drivers/IpmiWatchdogDxe/IpmiWatchdogDxe.depex

@@ -1 +0,0 @@
-

edk2-non-osi/Platform/Hisilicon/D03/Drivers/IpmiWatchdogDxe/IpmiWatchdogDxe.inf

@@ -1,27 +0,0 @@
-#/** @file
-#
-#    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
-#    Copyright (c) 2016, Linaro Limited. All rights reserved.
-#
-#    This program and the accompanying materials
-#    are licensed and made available under the terms and conditions of the BSD License
-#    which accompanies this distribution. The full text of the license may be found at
-#    http://opensource.org/licenses/bsd-license.php
-#
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#**/
-
-
-[Defines]
-  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = IpmiWatchdogDxe
-  FILE_GUID                      = 7C7ACA9F-DB25-43FB-A479-1B6E42F38792
-  MODULE_TYPE                    = DXE_DRIVER
-  VERSION_STRING                 = 1.0
-  ENTRY_POINT                    = InitializeWatchdogDxeEntry
-
-[Binaries]
-  PE32|IpmiWatchdogDxe.efi|*
-  DXE_DEPEX|IpmiWatchdogDxe.depex|*

edk2-non-osi/Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf

@@ -1,24 +0,0 @@
-#/** @file
-#
-#    Copyright (c) 2017, Hisilicon Limited. All rights reserved.
-#    Copyright (c) 2017, Linaro Limited. All rights reserved.
-#
-#    This program and the accompanying materials
-#    are licensed and made available under the terms and conditions of the BSD License
-#    which accompanies this distribution. The full text of the license may be found at
-#    http://opensource.org/licenses/bsd-license.php
-#
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#**/
-
-[Defines]
-  INF_VERSION                    = 0x00010019
-  BASE_NAME                      = SnpPV600Dxe
-  FILE_GUID                      = 3247F15F-3612-4803-BD4E-4104D7EF944A
-  MODULE_TYPE                    = DXE_DRIVER
-  VERSION_STRING                 = 1.0
-
-[Binaries.AARCH64]
-  PE32|SnpPV600Dxe.efi|*

edk2-non-osi/Platform/Hisilicon/D03/Drivers/OhciDxe/OhciDxe.inf

@@ -1,26 +0,0 @@
-#/** @file
-#
-#    Copyright (c) 2016, Hisilicon Limited. All rights reserved.
-#    Copyright (c) 2016, Linaro Limited. All rights reserved.
-#
-#    This program and the accompanying materials
-#    are licensed and made available under the terms and conditions of the BSD License
-#    which accompanies this distribution. The full text of the license may be found at
-#    http://opensource.org/licenses/bsd-license.php
-#
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#**/
-
-
-[defines]
-  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = NativeOhci
-  FILE_GUID                      = 043D0B5E-DAC1-463a-85BA-2CEDC33A8C4F
-  MODULE_TYPE                    = UEFI_DRIVER
-  VERSION_STRING                 = 1.0
-
-[Binaries]
-   PE32|NativeOhci.efi|*
-

edk2-non-osi/Platform/Hisilicon/D03/Drivers/ReportPciePlugDidVidToBmc/ReportPciePlugDidVidToBmc.depex

@@ -1 +0,0 @@
-