diff mbox series

[v2,2/8] avb2.0: integrate avb 2.0 into the build system

Message ID 1528052203-29689-3-git-send-email-igor.opaniuk@linaro.org
State Accepted
Commit 3330584d2c5247d65744939c139160502b4b8c87
Headers show
Series Initial integration of AVB2.0 | expand

Commit Message

Igor Opaniuk June 3, 2018, 6:56 p.m. UTC 
Integrate libavb into the build system. Introduce CONFIG_LIBAVB
build option.

Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>
---
 lib/Kconfig         | 14 ++++++++++++++
 lib/Makefile        |  1 +
 lib/libavb/Makefile | 15 +++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 lib/libavb/Makefile

Comments

Tom Rini June 19, 2018, 6:40 p.m. UTC | #1 
On Sun, Jun 03, 2018 at 09:56:37PM +0300, Igor Opaniuk wrote:

> Integrate libavb into the build system. Introduce CONFIG_LIBAVB

> build option.

> 

> Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>


Applied to u-boot/master, thanks!

-- 
Tom
diff mbox series

Patch

diff --git a/lib/Kconfig b/lib/Kconfig
index 436b90f..0bed93b 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -142,6 +142,20 @@  config TPM
 
 endmenu
 
+menu "Android Verified Boot"
+
+config LIBAVB
+	bool "Android Verified Boot 2.0 support"
+	depends on ANDROID_BOOT_IMAGE
+	default n
+	help
+	  This enables support of Android Verified Boot 2.0 which can be used
+	  to assure the end user of the integrity of the software running on a
+	  device. Introduces such features as boot chain of trust, rollback
+	  protection etc.
+
+endmenu
+
 menu "Hashing Support"
 
 config SHA1
diff --git a/lib/Makefile b/lib/Makefile
index 35da570..2d8480c 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -55,6 +55,7 @@  obj-$(CONFIG_$(SPL_)ZLIB) += zlib/
 obj-$(CONFIG_$(SPL_)GZIP) += gunzip.o
 obj-$(CONFIG_$(SPL_)LZO) += lzo/
 
+obj-$(CONFIG_LIBAVB) += libavb/
 
 obj-$(CONFIG_$(SPL_TPL_)SAVEENV) += qsort.o
 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += libfdt/
diff --git a/lib/libavb/Makefile b/lib/libavb/Makefile
new file mode 100644
index 0000000..c8ff080
--- /dev/null
+++ b/lib/libavb/Makefile
@@ -0,0 +1,15 @@ 
+#
+# (C) Copyright 2017 Linaro Limited
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-$(CONFIG_LIBAVB) += avb_chain_partition_descriptor.o avb_cmdline.o
+obj-$(CONFIG_LIBAVB) += avb_crypto.o avb_footer.o avb_hashtree_descriptor.o
+obj-$(CONFIG_LIBAVB) += avb_property_descriptor.o avb_sha256.o
+obj-$(CONFIG_LIBAVB) += avb_slot_verify.o avb_util.o avb_version.o
+obj-$(CONFIG_LIBAVB) += avb_descriptor.o avb_hash_descriptor.o
+obj-$(CONFIG_LIBAVB) += avb_kernel_cmdline_descriptor.o avb_rsa.o avb_sha512.o
+obj-$(CONFIG_LIBAVB) += avb_sysdeps_posix.o avb_vbmeta_image.o
+
+ccflags-y = -DAVB_COMPILATION