diff --git a/Libraries/zephyr/MAX/Source/MAX32655/CMakeLists.txt b/Libraries/zephyr/MAX/Source/MAX32655/CMakeLists.txt
index 3dcf1822f3..f8362fddee 100644
--- a/Libraries/zephyr/MAX/Source/MAX32655/CMakeLists.txt
+++ b/Libraries/zephyr/MAX/Source/MAX32655/CMakeLists.txt
@@ -132,7 +132,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_SOC_FLASH_MAX32)
+if (CONFIG_SOC_FLASH_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_common.c
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_me17.c
@@ -176,7 +176,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_CRYPTO_MAX32 OR CONFIG_BT)
+if (CONFIG_CRYPTO_MAX32 OR CONFIG_BT OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/AES/aes_me17.c
     ${MSDK_PERIPH_SRC_DIR}/AES/aes_revb.c
diff --git a/Libraries/zephyr/MAX/Source/MAX32657/CMakeLists.txt b/Libraries/zephyr/MAX/Source/MAX32657/CMakeLists.txt
index c037d8a699..13d76e95a0 100644
--- a/Libraries/zephyr/MAX/Source/MAX32657/CMakeLists.txt
+++ b/Libraries/zephyr/MAX/Source/MAX32657/CMakeLists.txt
@@ -119,7 +119,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_SOC_FLASH_MAX32)
+if (CONFIG_SOC_FLASH_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_common.c
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_me30.c
@@ -142,7 +142,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_CRYPTO_MAX32 OR CONFIG_BT)
+if (CONFIG_CRYPTO_MAX32 OR CONFIG_BT OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/AES/aes_me30.c
     ${MSDK_PERIPH_SRC_DIR}/AES/aes_revb.c
diff --git a/Libraries/zephyr/MAX/Source/MAX32662/CMakeLists.txt b/Libraries/zephyr/MAX/Source/MAX32662/CMakeLists.txt
index 11214a2930..49b168a68b 100644
--- a/Libraries/zephyr/MAX/Source/MAX32662/CMakeLists.txt
+++ b/Libraries/zephyr/MAX/Source/MAX32662/CMakeLists.txt
@@ -129,7 +129,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_SOC_FLASH_MAX32)
+if (CONFIG_SOC_FLASH_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_common.c
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_me12.c
@@ -152,7 +152,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_CRYPTO_MAX32)
+if (CONFIG_CRYPTO_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/AES/aes_me12.c
     ${MSDK_PERIPH_SRC_DIR}/AES/aes_revb.c
diff --git a/Libraries/zephyr/MAX/Source/MAX32665/CMakeLists.txt b/Libraries/zephyr/MAX/Source/MAX32665/CMakeLists.txt
index db5517ccd7..cea33cc479 100644
--- a/Libraries/zephyr/MAX/Source/MAX32665/CMakeLists.txt
+++ b/Libraries/zephyr/MAX/Source/MAX32665/CMakeLists.txt
@@ -153,7 +153,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_SOC_FLASH_MAX32)
+if (CONFIG_SOC_FLASH_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_common.c
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_me14.c
diff --git a/Libraries/zephyr/MAX/Source/MAX32670/CMakeLists.txt b/Libraries/zephyr/MAX/Source/MAX32670/CMakeLists.txt
index 398df229b0..940d130133 100644
--- a/Libraries/zephyr/MAX/Source/MAX32670/CMakeLists.txt
+++ b/Libraries/zephyr/MAX/Source/MAX32670/CMakeLists.txt
@@ -23,6 +23,7 @@ if(NOT TARGET_REV)
 endif()
 
 zephyr_include_directories(
+    ${MSDK_PERIPH_SRC_DIR}/AES
     ${MSDK_PERIPH_SRC_DIR}/DMA
     ${MSDK_PERIPH_SRC_DIR}/FLC
     ${MSDK_PERIPH_SRC_DIR}/GPIO
@@ -105,7 +106,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_SOC_FLASH_MAX32)
+if (CONFIG_SOC_FLASH_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_common.c
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_me15.c
@@ -121,9 +122,16 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_ENTROPY_MAX32_TRNG)
+if (CONFIG_ENTROPY_MAX32_TRNG OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/TRNG/trng_me15.c
     ${MSDK_PERIPH_SRC_DIR}/TRNG/trng_revb.c
 )
 endif()
+
+if (CONFIG_HWINFO_MAX32)
+zephyr_library_sources(
+    ${MSDK_PERIPH_SRC_DIR}/AES/aes_me15.c
+    ${MSDK_PERIPH_SRC_DIR}/AES/aes_revb.c
+)
+endif()
diff --git a/Libraries/zephyr/MAX/Source/MAX32672/CMakeLists.txt b/Libraries/zephyr/MAX/Source/MAX32672/CMakeLists.txt
index 96cee524cb..a0a9e3eddc 100644
--- a/Libraries/zephyr/MAX/Source/MAX32672/CMakeLists.txt
+++ b/Libraries/zephyr/MAX/Source/MAX32672/CMakeLists.txt
@@ -126,7 +126,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_SOC_FLASH_MAX32)
+if (CONFIG_SOC_FLASH_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_common.c
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_me21.c
@@ -149,11 +149,15 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_CRYPTO_MAX32)
+if (CONFIG_CRYPTO_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/AES/aes_me21.c
     ${MSDK_PERIPH_SRC_DIR}/AES/aes_revb.c
+)
+endif()
 
+if (CONFIG_CRYPTO_MAX32)
+zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/CTB/ctb_me21.c
     ${MSDK_PERIPH_SRC_DIR}/CTB/ctb_reva.c
     ${MSDK_PERIPH_SRC_DIR}/CTB/ctb_common.c
diff --git a/Libraries/zephyr/MAX/Source/MAX32675/CMakeLists.txt b/Libraries/zephyr/MAX/Source/MAX32675/CMakeLists.txt
index 897a758cdb..94d88e4124 100644
--- a/Libraries/zephyr/MAX/Source/MAX32675/CMakeLists.txt
+++ b/Libraries/zephyr/MAX/Source/MAX32675/CMakeLists.txt
@@ -120,7 +120,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_SOC_FLASH_MAX32)
+if (CONFIG_SOC_FLASH_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_common.c
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_me15.c
@@ -136,7 +136,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_ENTROPY_MAX32_TRNG)
+if (CONFIG_ENTROPY_MAX32_TRNG OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/TRNG/trng_me15.c
     ${MSDK_PERIPH_SRC_DIR}/TRNG/trng_revb.c
diff --git a/Libraries/zephyr/MAX/Source/MAX32680/CMakeLists.txt b/Libraries/zephyr/MAX/Source/MAX32680/CMakeLists.txt
index 03458b6a9e..b4fe6f283e 100644
--- a/Libraries/zephyr/MAX/Source/MAX32680/CMakeLists.txt
+++ b/Libraries/zephyr/MAX/Source/MAX32680/CMakeLists.txt
@@ -135,7 +135,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_SOC_FLASH_MAX32)
+if (CONFIG_SOC_FLASH_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_common.c
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_me17.c
@@ -179,11 +179,15 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_CRYPTO_MAX32)
+if (CONFIG_CRYPTO_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/AES/aes_me17.c
     ${MSDK_PERIPH_SRC_DIR}/AES/aes_revb.c
+)
+endif()
 
+if (CONFIG_CRYPTO_MAX32)
+zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/CRC/crc_me17.c
     ${MSDK_PERIPH_SRC_DIR}/CRC/crc_reva.c
 )
diff --git a/Libraries/zephyr/MAX/Source/MAX32690/CMakeLists.txt b/Libraries/zephyr/MAX/Source/MAX32690/CMakeLists.txt
index 53afa9fe03..4cb6e30306 100644
--- a/Libraries/zephyr/MAX/Source/MAX32690/CMakeLists.txt
+++ b/Libraries/zephyr/MAX/Source/MAX32690/CMakeLists.txt
@@ -144,7 +144,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_SOC_FLASH_MAX32)
+if (CONFIG_SOC_FLASH_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_common.c
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_me18.c
@@ -188,7 +188,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_CRYPTO_MAX32)
+if (CONFIG_CRYPTO_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/CTB/ctb_me18.c
     ${MSDK_PERIPH_SRC_DIR}/CTB/ctb_reva.c
diff --git a/Libraries/zephyr/MAX/Source/MAX78002/CMakeLists.txt b/Libraries/zephyr/MAX/Source/MAX78002/CMakeLists.txt
index 11839a856f..2b37c76678 100644
--- a/Libraries/zephyr/MAX/Source/MAX78002/CMakeLists.txt
+++ b/Libraries/zephyr/MAX/Source/MAX78002/CMakeLists.txt
@@ -142,7 +142,7 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_SOC_FLASH_MAX32)
+if (CONFIG_SOC_FLASH_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_common.c
     ${MSDK_PERIPH_SRC_DIR}/FLC/flc_ai87.c
@@ -158,18 +158,22 @@ zephyr_library_sources(
 )
 endif()
 
-if (CONFIG_ENTROPY_MAX32_TRNG)
+if (CONFIG_ENTROPY_MAX32_TRNG OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/TRNG/trng_ai87.c
     ${MSDK_PERIPH_SRC_DIR}/TRNG/trng_revb.c
 )
 endif()
 
-if (CONFIG_CRYPTO_MAX32)
+if (CONFIG_CRYPTO_MAX32 OR CONFIG_HWINFO_MAX32)
 zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/AES/aes_ai87.c
     ${MSDK_PERIPH_SRC_DIR}/AES/aes_revb.c
+)
+endif()
 
+if (CONFIG_CRYPTO_MAX32)
+zephyr_library_sources(
     ${MSDK_PERIPH_SRC_DIR}/CRC/crc_ai87.c
     ${MSDK_PERIPH_SRC_DIR}/CRC/crc_reva.c
 )