diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/AcpiTables.inf
index e95eb7e1c..1d0dc1110 100644
--- a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/AcpiTables.inf
+++ b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/AcpiTables.inf
@@ -47,7 +47,7 @@
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   Silicon/Rockchip/RockchipPkg.dec
-  Platform/Rockchip/RK3588/RK3588.dec
+  Silicon/Rockchip/RK3588/RK3588.dec
 
 [FixedPcd]
   gArmTokenSpaceGuid.PcdArmArchTimerIntrNum
@@ -57,15 +57,4 @@
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
   gArmTokenSpaceGuid.PcdGicDistributorBase
   gArmTokenSpaceGuid.PcdGicRedistributorsBase
-  gRockchipTokenSpaceGuid.PcdPcieRootPort3x4CfgBaseAddress
-  gRockchipTokenSpaceGuid.PcdPcieRootPort3x4ApbBaseAddress
-  gRockchipTokenSpaceGuid.PcdPcieRootPort3x4DbiBaseAddress
-  gRockchipTokenSpaceGuid.PcdPcieRootPort3x4CfgBaseAddress
-  gRockchipTokenSpaceGuid.PcdPcieRootPort3x4CfgSize
-  gRockchipTokenSpaceGuid.PcdPcieRootPort3x4IoBaseAddress
-  gRockchipTokenSpaceGuid.PcdPcieRootPort3x4IoSize
-  gRockchipTokenSpaceGuid.PcdPcieRootPort3x4MemBaseAddress
-  gRockchipTokenSpaceGuid.PcdPcieRootPort3x4MemSize
-  gRockchipTokenSpaceGuid.PcdPcieRootPort3x4MemBaseAddress64
-  gRockchipTokenSpaceGuid.PcdPcieRootPort3x4MemSize64
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase
diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/Dsdt.asl
index bc3847226..7a3b701ab 100644
--- a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/Dsdt.asl
+++ b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP", "RK3588S", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588S", 2)
 {
   Scope (\_SB_)
   {
@@ -21,7 +21,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP", "RK3588S", 2)
 
     include ("Emmc.asl")
     include ("Sdhc.asl")
-    include ("Gmac.asl")
+    // include ("Gmac.asl")
     //include ("Gpio.asl")
     //include ("I2c.asl")
     include ("Uart.asl")
diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/Library/RockchipPlatformLib/RockchipPlatformLib.inf b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/Library/RockchipPlatformLib/RockchipPlatformLib.inf
index 57a153f51..bc1c43747 100644
--- a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/Library/RockchipPlatformLib/RockchipPlatformLib.inf
+++ b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/Library/RockchipPlatformLib/RockchipPlatformLib.inf
@@ -17,7 +17,6 @@
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  Platform/Rockchip/RK3588/RK3588.dec
   Silicon/Rockchip/RK3588/RK3588.dec
   Silicon/Rockchip/RockchipPkg.dec