avb2.0: add proper dependencies

1. Since libavb library alone is highly portable, introduce dedicated
Kconfig symbol for AVB bootloader-dependent operations, so it's possible
to build libavb separately. AVB bootloader-dependent operations include:
  * Helpers to process strings in order to build OS bootargs.
  * Helpers to access MMC, similar to drivers/fastboot/fb_mmc.c.
  * Helpers to alloc/init/free avb ops.
2. Add CONFIG_FASTBOOT dependency, as fastboot buffer is
re-used in partition verification operations.

Reported-by: Eugeniu Rosca <rosca.eugeniu@gmail.com>
Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>
Reviewed-by: Eugeniu Rosca <rosca.eugeniu@gmail.com>
Tested-by: Eugeniu Rosca <rosca.eugeniu@gmail.com>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index c5a7a3c3346bad53a510b316f937e20b6da48390..0cf530d923f0e5466b7e74b23ca46a5864043686 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1779,7 +1779,7 @@ config CMD_TRACE
 
 config CMD_AVB
        bool "avb - Android Verified Boot 2.0 operations"
-       depends on LIBAVB
+       depends on AVB_VERIFY
        default n
        help
          Enables a "avb" command to perform verification of partitions using

diff --git a/common/Kconfig b/common/Kconfig
index dc2e1c23dd819c31beacbf114559ebc2283726c2..9f6a1622d1e1db53552f212924e32857d785a6a8 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -637,6 +637,16 @@ config HASH
          and the algorithms it supports are defined in common/hash.c. See
          also CMD_HASH for command-line access.
 
+config AVB_VERIFY
+       bool "Build Android Verified Boot operations"
+       depends on LIBAVB && FASTBOOT
+       help
+         This option enables compilation of bootloader-dependent operations,
+         used by Android Verified Boot 2.0 library (libavb). Includes:
+           * Helpers to process strings in order to build OS bootargs.
+           * Helpers to access MMC, similar to drivers/fastboot/fb_mmc.c.
+           * Helpers to alloc/init/free avb ops.
+
 endmenu
 
 menu "Update support"

diff --git a/common/Makefile b/common/Makefile
index 66584f8f48be554a2afe662433d8e05503724982..7100541ece0011ad9184375ba02ee646b39e9139 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -121,4 +121,4 @@ obj-$(CONFIG_$(SPL_)LOG_CONSOLE) += log_console.o
 obj-y += s_record.o
 obj-y += xyzModem.o
 
-obj-$(CONFIG_LIBAVB) += avb_verify.o
+obj-$(CONFIG_AVB_VERIFY) += avb_verify.o

diff --git a/doc/README.avb2 b/doc/README.avb2
index 67784b529e4713e8fa92782412e3061c492a444c..120279fedbe235fe781c898221e3a9df7a0a9747 100644 (file)
--- a/doc/README.avb2
+++ b/doc/README.avb2
@@ -58,6 +58,7 @@ Slot verification result: ERROR_IO
 -----------------------------------
 The following options must be enabled:
 CONFIG_LIBAVB=y
+CONFIG_AVB_VERIFY=y
 CONFIG_CMD_AVB=y