]> git.baikalelectronics.ru Git - uboot.git/commitdiff
common: kconfig: Mark AVB_VERIFY as dependent on PARTITION_UUIDS
authorEugeniu Rosca <roscaeugeniu@gmail.com>
Tue, 14 Aug 2018 00:43:05 +0000 (02:43 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 24 Aug 2018 17:19:53 +0000 (13:19 -0400)
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>
common/Kconfig

index b3d9b37463565d6cecf01e08d8572b5b2ae39ae8..3030da4fc9960c6eb32d13b4f024f21ccca72e6f 100644 (file)
@@ -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: