diff --git a/lib/Makefile b/lib/Makefile
index b5199e5fbd..b3544d86c5 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -45,10 +45,10 @@ obj-$(CONFIG_BITREVERSE) += bitrev.o
 obj-y += list_sort.o
 endif
 
-obj-$(CONFIG_AVB_LIBAVB) += avb/rk_libavb/
-obj-$(CONFIG_AVB_LIBAVB_AB) += avb/rk_libavb_ab/
-obj-$(CONFIG_AVB_LIBAVB_ATX) += avb/rk_libavb_atx/
-obj-$(CONFIG_AVB_LIBAVB_USER) += avb/rk_libavb_user/
+obj-$(CONFIG_$(SPL_TPL_)AVB_LIBAVB) += avb/rk_libavb/
+obj-$(CONFIG_$(SPL_TPL_)AVB_LIBAVB_AB) += avb/rk_libavb_ab/
+obj-$(CONFIG_$(SPL_TPL_)AVB_LIBAVB_ATX) += avb/rk_libavb_atx/
+obj-$(CONFIG_$(SPL_TPL_)AVB_LIBAVB_USER) += avb/rk_libavb_user/
 
 obj-$(CONFIG_OPTEE_CLIENT) += optee_clientApi/
 
diff --git a/lib/avb/rk_libavb/Kconfig b/lib/avb/rk_libavb/Kconfig
index c569909bdb..71c8be3610 100644
--- a/lib/avb/rk_libavb/Kconfig
+++ b/lib/avb/rk_libavb/Kconfig
@@ -4,3 +4,17 @@ config AVB_LIBAVB
 	  The new android bootloader need to startup
 	  with a/b and avb.This config can add the
 	  AVB functions to u-boot.
+
+config SPL_AVB_LIBAVB
+	bool "Support running U-Boot AVB for spl"
+	help
+	  The new android bootloader need to startup
+	  with a/b and avb.This config can add the
+	  AVB functions to u-boot.
+
+config TPL_AVB_LIBAVB
+	bool "Support running U-Boot AVB for tpl"
+	help
+	  The new android bootloader need to startup
+	  with a/b and avb.This config can add the
+	  AVB functions to u-boot.
diff --git a/lib/avb/rk_libavb_ab/Kconfig b/lib/avb/rk_libavb_ab/Kconfig
index ae1a8095f3..d4a0dc279a 100644
--- a/lib/avb/rk_libavb_ab/Kconfig
+++ b/lib/avb/rk_libavb_ab/Kconfig
@@ -1,7 +1,23 @@
 config AVB_LIBAVB_AB
 	bool "Choose the a/b system and flow"
 	help
-	  In the android things system, there are 
+	  In the android things system, there are
+	  _a and _b or more systems. So we have to
+	  choose the _a or _b system to startup.
+	  This libavb_ab can suport these functions.
+
+config SPL_AVB_LIBAVB_AB
+	bool "Choose the a/b system and flow for spl"
+	help
+	  In the android things system, there are
+	  _a and _b or more systems. So we have to
+	  choose the _a or _b system to startup.
+	  This libavb_ab can suport these functions.
+
+config TPL_AVB_LIBAVB_AB
+	bool "Choose the a/b system and flow for tpl"
+	help
+	  In the android things system, there are
 	  _a and _b or more systems. So we have to
 	  choose the _a or _b system to startup.
 	  This libavb_ab can suport these functions.
diff --git a/lib/avb/rk_libavb_atx/Kconfig b/lib/avb/rk_libavb_atx/Kconfig
index f191d4d8bc..1c168baeec 100644
--- a/lib/avb/rk_libavb_atx/Kconfig
+++ b/lib/avb/rk_libavb_atx/Kconfig
@@ -4,3 +4,17 @@ config AVB_LIBAVB_ATX
 	  Android Things requires specific public key
 	  metadata and verification logic to correctly
 	  verify vbmeta public keys.
+
+config SPL_AVB_LIBAVB_ATX
+	bool "support vbmeta public key verify for SPL"
+	help
+	  Android Things requires specific public key
+	  metadata and verification logic to correctly
+	  verify vbmeta public keys.
+
+config TPL_AVB_LIBAVB_ATX
+	bool "support vbmeta public key verify for TPL"
+	help
+	  Android Things requires specific public key
+	  metadata and verification logic to correctly
+	  verify vbmeta public keys.
diff --git a/lib/avb/rk_libavb_user/Kconfig b/lib/avb/rk_libavb_user/Kconfig
index f6b3ca3c30..c27412fcba 100644
--- a/lib/avb/rk_libavb_user/Kconfig
+++ b/lib/avb/rk_libavb_user/Kconfig
@@ -2,6 +2,22 @@ config AVB_LIBAVB_USER
 	bool "Android AVB read/write hardware"
 	help
 	  This config support the android things system to
-	  read/write hardware image, like vbmeta, misc, and 
+	  read/write hardware image, like vbmeta, misc, and
+	  so on. And it can provide some a/b and avb information
+	  to fastboot and kernel.
+
+config SPL_AVB_LIBAVB_USER
+	bool "Android AVB read/write hardware for spl"
+	help
+	  This config support the android things system to
+	  read/write hardware image, like vbmeta, misc, and
+	  so on. And it can provide some a/b and avb information
+	  to fastboot and kernel.
+
+config TPL_AVB_LIBAVB_USER
+	bool "Android AVB read/write hardware for tpl"
+	help
+	  This config support the android things system to
+	  read/write hardware image, like vbmeta, misc, and
 	  so on. And it can provide some a/b and avb information
 	  to fastboot and kernel.