diff options
| author | Usama Arif <[email protected]> | 2020-08-11 15:46:03 +0100 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-08-24 14:11:13 -0400 |
| commit | e61b41517d2a91080f6416fdfb46efab9e5a55b4 (patch) | |
| tree | 65fa59b6f41798a07cefebcf11c6b0e3e8265510 | |
| parent | 1aa3966173fe92fa3c46638ee8eb8b8491f521d6 (diff) | |
avb: Make AVB independent of fastboot
AVB only uses CONFIG_FASTBOOT_BUF_ADDR from fastboot for memory.
This memory is used for assigning temporary buffers.
This can be assigned a new variable and used as CONFIG_AVB_BUF_ADDR.
This is to support future boards that support AVB but dont support
USB and therefore dont support FASTBOOT.
Signed-off-by: Usama Arif <[email protected]>
Cc: Igor Opaniuk <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
Acked-by: Igor Opaniuk <[email protected]>
[trini: Change defaults]
Signed-off-by: Tom Rini <[email protected]>
| -rw-r--r-- | common/Kconfig | 20 | ||||
| -rw-r--r-- | common/avb_verify.c | 1 | ||||
| -rw-r--r-- | include/avb_verify.h | 4 |
3 files changed, 21 insertions, 4 deletions
diff --git a/common/Kconfig b/common/Kconfig index 8f61aa76024..c58f08ba91b 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1003,7 +1003,7 @@ config HASH config AVB_VERIFY bool "Build Android Verified Boot operations" - depends on LIBAVB && FASTBOOT + depends on LIBAVB depends on PARTITION_UUIDS help This option enables compilation of bootloader-dependent operations, @@ -1012,6 +1012,24 @@ config AVB_VERIFY * Helpers to access MMC, similar to drivers/fastboot/fb_mmc.c. * Helpers to alloc/init/free avb ops. +if AVB_VERIFY + +config AVB_BUF_ADDR + hex "Define AVB buffer address" + default FASTBOOT_BUF_ADDR + help + AVB requires a buffer for memory transactions. This variable defines the + buffer address. + +config AVB_BUF_SIZE + hex "Define AVB buffer SIZE" + default FASTBOOT_BUF_SIZE + help + AVB requires a buffer for memory transactions. This variable defines the + buffer size. + +endif # AVB_VERIFY + config SPL_HASH bool # "Support hashing API (SHA1, SHA256, etc.)" help diff --git a/common/avb_verify.c b/common/avb_verify.c index a2b739626b5..db10d0f21fc 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -7,7 +7,6 @@ #include <avb_verify.h> #include <blk.h> #include <cpu_func.h> -#include <fastboot.h> #include <image.h> #include <malloc.h> #include <part.h> diff --git a/include/avb_verify.h b/include/avb_verify.h index a8d7090f794..1e787ba6668 100644 --- a/include/avb_verify.h +++ b/include/avb_verify.h @@ -72,12 +72,12 @@ static inline uint64_t calc_offset(struct mmc_part *part, int64_t offset) static inline size_t get_sector_buf_size(void) { - return (size_t)CONFIG_FASTBOOT_BUF_SIZE; + return (size_t)CONFIG_AVB_BUF_SIZE; } static inline void *get_sector_buf(void) { - return map_sysmem(CONFIG_FASTBOOT_BUF_ADDR, CONFIG_FASTBOOT_BUF_SIZE); + return map_sysmem(CONFIG_AVB_BUF_ADDR, CONFIG_AVB_BUF_SIZE); } static inline bool is_buf_unaligned(void *buffer) |