diff options
| author | Winter Wang <wente.wang@nxp.com> | 2016-11-01 20:34:05 +0800 |
|---|---|---|
| committer | Winter Wang <wente.wang@nxp.com> | 2016-11-15 13:42:01 +0800 |
| commit | f49a79614bfda6bfa8266ba93a96428a730ef43c (patch) | |
| tree | d7c3deaae758dd0a8f3f9e4241dd4aafb9ce9341 /common/image-android.c | |
| parent | 6307b157ad39c56b52fceff0584d084415abb79f (diff) | |
| download | u-boot-imx-f49a79614bfda6bfa8266ba93a96428a730ef43c.zip u-boot-imx-f49a79614bfda6bfa8266ba93a96428a730ef43c.tar.gz u-boot-imx-f49a79614bfda6bfa8266ba93a96428a730ef43c.tar.bz2 | |
MA-8986-5 fastboot: add fsl_avb support
* support avb in picosom/evk_6ul boards;
* use CONFIG_FSL_BOOTCTL instead of CONFIG_BRILLO_SUPPORT
to separate using FSL version of bootctl or not;
* separate all avb part with CONFIG_AVB_SUPPORT;
* in picosom/evk_6ul board config headers:
modify malloc size as avb needs to load the whole bootimage;
add partition uuid which libavb needs.
* add avb verify in boota;
* add bootctl set_active cb using libavb's interface;
* add bootctl getvar cb using libavb's interface;
* add vbmeta_a/b partition to store vbmeta image, add avbkey
partition to store avb related keyblob;
* add LOCK/UNLOCK for avb;
if in LOCK state, verify fail will cause boot fail;
if in UNLOCK state, verify fail only print a msg and
go on boot the "_a" slot, maybe it's better to use bootctl
to select the bootable slot, but libavb doesn't have this
interface exported.
switch from LOCK to UNLOCK causes a erase of rollback_index
in avbkey partition.
Signed-off-by: Winter Wang <wente.wang@nxp.com>
Diffstat (limited to 'common/image-android.c')
| -rw-r--r-- | common/image-android.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/image-android.c b/common/image-android.c index 6e38519..1688359 100644 --- a/common/image-android.c +++ b/common/image-android.c @@ -15,7 +15,7 @@ static char andr_tmp_str[ANDR_BOOT_ARGS_SIZE + 1]; -#ifdef CONFIG_BRILLO_SUPPORT +#ifdef CONFIG_FSL_BOOTCTL #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include "../drivers/usb/gadget/bootctrl.h" @@ -86,7 +86,7 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify, serialnr.low); #endif -#ifdef CONFIG_BRILLO_SUPPORT +#ifdef CONFIG_FSL_BOOTCTL char suffixStr[64]; sprintf(suffixStr, " androidboot.slot_suffix=%s", get_slot_suffix()); strcat(commandline, suffixStr); |