From: Eugeniu Rosca <roscaeugeniu@gmail.com>
Date: Tue, 14 Aug 2018 00:43:05 +0000 (+0200)
Subject: common: kconfig: Mark AVB_VERIFY as dependent on PARTITION_UUIDS
X-Git-Tag: v2025.01-rc5-pxa1908~3698
X-Git-Url: http://git.dujemihanovic.xyz/img/login.html?a=commitdiff_plain;h=87c814d4c773b1e311b972315c0a5e45fd32362f;p=u-boot.git

common: kconfig: Mark AVB_VERIFY as dependent on PARTITION_UUIDS

Avoid below compiler [1] errors, reproduced with configuration [2]:

common/avb_verify.c: In function ‘get_unique_guid_for_partition’:
common/avb_verify.c:692:31: error: ‘disk_partition_t {aka struct disk_partition}’ has no member named ‘uuid’
  uuid_size = sizeof(part->info.uuid);
                               ^
common/avb_verify.c:696:29: error: ‘disk_partition_t {aka struct disk_partition}’ has no member named ‘uuid’
  memcpy(guid_buf, part->info.uuid, uuid_size);
                             ^
  LD      drivers/built-in.o
make[2]: *** [scripts/Makefile.build:278: common/avb_verify.o] Error 1

[1] aarch64-linux-gnu-gcc (Linaro GCC 7.2-2017.11)
[2] r8a7795_ulcb_defconfig, plus:
    CONFIG_AVB_VERIFY=y
    CONFIG_PARTITION_UUIDS=y
    CONFIG_UDP_FUNCTION_FASTBOOT=y
    CONFIG_LIBAVB=y

Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: Igor Opaniuk <igor.opaniuk@linaro.org>
---

diff --git a/common/Kconfig b/common/Kconfig
index b3d9b37463..3030da4fc9 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -647,6 +647,7 @@ config HASH
 config AVB_VERIFY
 	bool "Build Android Verified Boot operations"
 	depends on LIBAVB && FASTBOOT
+	depends on PARTITION_UUIDS
 	help
 	  This option enables compilation of bootloader-dependent operations,
 	  used by Android Verified Boot 2.0 library (libavb). Includes: