diff --git a/Platform/ElkhartlakeBoardPkg/CfgData/CfgData_Silicon.yaml b/Platform/ElkhartlakeBoardPkg/CfgData/CfgData_Silicon.yaml
index 82da3fbd..005edf9d 100644
--- a/Platform/ElkhartlakeBoardPkg/CfgData/CfgData_Silicon.yaml
+++ b/Platform/ElkhartlakeBoardPkg/CfgData/CfgData_Silicon.yaml
@@ -1905,11 +1905,26 @@
                      Set PSE TSN 1 Phy Interface Type 0: Not Connected, 1: RGMII, 2: SGMII, 3:SGMII+
       length       : 2b
       value        : 0x01
+  - PchPseAicEnabled:
+      name         : Enable PSE AIC SPI1 option
+      type         : EditNum, HEX, (0x0,0xFF)
+      help         : >
+                     Set if to enable PSE AIC SPI1. 0: Disable; 1: Enable.
+      length       : 1b
+      value        : 0x0
+  - PchUnlockGpioPads :
+      name         : Unlock all GPIO pads
+      type         : Combo
+      option       : $EN_DIS
+      help         : >
+                     Force all GPIO pads to be unlocked for debug purpose.
+      length       : 1b
+      value        : 0x0
   - Dummy        :
       name         : SaPostMemTestRsvd
       type         : Combo
       option       : $EN_DIS
       help         : >
                      Reserved for SA Post-Mem Test
-      length       : 15b
+      length       : 13b
       value        : 0x0
diff --git a/Platform/ElkhartlakeBoardPkg/Library/Stage2BoardInitLib/Stage2BoardInitLib.c b/Platform/ElkhartlakeBoardPkg/Library/Stage2BoardInitLib/Stage2BoardInitLib.c
index 9f0b1ed2..419c4fe2 100644
--- a/Platform/ElkhartlakeBoardPkg/Library/Stage2BoardInitLib/Stage2BoardInitLib.c
+++ b/Platform/ElkhartlakeBoardPkg/Library/Stage2BoardInitLib/Stage2BoardInitLib.c
@@ -964,6 +964,7 @@ FspUpdatePsePolicy (
   Fspscfg->PchPseEcliteEnabled    = 1;
   Fspscfg->PchPseOobEnabled       = 0;
   Fspscfg->PchPseWoLEnabled       = 1;
+  Fspscfg->PchPseAicEnabled       = (UINT8)SiCfgData->PchPseAicEnabled;
 
   //Fspscfg->PseJtagEnabled       = 0;
   //Fspscfg->PseJtagPinMux        = 0;
@@ -1769,6 +1770,8 @@ UpdateFspConfig (
     // configure s0ix related FSP-S config
     Fspscfg->XdciEnable = 0;
   }
+  // PCH_GPIO_PADS
+  Fspscfg->PchUnlockGpioPads = (UINT8)SiCfgData->PchUnlockGpioPads;
 }