14 Dec, 2018

1 commit

  • Pass bt mac address from uboot cmdline to write
    ro.boot.btmacaddr property for bluetooth hal to parse
    BDADDR which is composed from ro.boot.serialno,
    or it will fall back to persist property seted in init.rc.

    Change-Id: If6886596c79c699b8530d3249b1cc98f19aad51f
    Signed-off-by: yang.tian

    yang.tian
     

12 Dec, 2018

1 commit

  • Open configs to enable trusty for imx8mm_evk and also
    add new config imx8mm_evk_android_trusty_defconfig based
    on imx8mm_evk_android_defconfig.

    Test: Trusty starts ok.

    Change-Id: Iaea90de21f886ed23082a5e8e8d2fa7fb139a9cb
    Signed-off-by: Ji Luo

    Ji Luo
     

04 Dec, 2018

1 commit

  • Secure storage is ready in trusty so we should read/write the rollback
    index from rpmb.
    But for borads without rpmb key, read/write the rpmb will fail and will
    block the following avb verify process. In this case, check if the rpmb
    key has been set and always return AVB_IO_RESULT_OK for the boards without
    rpmb key.

    Test: build and boot pass on imx8qm_mek.

    Change-Id: I10c438e56d049ae97ebedfc446c8202642630d8b
    Signed-off-by: Ji Luo

    Ji Luo
     

28 Nov, 2018

1 commit

  • compile waring info is as below:
    arch/arm/mach-imx/imx8/parser.c: In function ‘mmc_load_image_parse_container’:
    arch/arm/mach-imx/imx8/parser.c:244:1: warning: control reaches end of non-void function [-Wreturn-type]
    }
    ^

    previouse patch change ID:
    I40a791d5b5b1eba6a0170d6853626fb546be4b2c

    Change-Id: Ia605df11beab42e720fff6442a11b1e4b25ac209
    Signed-off-by: faqiang.zhu

    faqiang.zhu
     

27 Nov, 2018

1 commit

  • The SPL loads the FIT image FDT part to an address related with the device
    block length. This length is 512 for SD/MMC and is 1 for other devices
    like SDP, NOR, NAND, SPI, etc.
    When signing FIT image, we use fixed address caculated by SD/MMC block length
    to sign FDT part. Thus, when booting through uuu, this causes mismatch and
    gets authentication failed.

    Fix the issue by providing a override function for this FIT buffer address.
    When secure boot is enabled, adjust the addresses of other devices to be same
    with SD/MMC.

    Signed-off-by: Ye Li
    Reviewed-by: Peng Fan
    (cherry picked from commit 710efd3ccb99e144bd30af8e1ee46459b4a54dd6)

    Ye Li
     

23 Nov, 2018

1 commit

  • When booting SPL from SD/MMC, the codes load and parse container image
    first, if its authentication is failed, the flow continues to load and parse
    for FIT image and cause crash in SPL.

    The correct way should stop the booting if authentication is failed, avoid
    trying the FIT image since FIT does not support AHAB on 8QM/QXP.

    Signed-off-by: Ye Li
    Reviewed-by: Peng Fan
    (cherry picked from commit 7843ab1b619d53c24a11f7db10b277287dcd1b11)

    Ye Li
     

21 Nov, 2018

1 commit


14 Nov, 2018

1 commit


12 Nov, 2018

2 commits

  • Trusty image should be loaded to different address for AIY 1G/3G ddr
    board which have different ddr size. Use board id to distinguish
    different baseboard, load trusty image to 0x7e00_0000 for AIY 1G ddr
    board and 0xfe00_0000 for AIY 3G ddr board.

    Test: build and boot Trusty ok for AIY 1G/3G ddr board.

    Change-Id: I62d8a19b13fe19f38075512a6faa4bbb36f74791
    Signed-off-by: Ji Luo

    Ji Luo
     
  • for 1GB ram: cma=296M galcore.contiguousSize=8388608
    for 3GB ram: cma=384M
    Test: Boot successfully on AIY-1G & AIY-3G

    Change-Id: If082d5b751b5a5e06efe301c0b8e49ec4ac3dfb7
    Signed-off-by: faqiang.zhu
    Reviewed-on: http://androidsource.ap.freescale.net/project/5262
    Reviewed-by: Wang Haoran
    Signed-off-by: faqiang.zhu

    faqiang.zhu
     

09 Nov, 2018

1 commit


07 Nov, 2018

1 commit


03 Nov, 2018

2 commits

  • Generate the key blob and store it to the last block of boot1 partition
    after setting the rpmb key. The key blob should be checked in spl and be
    passed to Trusty OS if it's valid. If the key blob are damaged, RPMB
    storage proxy service will return fail and should make the device hang.

    Test: Build and boot ok on imx8qm/qxp.

    Change-Id: Ia274cd72109ab6ae15920e91b2a2008e1f1e667c
    Signed-off-by: Ji Luo

    Ji Luo
     
  • Add implementation necessary for supporting SPL on QXP
    ARM2 board with dynamic offset detection from container header.

    Signed-off-by: Teo Hall

    Teo Hall
     

18 Oct, 2018

1 commit


16 Oct, 2018

1 commit


08 Oct, 2018

1 commit

  • Serial init in board_init_f will cost much time, skip it here
    because the serial will be initialized again in board_init_r
    and it's more faster (after cache is enabled). We will miss
    some logs before the serial is ready but it's ok for Android Auto.
    This commit will save about 190ms on imx8qm.

    Test: boot ok for both imx8qm and imx8qxp.

    Change-Id: If6efdc19794aecda862f22b6fec7f7aba2005766
    Signed-off-by: Ji Luo
    Reviewed-by: Ye Li

    Ji Luo
     

28 Sep, 2018

1 commit

  • VTS need commandline 'androidboot.dtbo_idx='
    to verify fdt overlay. Pass the dtb index as "0" here since we
    only have one dtb in dtbo partition and haven't enabled the dtb
    overlay.

    Test: VTS case "VtsFirmwareDtboVerification#testVerifyOverlay" pass
    on imx8mq and imx8qxp.

    Change-Id: I33b089bf5a945e0b558bbb189b183a38f145dcbe
    Signed-off-by: Ji Luo

    Ji Luo
     

27 Sep, 2018

1 commit


26 Sep, 2018

1 commit


18 Sep, 2018

1 commit


13 Sep, 2018

1 commit


11 Sep, 2018

1 commit

  • Read boot reason from SRC(system reset controller) and report
    it to kernel by "androidboot.bootreason=<>" kernel commandline.
    This is enabled on imx6/7/7ulp/8m, imx8 will report default value
    "androidboot.bootreason=reboot" since it can't get such info on
    A core at u-boot stage.

    Test: Boot reason report ok on imx6qp/imx7ulp/imx8qxp.

    Change-Id: I03effaa03bc513bec6153e82c1a04e29c07e7db8
    Signed-off-by: Ji Luo

    Ji Luo
     

04 Sep, 2018

1 commit

  • get_boot_device() for imx6 series can't judge the chips is boot from USB
    or not. So, when use uuu, "bootcmd" parameter will get the same value as
    boot from SD card, so if the SD card has image in it, uboot will not
    enter fastboot mode when use uuu. This patch use is_boot_from_usb(void)
    to judge whether boot from USB then change the "bootcmd" parameter
    accordingly.

    Change-Id: I366aca2e32eab67193f45798abd142b2d5cb86bc
    Signed-off-by: faqiang.zhu

    faqiang.zhu
     

22 Aug, 2018

1 commit


21 Aug, 2018

2 commits

  • If we don't define CONFIG_SPL_FIT_IMAGE_TINY, when loading images from FIT,
    the SPL will record all loadables' info to u-boot's FDT. This causes
    problem when HAB is enabled, because FDT's content is modified before
    we authenticate it.

    Signed-off-by: Ye Li

    Ye Li
     
  • Bootloader image take fit format and the rollback index for bootloader
    is stored at the "rbindex" node, SPL will read the rollback index for
    bootloader and compare it with the one stored in RPMB. The stored
    rollback index will be updated only when current slot pass the verify
    and has been marked as successful.

    Bug:109947126
    Test: Rollback index protection feature works fine for imx8m.

    Change-Id: Ic12db4571287fbcb99e5eba0127e0b09378fa5d6
    Signed-off-by: Luo Ji

    Luo Ji
     

20 Aug, 2018

2 commits


15 Aug, 2018

1 commit


11 Aug, 2018

1 commit


10 Aug, 2018

1 commit


13 Jun, 2018

4 commits


23 May, 2018

1 commit


27 Apr, 2018

3 commits

  • Introduce two board level callback functions to FIT image loading process, and
    a SPL_FIT_FOUND flag to differentiate FIT image or RAW image.

    Implement functions in imx common SPL codes to call HAB funtion
    to authenticate the FIT image. Generally, we have to sign multiple regions
    in FIT image:
    1. Sign FIT FDT data (configuration)
    2. Sign FIT external data (Sub-images)

    Because the CSF supports to sign multiple memory blocks, so that we can use one
    signature to cover all regions in FIT image and only authenticate once.
    The authentication should be done after the entire FIT image is loaded into
    memory including all sub-images.
    We use "-p" option to generate FIT image to reserve a space for FIT IVT
    and FIT CSF, also this help to fix the offset of the external data (u-boot-nodtb.bin,
    ATF, u-boot DTB).

    The signed FIT image layout is as below:
    --------------------------------------------------
    | | | | | | | |
    | FIT | FIT | FIT | | U-BOOT | ATF | U-BOOT |
    | FDT | IVT | CSF | | nodtb.bin | | DTB |
    | | | | | | | |
    --------------------------------------------------

    Signed-off-by: Ye Li
    Reviewed-by: Peng Fan
    (cherry picked from commit 078dd4eed6a04c3db7ec49a1bd1fbc63ebb82e1b)

    Ye Li
     
  • If boot from usb, reset environment to default value.
    Auto apply mfgtools setting and boot mfgtools kernel.

    Only add for mx6, the mx7 and mx7ulp have implemented
    relevant USB functions in soc level.

    Signed-off-by: Ye Li

    Ye Li
     
  • Fix build warning:
    common/lcd.c: In function 'lcd_clear':
    common/lcd.c:166:6: warning: variable 'bg_color' set but not used [-Wunused-but-set-variable]
    int bg_color;
    ^
    common/lcd.c: In function 'lcd_setmem':
    common/lcd.c:296:2: warning: format '%d' expects argument of type 'int', but argument 2 has type 'u_long' [-Wformat=]
    debug("LCD panel info: %d x %d, %d bit/pix\n", panel_info.vl_col,
    ^
    common/lcd.c:296:2: warning: format '%d' expects argument of type 'int', but argument 3 has type 'u_long' [-Wformat=]

    Signed-off-by: Peng Fan
    (cherry picked from commit acfeb43685efb04423ce064c67228d15fa6d3da5)
    (cherry picked from commit 69a7c6f0877f4a984209f1be3e14ed5fe56928ad)

    Peng Fan