diff --git a/.gitmodules b/.gitmodules
index ac1077b4..23ef8f83 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "misc/rkbin"]
 	path = misc/rkbin
 	url = https://github.com/rockchip-linux/rkbin.git
+[submodule "X86EmulatorPkg"]
+	path = X86EmulatorPkg
+	url = https://github.com/ardbiesheuvel/X86EmulatorPkg.git
diff --git a/X86EmulatorPkg b/X86EmulatorPkg
new file mode 160000
index 00000000..8205668b
--- /dev/null
+++ b/X86EmulatorPkg
@@ -0,0 +1 @@
+Subproject commit 8205668bdcb2a4ea49f03181d78cbb6e31a73702
diff --git a/edk2-rockchip/Silicon/Rockchip/FvMainModules.fdf.inc b/edk2-rockchip/Silicon/Rockchip/FvMainModules.fdf.inc
index 7835f479..6c1af71a 100644
--- a/edk2-rockchip/Silicon/Rockchip/FvMainModules.fdf.inc
+++ b/edk2-rockchip/Silicon/Rockchip/FvMainModules.fdf.inc
@@ -178,6 +178,13 @@
   #
   INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
 
+  #
+  # X86 Driver Emulator
+  #
+!if $(X86_EMULATOR_ENABLE) == TRUE
+  INF X86EmulatorPkg/X86Emulator.inf
+!endif
+
   #
   # UEFI Network Stack
   #
diff --git a/edk2-rockchip/Silicon/Rockchip/RK3588/RK3588Base.dsc.inc b/edk2-rockchip/Silicon/Rockchip/RK3588/RK3588Base.dsc.inc
index 2ac2b89a..8a98db85 100644
--- a/edk2-rockchip/Silicon/Rockchip/RK3588/RK3588Base.dsc.inc
+++ b/edk2-rockchip/Silicon/Rockchip/RK3588/RK3588Base.dsc.inc
@@ -58,6 +58,13 @@
   DEFINE SCMI_CLK_CPUB01              = 0x2
   DEFINE SCMI_CLK_CPUB23              = 0x3
 
+  #
+  # Extra features
+  #
+!ifndef X86_EMULATOR_ENABLE
+  DEFINE X86_EMULATOR_ENABLE        = TRUE
+!endif
+
   #
   # Default peripheral support flags
   #
diff --git a/edk2-rockchip/Silicon/Rockchip/Rockchip.dsc.inc b/edk2-rockchip/Silicon/Rockchip/Rockchip.dsc.inc
index e3eaa00c..d24beff7 100644
--- a/edk2-rockchip/Silicon/Rockchip/Rockchip.dsc.inc
+++ b/edk2-rockchip/Silicon/Rockchip/Rockchip.dsc.inc
@@ -689,6 +689,13 @@ FspiLib|Silicon/Rockchip/Library/FspiLib/FspiLib.inf
   #
   MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
 
+  #
+  # X86 Driver Emulator
+  #
+!if $(X86_EMULATOR_ENABLE) == TRUE
+  X86EmulatorPkg/X86Emulator.inf
+!endif
+
   #
   # UEFI Network Stack
   #