sysinfo: Move #ifdef so that operations are always defined

[pandora-u-boot.git] / include / avb_verify.h

diff --git a/include/avb_verify.h b/include/avb_verify.h
index eaa60f5..1e787ba 100644 (file)
--- a/include/avb_verify.h
+++ b/include/avb_verify.h
@@ -9,6 +9,7 @@
 #define _AVB_VERIFY_H
 
 #include <../lib/libavb/libavb.h>
+#include <mapmem.h>
 #include <mmc.h>
 
 #define AVB_MAX_ARGS                   1024
@@ -27,13 +28,17 @@ struct AvbOpsData {
        struct AvbOps ops;
        int mmc_dev;
        enum avb_boot_state boot_state;
+#ifdef CONFIG_OPTEE_TA_AVB
+       struct udevice *tee;
+       u32 session;
+#endif
 };
 
 struct mmc_part {
        int dev_num;
        struct mmc *mmc;
        struct blk_desc *mmc_blk;
-       disk_partition_t info;
+       struct disk_partition info;
 };
 
 enum mmc_io_type {
@@ -67,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 (void *)CONFIG_FASTBOOT_BUF_ADDR;
+       return map_sysmem(CONFIG_AVB_BUF_ADDR, CONFIG_AVB_BUF_SIZE);
 }
 
 static inline bool is_buf_unaligned(void *buffer)