diff --git a/Platform/ElkhartlakeBoardPkg/BoardConfig.py b/Platform/ElkhartlakeBoardPkg/BoardConfig.py
index 4e9597ed..d2ce06b1 100644
--- a/Platform/ElkhartlakeBoardPkg/BoardConfig.py
+++ b/Platform/ElkhartlakeBoardPkg/BoardConfig.py
@@ -14,7 +14,7 @@ import time
 
 sys.dont_write_bytecode = True
 sys.path.append (os.path.join('..', '..'))
-from BuildLoader import BaseBoard, STITCH_OPS, FLASH_REGION_TYPE
+from BuildLoader import BaseBoard, STITCH_OPS, FLASH_REGION_TYPE, HASH_USAGE
 from BuildLoader import IPP_CRYPTO_OPTIMIZATION_MASK, IPP_CRYPTO_ALG_MASK, HASH_TYPE_VALUE
 
 class Board(BaseBoard):
diff --git a/Silicon/ElkhartlakePkg/Include/Register/PchRegsPcr.h b/Silicon/ElkhartlakePkg/Include/Register/PchRegsPcr.h
index 813dfd4f..c82025ac 100644
--- a/Silicon/ElkhartlakePkg/Include/Register/PchRegsPcr.h
+++ b/Silicon/ElkhartlakePkg/Include/Register/PchRegsPcr.h
@@ -45,11 +45,13 @@
 //CNL
 #define  PID_BROADCAST1                        0xFF // @todo CNL PCH, check CNL cspec
 #define  PID_BROADCAST2                        0xFE // @todo CNL PCH, check CNL cspec
+#define  PID_ICLK                              0xAD
 #define  PID_DMI                               0x88
 #define  PID_SPD                               0x83
 #define  PID_SPC                               0x82
 #define  PID_SPB                               0x81
 #define  PID_SPA                               0x80
+#define  PID_UFSX2                             0x50
 #define  PID_RTC_HOST                          0xC3
 #define  PID_GPIOCOM0                          0x6E
 #define  PID_GPIOCOM1                          0x6D