summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* libavb: workaround: do not touch A/B metadata in UNLOCKEDWinter Wang2016-11-24-667/+16
| | | | | | | | do the same thing in 927e32925f456345d3d3daa3172a5dea11cabe8f move it to libavb_ab Change-Id: I4125efa842b378b285ed6b61ba827fb8e2679065 Signed-off-by: Winter Wang <wente.wang@nxp.com>
* libavb: fsl: use fsl_avb.h as top level headerWinter Wang2016-11-23-10/+8
| | | | | | | | 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>
* libavb: update avbWinter Wang2016-11-23-88/+852
| | | | | | | | | update avb to: https://android.googlesource.com/platform/external/avb/ commit:baf59e232e48d0111e4b38f74c60c89e6f8f0b14 Change-Id: I4bff97d5bbd819217e25367b69a220400c7095af Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-9043 Append the real selected slot in bootargs_sec envChen Guoyin2016-11-23-1/+3
| | | | | | | | Set the args androidboot.slot_suffix based on the real selected slot in unlock state Change-Id: I83e60a346d52e3fbba708f26595400df1af77383 Signed-off-by: Chen Guoyin <guoyin.chen@nxp.com>
* imx6ul: change PRODUCT_NAME to match board nameWinter Wang2016-11-21-2/+2
| | | | | | | "imx6ul_iopb" for iopb board, "imx6ul_pico" pico board Change-Id: If7ec3afaf4a278a6ec86fbfd863a7632d16beb51 Signed-off-by: Winter Wang <wente.wang@nxp.com>
* libavb: do not touch a/b metadata in UNLOCKWinter Wang2016-11-21-0/+16
| | | | | | | | | avb should not touch a/b metadata in UNLOCK state, otherwise if verifies fail, a/b metadata is set to unbootable and leads to boot from an unbootable slot. Change-Id: I6638e4b1b5c154b01272f1a1c81302b443e0b2d5 Signed-off-by: Winter Wang <wente.wang@nxp.com>
* libavb: fsl: use bootctl to select slot in UNLOCKWinter Wang2016-11-21-10/+45
| | | | | | | | | if avb verifies fail in UNLOCK, modify fsl_bootctl to read a/b metadata, select curr slot based on metadata. Change-Id: Ic34a687bb4eb1f07bf58338ad7a995f241fdeec0 Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-9030 fastboot: getvar return FAIL if var not definedWinter Wang2016-11-21-101/+124
| | | | | | | | | modify get_slotvar in bootctl, buffer contains error string if fails; add FAIL to cb_getvar's response buffer if the input var is not defined. Change-Id: I91d60a434b654030457f1e6e7f3d067bfb179297 Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-9027 libavb: fsl: bootctl: add var 'slot-count'Winter Wang2016-11-18-0/+5
| | | | | | | | return 2 for getvar 'slog-count' as there are 2 slots Change-Id: I273d8d24fccef09ab24a21cae2f4c9028255b118 Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-9027 fastboot: support set_active to 'a' 'b'Winter Wang2016-11-18-16/+23
| | | | | | | | new version of fastboot set_active sends 'a'/'b' instead of '_a'/'_b' Change-Id: I1c56f9401e82cba6801e4eff59d413ce5a2617c7 Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-9012 Support boot commands from bcb infoChen Guoyin2016-11-16-253/+143
| | | | | | | | | | | | | | * Remove recovery/bootloader mode checking based on snvs register * Use the API fastboot_run_bootmode() as the entry to check different boot mode * Set boot mode based on commands stored in bcb structure to align Android's bootloader_message_writer.cpp bootonce-bootloader -- > Fastboot mode boot-recovery -- > Recovery mode * Rename the recovery.c as recovery_keypad.c as only handle keypad Change-Id: If34bee0c78bdca252e33296d61443d01a8fc8e96 Signed-off-by: Chen Guoyin <guoyin.chen@nxp.com>
* MA-9015 fastboot: fix fastboot unlock return failWinter Wang2016-11-16-3/+1
| | | | | | | | | if device has no avbkey partition, rbk idx erase fails in 'fastboot unlock', host will get FAIL although unlock is already done. do not check the rbk idx erase's return Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8986 fastboot: use FASTBOOT_PARTITION_AVBKEY instead of "avbkey"Winter Wang2016-11-16-3/+3
| | | | | | use FASTBOOT_PARTITION_AVBKEY defined in fsl_fastboot.h Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-9007 fastboot: Remove NULL pointer printChen Guoyin2016-11-15-4/+2
| | | | | | | Remove the log in uboot when no valid partition can be found "Partition:'<NULL>' does not exist" Signed-off-by: Chen Guoyin <guoyin.chen@nxp.com>
* MA-9005 fastboot: Support sparse image flashing for oem partitionChen Guoyin2016-11-15-15/+33
| | | | | | | Make all partitions can be flashed by sparse image if it is in raw format Signed-off-by: Chen Guoyin <guoyin.chen@nxp.com>
* MA-8988 imx: imx6ul: iopb: add avb supportWinter Wang2016-11-15-1/+1
| | | | | | change CONFIG_FSL_BOOTCTL to CONFIG_AVB_SUPPORT Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8987 imx: imx6ul: picosom: add avb supportWinter Wang2016-11-15-1/+1
| | | | | | change CONFIG_FSL_BOOTCTL to CONFIG_AVB_SUPPORT Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8986-7 libavb: fsl: use fuse to prevent multiple init avbkeyWinter Wang2016-11-15-0/+37
| | | | | | | CONFIG_AVB_FUSE to PERMANENT write to fuse, or just write/read the shadow fuse register. Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8986-6 image: android: add secondary cmdline generated by avbWinter Wang2016-11-15-7/+19
| | | | | | | | | | | | | | | | avb's verify process adds cmdline from the vbmeta generated by avbtoo's option '-kernel_cmdlines'. this additional kernel cmdline is consist of below items: dm="1 vroot none ro 1,0 ..." androidboot.slot_suffix=_a androidboot.vbmeta.device_state=locked androidboot.vbmeta.hash_alg=sha256 androidboot.vbmeta.size=2944 androidboot.vbmeta.digest=... these items are used either by dm-verity or by system service after boot. Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8986-5 fastboot: add fsl_avb supportWinter Wang2016-11-15-20/+326
| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* MA-8986-4 libavb: modify max num of rollback_index slot to 4Winter Wang2016-11-15-1/+1
| | | | | | modify AVB_MAX_NUMBER_OF_ROLLBACK_INDEX_SLOTS to 4 Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8986-3 libavb: fsl: add fsl_avb related functionsWinter Wang2016-11-15-15/+1262
| | | | | | | | | * add fsl uboot version of AvbOps; * export some bootctl interface from libavb; * save avb public key and rollback index using keyblob encrypted by caam; Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8986-2 libavb: fix build libavbWinter Wang2016-11-15-13/+8
| | | | | | use gun99, add sysdeps for uboot env. Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8986-1 libavb: add libavbWinter Wang2016-11-15-0/+6243
| | | | | | | | | | init libavb from git: https://android.googlesource.com/platform/external/avb/ commit: 4cc9652142693767098d5d96fccc822cefaf63de Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8985-3 fastboot: lock/unlock: fix memory leaksWinter Wang2016-11-15-29/+46
| | | | | | free bdata if needed Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8985-2 fastboot: lock/unlock: use partition name instead of part_indexWinter Wang2016-11-15-18/+46
| | | | | | | use partition name instead of part_index for fbmisc/data/prdata partitions. Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8985-1 fastboot: lock/unlock: use FbLockState/FbLockEnableResultWinter Wang2016-11-15-37/+43
| | | | | | | use type FbLockState for state LOCK/UNLOCK, use type FbLockEnableResult for DISABLE/ENABLE unlock device. Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8984-4 imx: refine header configs for android/brilloWinter Wang2016-11-15-58/+75
| | | | | | unify support for android/brillo. Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8984-3 fastboot: refine fastboot partition related codesWinter Wang2016-11-15-47/+71
| | | | | | unify partition index for GPT/MBR and android/brillo. Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8984-2 fastboot: move partition_table_valid to f_fastboot.cWinter Wang2016-11-15-15/+13
| | | | | | | better move partition_table_valid to f_fastboot as it's not related with lock/unlock function. Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8984-1 bcb: use partition name instead of part_indexWinter Wang2016-11-15-16/+15
| | | | | | | use partition name instead of part_index in rw_block get partition from the ptable loaded by fastboot Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8877 - [brillo] uboot support iopb boardfang hui2016-11-09-0/+1455
| | | | | | | add iopb config in board/freescale/mx6ul_nxpu_iopb add brillo config in include/configs/mx6ul_nxpu_iopb.h Signed-off-by: fang hui <hui.fang@nxp.com>
* MLK-12492-2 ecspi: Add ecspi fuse module check only for MX6Ye Li2016-11-09-0/+2
| | | | | | | Need the CONFIG_MX6 for using the mx6_ecspi_fused funtion, otherwise will break build for other platforms like MX7. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12492-1 mx6: fix type style problems introduced by patch MLK-12483Ye Li2016-11-09-105/+106
| | | | | | | Some type style problems found by review-commits for previous patch MLK-12483, fix them in this patch and re-check. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12483-5 mx6ul: Enable module fuse check EVK board and DDR3 ARM2 boardYe Li2016-11-09-2/+49
| | | | | | | Enable the configurations CONFIG_MODULE_FUSE and CONFIG_OF_SYSTEM_SETUP for module fuse check. And modify board level codes for SD, FEC and EIM. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12483-4 mx6: Modify drivers to disable fused modulesYe Li2016-11-09-8/+94
| | | | | | | | | | Add the fuse checking in drivers, when the module is disabled in fuse, the driver will not work. Changed drivers: BEE, GPMI, APBH-DMA, ESDHC, FEC, QSPI, ECSPI, I2C, USB-EHCI, GIS, LCDIF. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12483-3 mx6: Add a module fuse checkingYe Li2016-11-09-0/+385
| | | | | | | | | | | | | | | Implement a functionality to read the soc fuses and check if any module is fused. For fused module, we have to disable it in u-boot dynamically, and change the its node in FDT to "disabled" status before starting the kernel. In this patch, we implement the ft_system_setup for FDT fixup. This function will be called during boot process or by "fdt systemsetup" command. To enable the module fuse checking, two configurations must be defined: CONFIG_MODULE_FUSE CONFIG_OF_SYSTEM_SETUP Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12483-2 common: Fix uninitialized return value in image_fdtYe Li2016-11-09-1/+2
| | | | | | | When using ft_system_setup, the return value fdt_ret is not assigned, so the fdt_strerror(fdt_ret) uses a uninitialized value. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12483-1 common: Fix fdt command systemsetup issueYe Li2016-11-09-1/+1
| | | | | | | | | The fdt command "fdt systemsetup" can't work because the do_fdt check the start char 's' for command "fdt set". So the fdt systemsetup will also go into the "fdt set" in fault. Fix this problem by checking the whole word "set" for "fdt set" command. Signed-off-by: Ye Li <ye.li@nxp.com>
* MA-8932 fastboot: increase max part num in GPTWinter Wang2016-11-02-0/+8
| | | | | | increase the max part_num to 32 if using GPT Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MLK-13410 Android: Change to set mfgtool only for none android u-bootYe Li2016-11-01-2/+2
| | | | | | | | | The mfgtool environments only can set in BSP u-boot image, not for android u-boot. Since android u-boot may go into fastboot in board_r phase which is earlier than mfgtool environment check. The USB status from android fastboot will cause u-boot to configure mfgtool environment. Signed-off-by: Ye Li <ye.li@nxp.com>
* MA-8851 - [brillo] support "fastboot flash" even on damaged gptfang hui2016-10-14-13/+57
| | | | | | | | . Variable "has-slot:" no need to read_bootctl . If gpt damaged, use lock status in memory . Once gpt change from invalid to valid, call do_fastboot_unlock Signed-off-by: fang hui <hui.fang@nxp.com>
* MA-8840 picosom: change to 512M ddr ramWinter Wang2016-10-13-8/+32
| | | | | | | | | Pin GPIO5_IO01 is for detect 256M/512M version, this pin is pulled high for 512M version and low for 256M version. Just print version check message out . Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8795 Enable config to load FreeRTOS binary from ext4 partitionChen Guoyin2016-09-30-0/+3
| | | | | | Add CONFIG_CMD_FS_GENERIC and CONFIG_CMD_EXT4 Signed-off-by: Chen Guoyin <guoyin.chen@nxp.com>
* MA-8793 - [brillo] support imx7d-emmc boardfang hui2016-09-30-2/+80
| | | | | | | | support iot on imx7d emmc board use gpt partition not use encrypt lock for imx7d Signed-off-by: fang hui <hui.fang@nxp.com>
* MA-8775 picoimx: 'fastboot getvar product' incorrectWinter Wang2016-09-26-1/+1
| | | | | | change PRODUCT_NAME to 'imx6ul' Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8770 - brillo] init slot meta if it's not initedfang hui2016-09-23-5/+39
| | | | | | | Init slot meta if it's not inited, so no need to flash misc.img Signed-off-by: fang hui <hui.fang@nxp.com>
* MA-8763 match fastboot and adb serial numberWinter Wang2016-09-22-1/+1
| | | | | | | Align the fastboot serialno springf format with kernel boot cmdline, which is "%08x%08x". Signed-off-by: Winter Wang <wente.wang@nxp.com>
* MA-8757 - support "fastboot update"fang hui2016-09-21-2/+23
| | | | | | | | | | Get valid serialno. Product name should be set according to the special board. The default name set to "NXP i.MX", For picoimx board, use "picoimx". Signed-off-by: fang hui <hui.fang@nxp.com>
* MA-8624 - [briilo] flash large(> 300M) image to system_a, failedfang hui2016-08-25-0/+4
| | | | | | | on picoimx, DRAM is 256M, change CONFIG_USB_FASTBOOT_BUF_SIZE from 400M to 200M Signed-off-by: fang hui <hui.fang@freescale.com>