diff options
| author | Winter Wang <wente.wang@nxp.com> | 2016-11-23 17:01:22 +0800 |
|---|---|---|
| committer | Winter Wang <wente.wang@nxp.com> | 2016-11-23 17:05:50 +0800 |
| commit | 00f16f9754f59984bbbba52eb42de525ca994971 (patch) | |
| tree | 6c1377c37a48fe59c9d072af2a6f523156d62a6b | |
| parent | ed19ae430eb769322d8b353c621a056f0b54e48a (diff) | |
| download | u-boot-imx-00f16f9754f59984bbbba52eb42de525ca994971.zip u-boot-imx-00f16f9754f59984bbbba52eb42de525ca994971.tar.gz u-boot-imx-00f16f9754f59984bbbba52eb42de525ca994971.tar.bz2 | |
libavb: fsl: use fsl_avb.h as top level header
google split A/B metadata management and slot verify to 2 libs,
move fsl_avb on top of them to use libavb/libavb_ab.
Change-Id: I02518d12208ec0df7f63f1da74684b6da5473aec
Signed-off-by: Winter Wang <wente.wang@nxp.com>
| -rw-r--r-- | drivers/usb/gadget/f_fastboot.c | 2 | ||||
| -rw-r--r-- | include/fsl_avb.h (renamed from lib/avb/fsl/fsl_avb.h) | 2 | ||||
| -rw-r--r-- | lib/avb/fsl/fsl_avb.c | 2 | ||||
| -rw-r--r-- | lib/avb/fsl/fsl_avbkey.c | 2 | ||||
| -rw-r--r-- | lib/avb/fsl/fsl_bootctl.c | 2 | ||||
| -rw-r--r-- | lib/avb/libavb_ab/libavb_ab.h (renamed from include/libavb_ab.h) | 8 |
6 files changed, 8 insertions, 10 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index ab00dd7..990f539 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -48,7 +48,7 @@ #endif #ifdef CONFIG_AVB_SUPPORT -#include <libavb_ab.h> +#include <fsl_avb.h> #endif #define FASTBOOT_VERSION "0.4" diff --git a/lib/avb/fsl/fsl_avb.h b/include/fsl_avb.h index 2230931..bcd2536 100644 --- a/lib/avb/fsl/fsl_avb.h +++ b/include/fsl_avb.h @@ -7,7 +7,7 @@ #ifndef __FSL_AVB_H__ #define __FSL_AVB_H__ -#include <libavb_ab.h> +#include "../lib/avb/libavb_ab/libavb_ab.h" /* Reads |num_bytes| from offset |offset| from partition with name * |partition| (NUL-terminated UTF-8 string). If |offset| is * negative, its absolute value should be interpreted as the number diff --git a/lib/avb/fsl/fsl_avb.c b/lib/avb/fsl/fsl_avb.c index a1bd160..6068239 100644 --- a/lib/avb/fsl/fsl_avb.c +++ b/lib/avb/fsl/fsl_avb.c @@ -12,7 +12,7 @@ #include <fsl_caam.h> #include "../../../drivers/usb/gadget/fastboot_lock_unlock.h" -#include "fsl_avb.h" +#include <fsl_avb.h> #include "fsl_avbkey.h" #include "debug.h" diff --git a/lib/avb/fsl/fsl_avbkey.c b/lib/avb/fsl/fsl_avbkey.c index db0f068..c3ac7b3 100644 --- a/lib/avb/fsl/fsl_avbkey.c +++ b/lib/avb/fsl/fsl_avbkey.c @@ -9,7 +9,7 @@ #include <fsl_caam.h> #include <fuse.h> -#include "fsl_avb.h" +#include <fsl_avb.h> #include "fsl_avbkey.h" #include "debug.h" diff --git a/lib/avb/fsl/fsl_bootctl.c b/lib/avb/fsl/fsl_bootctl.c index 94392cf..26ff7da 100644 --- a/lib/avb/fsl/fsl_bootctl.c +++ b/lib/avb/fsl/fsl_bootctl.c @@ -8,7 +8,7 @@ #include <stdlib.h> #include <linux/string.h> -#include "fsl_avb.h" +#include <fsl_avb.h> /* as libavb's bootctl doesn't have the get_var support * we add the getvar support on our side ...*/ diff --git a/include/libavb_ab.h b/lib/avb/libavb_ab/libavb_ab.h index 52a1297..970a040 100644 --- a/include/libavb_ab.h +++ b/lib/avb/libavb_ab/libavb_ab.h @@ -25,7 +25,7 @@ #ifndef LIBAVB_AB_H_ #define LIBAVB_AB_H_ -#include "../lib/avb/libavb/libavb.h" +#include "../libavb/libavb.h" /* The AVB_INSIDE_LIBAVB_AB_H preprocessor symbol is used to enforce * library users to include only this file. All public interfaces, and @@ -33,10 +33,8 @@ */ #define AVB_INSIDE_LIBAVB_AB_H -#include "../lib/avb/libavb_ab/avb_ab_flow.h" -#include "../lib/avb/libavb_ab/avb_ab_ops.h" +#include "avb_ab_flow.h" +#include "avb_ab_ops.h" #undef AVB_INSIDE_LIBAVB_AB_H -#include "../lib/avb/fsl/fsl_avb.h" - #endif /* LIBAVB_AB_H_ */ |