summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-27LFU-296 imx: imx8mq: fix tzasc swap idPeng Fan
i.MX8MQ also needs GPR_TZASC_ID_SWAP_BYPASS set to avoid secure DRAM data leakage, since all i.MX8M has this bit, so we drop the condition check. Also lock the bit. Reviewed-by: Ye Li <ye.li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com>
2022-04-24LF-5899 mx7: Fix build break when tamper enabledYe Li
Missed header file of command.h in iMX7 tamper driver. Fix the build break by add the header file. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2022-04-24MA-20228 Eliminate build warnings on arm32 platformsJi Luo
Eliminate below build warnings on some arm32 platforms: boot/image-android.c: In function 'trailer_exist': boot/image-android.c:62:18: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] return !strncmp((char*)(bootconfig_end_addr - BOOTCONFIG_MAGIC_SIZE), ^ boot/image-android.c: In function 'add_bootconfig_trailer': boot/image-android.c:92:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] memcpy((void *)(end), &bootconfig_size, BOOTCONFIG_SIZE_SIZE); ^ Signed-off-by: Ji Luo <ji.luo@nxp.com>
2022-04-22MA-20225 imx8ulp: guard get_board_serial() with CONFIG_SERIAL_TAGJi Luo
Guard the get_board_serial() for imx8ulp with CONFIG_SERIAL_TAG to align with other platforms. Signed-off-by: Ji Luo <ji.luo@nxp.com>
2022-04-20MA-20210 Set the RDC permission of Domain2 to TEE memory.zhai.he
Add TEE memory to the memory resources managed by RDC. By default, domain2 can only read TEE memory. Change-Id: I90b112f7524bfd1686d45bb9229e2fe9df76d282 Signed-off-by: zhai.he <zhai.he@nxp.com>
2022-04-20MA-19038 Android: Add imx8/imx8m/imx8ulp reference boards supportJi Luo
Add configs to support imx8/imx8m/imx8ulp reference boards, each platform has specific header files include. Test: sanity test on imx8/imx8m/imx8ulp platforms. Change-Id: I05708fbc108a78ac9b3415cb782bf1013e2f7012 Signed-off-by: Ji Luo <ji.luo@nxp.com>
2022-04-20MA-20190 Add init_boot supportJi Luo
Load the platform ramdisk from init_boot partition when it is present. Test: boots with init_boot enabled and disabled. Change-Id: I1a17b0d607a5a929adfb65667b691cedb78c6429 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 107b7e31ffae8f995335fc36a2f5f415c7fb32c9)
2022-04-20MA-20102 relocate ramdisk for address overlapJi Luo
Bootloader gets the ramdisk load address form vendor_boot header which is set at compile time. But sometimes the ramdisk may overlap with kernel/dtb when the kernel image is getting bigger (e.g. enable some debug configs). This commit checks the ramdisk load address before loading ramdisk, relocate the ramdisk to the end of dtb (4K alignment) if there's overlap. Change-Id: I29337e1ccf373a1058f7fcca528c68f7a0207fc6 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit ee42a6178f1623d375cda8e31c7ffb1537391711) (cherry picked from commit 8a49846e360e34987fad8d735d346a5571e549e7)
2022-04-20MA-19871 Set RDC/CSU policy by default for secure video pipelinezhai.he
RDC: DCSS is configured as domain2 by default. Memory policy configured as below. secure memory: Domain 2 read/write. Domain 0 write only. Domain 3 read/write. non-secure memory: Domain 2 read only. Domain 0 read/write. Domain 3 read/write. CSU: When android with tee, the VPU needs to be configured as CSU_SEC_LEVEL_5, that only the TEE kernel is allowed to read and write the VPU. Change-Id: I16b5071f5b6aa92c6f69e0ae1eea7cd74bcb4a9b Signed-off-by: zhai.he <zhai.he@nxp.com>
2022-04-20MA-19864 imx8m: Add RDC config functionsJi Luo
Add RDC config functions so we can config the RDC on i.MX 8MQ in SPL. Signed-off-by: Ji Luo <ji.luo@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> Change-Id: I0cf4b7a11438afa460b9eb486ad865b74df28125 (cherry picked from commit f3033e7d3ecaf15f9026d72c7642b6fd9aff919d)
2022-04-20MA-19823 imx8ulp libavb: get AHAB statusJi Luo
Return the AHAB status (OEM CLOSED or not) for imx8ulp. Signed-off-by: Ji Luo <ji.luo@nxp.com> Change-Id: I602bec992aeae39e92625aa090f5571d7cdc0f1c (cherry picked from commit 85295dfa323a016f8e8dad209be94b5282c5a9bb)
2022-04-20MA-19663 Configure boot security patch levelJi Luo
The boot security patch level should be set in bootloader and it will be returned in the TEE enforced authorization list. After building with the "BOOT_SECURITY_PATCH" set, the boot security patch level would be set as a vbmeta property and would be saved in the vbmeta struct in boot image. This commit would parse the boot security patch level (which is in YYYY-MM-DD format) and pass it to keymaster TA. Test: Set and get boot security patch level && VtsHalKeymasterV4_0Target module run Change-Id: Iac75579c680e8b80b28d3a82cd17cbcd8a93509e Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 8816d0a5327fc5dc1e2460db8185d39e5b2dd9ce)
2022-04-20MA-19553 Guard mppubk extraction functionJi Luo
Guard the mppubk extraction function so it can be disabled for shipping images. Test: run "fastboot oem get-mppubk" with the config enabled and disabled. Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 10c3b9375de2cdcb01b37facd40845e27438cdd1) Change-Id: I603b55fce00fc100bd42a574b1f9672c34045d7b
2022-04-20MA-19357 imx8mq: enhance security for androidJi Luo
Setting the CSU configs to enhance the imx8mq security. And as the ocram space reserved for TF-A is very limited (64 KB), the code size would overflow the limit if setting csu configs in TF-A, so this commit will set it in spl. Signed-off-by: Ji Luo <ji.luo@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> Change-Id: If9d2c20401cb256174aa2e9a72cae2686e58c7bd (cherry picked from commit 9f08e16a291e4d42b6ccb7386b506f6317931bb5)
2022-04-20MA-19440 Support boot header v4Ji Luo
This commit supports booting with boot header v4. Main updates in boot header v4: boot image: 1. "boot signature" would be added to the boot image to help attest the GKI boot image signed by Google. vendor boot image: 1. multiple ramdisk are supported. This commit will only support one default ramdisk loading for now. 2. bootconfig are supported. All build time and run time androidboot.* parameters should be removed from bootargs and should be concatenated right after the ramdisk. Test: boots with boot header v3 and v4. Signed-off-by: Ji Luo <ji.luo@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> Change-Id: I92ea8d593a91fc14b417774956b58a94cc7b3d81 (cherry picked from commit a9bbf7a1586404d691a302bd7fbe7eb99682e261)
2022-04-20MA-19353 Fix compressed kernel boot issueJi Luo
For compressed kernel image, its size should be read from uncompressed image or the size would be wrong. Signed-off-by: Ji Luo <ji.luo@nxp.com> Change-Id: I88a426d2e0b7595e8b20544c81ba26912a54df3b (cherry picked from commit b240b9f0dcfca4cf9ef8d74f03eecc07a4a9eeba)
2022-04-20MA-19340-1 Enable ID attestation for Android12Ji Luo
The ID attestation is supported by default in Trusty OS now, but the format of data is different with the NXP implemented one. This commit abandons the NXP implementation and sync the process and data format with Trusty OS. Test: ID provision and attestation. Signed-off-by: Ji Luo <ji.luo@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> Change-Id: I87d4fe98125858cfac4a997c70fcb66826c5710a (cherry picked from commit 2786fc57541bf15cd8e9855c68b84c6a6521d614)
2022-04-20MA-19331 imx8m: skip JR probe for android in ubootJi Luo
As JR0 is reserved to secure world for HAB (secure boot), commit 'ed618ce6a9 (LFU-219)' switch to use JR1 in uboot. But this will cause conflict with Android as JR1 is assigned to secure world for Trusty OS. Since android doesn't use CAAM in uboot so we just skip the JR probe in uboot to avoid conflicts. Test: Boots on imx8mp. Signed-off-by: Ji Luo <ji.luo@nxp.com> Reviewed-by: Gaurav Jain <gaurav.jain@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 8fdf9c32919e3a4ea671d47c19819321c3c09c9b) Change-Id: Ic79a54f90ecf8ed55140fc45b731716664180fd5
2022-04-20MA-19048-1 MCU security enhancementJi Luo
Move the MCU RDC config to dts, it will be parsed by SPL and stored in OCRAM_S, then the MCU RDC config will be setup before MCU kicking. Use HAB to verify the MCU image to guarantee its integrity. Change-Id: I82dd378a6516b4d3cc47c5de2e403d817ba80256 Signed-off-by: Ji Luo <ji.luo@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 2e972e4aa6c44eec0444d59d11c0a0c175699cf2)
2022-04-20MA-19209-2 Support trusty for imx8ulpJi Luo
Make change to support trusty on imx8ulp. Signed-off-by: Ji Luo <ji.luo@nxp.com> Change-Id: Ie3da6f6b1203d1b85a41609600613bdd8baa55c7 (cherry picked from commit 99e3b70f570db66a4228238f3192de57651c03a3)
2022-04-20MA-19231 Remove deprecated do_boota()Ji Luo
The do_boota() implementation without AVB support has been deprecated for a long time, do some cleanup to avoid confusion. Test: buildman build. Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 48c2eeff75627ef95568c66c2ea5eae7e5e0b801) Change-Id: I874e271f5bb7d84777ce4c9bf536361d0247392e
2022-04-20MA-19082-2 imx8m: Use Trusty OS handle SNVS operationJi Luo
This patch added Trusty OS in u-boot to handle some snvs related operation. Change-Id: Iba2b9e12381ce537b40959f14e831accbdecba8f Signed-off-by: Haoran.Wang <elven.wang@nxp.com> Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit ea729b07661bf849cdbd6ca7c3f6c9948fd38dc7)
2022-04-20MA-19065-1 Support widevine keybox provisionJi Luo
support widevine keybox provisioning via hwcrypto, the keybox would be wrote into secure storage. This commit supports two kinds of widevine keybox provisioning: plain text keybox and encrypted keybox. Command to provision the plain text keybox: $ fastboot stage <path-to-plain-text-keybox> $ fastboot oem provision-wv-keybox Command to provision the encrypted text keybox: $ fastboot stage <path-to-encrypted-keybox> $ fastboot oem provision-wv-keybox-enc Test: plain text/encrypted keybox provisioning on imx8mp. Change-Id: I241afade415fc3e2b0a80d286b3cc4e8d702e620 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit d7a760613efbeeea83ca4b8d9949941050e15805)
2022-04-20MA-19068 android auto: get right kernel sizeJi Luo
Pass the correct kernel address for android auto so uboot can get correct kernel size. Change-Id: I20b6501bbc401c5a1d5752179e00b3b9875a10a2 Signed-off-by: Ji Luo <ji.luo@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 6c3e9fbf53d4df861b5b17d339c3ce0a1b630868)
2022-04-20MA-19067 android: skip optee dtb node handlingJi Luo
Android doesn't use optee so skip optee dtb node handling. Change-Id: I30bf91a62fe774dbae0d219fd17405feed6f0784 Signed-off-by: Ji Luo <ji.luo@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 4fd9870d55faadec1f19e29b6b620225bb821418)
2022-04-20MA-19037 imx8mn: Add spl mmc boot supportJi Luo
Android won't boot with boot rom so add spl mmc boot support here. Change-Id: I0d1d9240ed63b99cec6d964ea369ff55865547c5 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 3580b1ad16dd2edaaa1680d6da6517fc7469e2dd)
2022-04-20MA-19036 android: imx8mm: Add 4GB lpddr4 supportJi Luo
Add support for imx8mm evk board with 4GB lpddr4. Change-Id: I8254dfba90ac48a04c38bef21741cdc22d3cd470 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 660c8e1f338509df2833f09332a76478f1d055c9)
2022-04-20MA-19032 android: imx8: don't initialize caam in ubootJi Luo
CAAM JR0/JR1 are reserved for SECO, JR2/JR3 will be used in Trusty OS for android. As Android doesn't need the caam in uboot for imx8q, so bypass the caam JR probe to avoid conflicts. Change-Id: Id4ffe9fbb466abfeadc2c18e4b5d7e1b68360ab5 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 953a61b3f88deeff2c6ca876f79a9a656dc93cba)
2022-04-20MA-19026 Add config to guard rpmb driver in SPLJi Luo
Android will need rpmb operation in SPL, below commit guard the rpmb.c build with CONFIG_SPL_SUPPORT_EMMC_RPMB but didn't add it in the Kconfig: commit 2448c34f9fc26d3c459e6e7b28c6357656bfa287 Author: Heinrich Schuchardt <xypron.glpk@gmx.de> Date: Wed Apr 15 18:28:09 2020 +0200 drivers: mmc: rpmb: do not build for SPL RPMB support is used by the 'mmc rpmb' command and by the OP-TEE support. We do not need it in SPL. This commit will add CONFIG_SPL_SUPPORT_EMMC_RPMB defination and select it by default when trusty is enabled. Change-Id: I8d3b4481d529828cb03328b826e0e7065104ba46 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit b2b4cbadf378c1b72ce7da31457673d298a3584f)
2022-04-20MA-19023 Add is_recovery_key_pressing() for imx8/imx8m/imx8ulpJi Luo
This is_recovery_key_pressing() will simply return as we don't support it on the reference board. Change-Id: I4748450f5d571737aa457662da7c972d613e15df Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 9a4f698436b44a8cd3e83733343efbd44e257fe7)
2022-04-20MA-19022 Remove cmd_tbl_t typedef for imxJi Luo
cmd_tbl_t typedef has been removed by below commit: commit 09140113108541b95d340f3c7b6ee597d31ccc73 Author: Simon Glass <sjg@chromium.org> Date: Sun May 10 11:40:03 2020 -0600 command: Remove the cmd_tbl_t typedef Sync this change for imx platforms. Change-Id: Ia08287658a3471569a92438434f3163ac078a49c Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 8d8a0978421be115be71b0fce01b95f2a1948b5b)
2022-04-20MA-17916-1 Clean Up: Guard codes with correct configsJi Luo
This commit does some clean-up to guard the codes/configs with correct configs, so we can enable/disable the feature without modifying the codes. Test: builds and boots on imx8qm. Signed-off-by: Ji Luo <ji.luo@nxp.com> Change-Id: Ic4cf4d9f47bd5a4317b2621a5378cb4b192e52fb (cherry picked from commit 2c2363e47b858bd178c44869328eca211b2c3f62) (cherry picked from commit cdf01e8a0fbf29df6230344889d1ec5035b6c978) (cherry picked from commit b89b45f60d56b5fe7c138b67792e84cd356bab53)
2022-04-18MA-17046-1 Show orange warning for unlocked deviceJi Luo
According to the google boot flow, an orange warning should be displayed on UNLOCKED device to reminder the users of the potential risks. This commit will show an orange warning logo and warning text on the screen, it shall be dismissed after 3 seconds, users can also skip it by pressing the ON-OFF button. Config 'CONFIG_AVB_WARNING_LOGO_COLS' and 'CONFIG_AVB_WARNING_LOGO_ROWS' define the (x, y) position of the warning logo, its default value is for 1080*720 resolution display and can be overridden. Test: Orange warning logo show on all imx8m/imx8q platfroms. Change-Id: I607edb3da039b47ddfac681f855834d8da187af8 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 8ddefdb1186feb3580830fa04b588d3ee606cf81) (cherry picked from commit fbd21482417c4dc3de16d1689fe899ad11764f71)
2022-04-18MA-17159 Implement bootloader menu for imx7ulpJi Luo
According to the spec of android wear, the device MUST provides a bootloader menu for debugging purpose. This commit implements a simple bootloader menu based on imx7ulp_evk revb board, the menu will show when booting with 'VOL+' key pressed, users can press "VOL+" to choose the item, then press "ONOFF" key to confirm. Test: bootloader menu show on imx7ulp_evk revb. Change-Id: I80638a43afa17e312e633b05888c62440380b42b Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 9d5995caf7146d4955fba2524a7f25d761049e28) (cherry picked from commit 0e9dfdfc5e06b2897c4471ac6d29a70218e4f11c)
2022-04-18MA-18914 Don't load key from RPMB in hard-code caseJi Luo
Use hard-code public key instead of reading it from RPMB When "CONFIG_LOAD_KEY_FROM_RPMB" is setting to "n". Test: Boots on imx8mp. Change-Id: I701777a0cfe3790a4e38f2cbe858e1fbddc2552a Signed-off-by: Ji Luo <ji.luo@nxp.com> Reviewed-by: Wang Haoran <elven.wang@nxp.com> (cherry picked from commit 740eaa338b656b20611affb22572fe0a2253161d) (cherry picked from commit acf95d07b8d85efa7091cd8a361275c03d78b2fe)
2022-04-18MA-18913 Load dtb according to kernel addressJi Luo
As the kernel image will get bigger after enabling some debug tools, 64MB kernel max size is not enough. Load the dtb to the address right after linux kernel instead of setting fixed offset to the start of kernel image. The "kernel_size" in boot image header is the physical size of "Image" instead of the memory size which the linux requires to boot. Test: boots on imx8mp/imx8qm. Change-Id: I5946c8530610ff0742f2a911aaeccf7636938b94 Signed-off-by: Ji Luo <ji.luo@nxp.com> Reviewed-by: Wang Haoran <elven.wang@nxp.com> (cherry picked from commit c1f83790077516a64397467fce5880be0871f615) (cherry picked from commit 27badbeb3b47c1151cc4d4eab3675ee839b5f716)
2022-04-18MA-18775 system will hang about 3s when boot up kernelzhang sanshan
system will hang at line 1834 which will hold console_waiter 1833 /* Owner will clear console_waiter on hand off */ 1834 while (READ_ONCE(console_waiter)) 1835 cpu_relax(); 1836 spin_release(&console_owner_dep_map, _THIS_IP_); It means console_lock_spinning_disable_and_check is not called in time. So console_unlock may not called in time. remove earlycon as workaround. Change-Id: I5742c0ade6e289d1a96a67b27b4e55f2e1732187 Signed-off-by: zhang sanshan <pete.zhang@nxp.com> (cherry picked from commit 74938a70b5fece2d1f3f60e74596f393a40e5713) (cherry picked from commit 9be7570228e5ede0b1ab0b015210aeb56585e39c) (cherry picked from commit 581fd80c340e4ea5d6ecf778ddf14b48309dc657)
2022-04-18MA-18680-2 Support derive rpmb key from BKEKJi Luo
The BKEK will bind to the soc chip and we don't need to store the encapsulated keyslot after using BKEK as the rpmb key, which reduces the risk of losing the rpmb key. This commit adds two commands to support derive the rpmb key from BKEK and erase the rpmb storage (for debug purpose, need support from trusty): $ fastboot oem set-rpmb-hardware-key $ fastboot oem erase-rpmb Legacy keyslot way is still supported and boards programed with keyslot can still work in compatible way. Command to set provisioned rpmb key is changed to: $ fastboot stage <rpmb-key> $ fastboot oem set-rpmb-staged-key Test: Key set and boot on imx8mn/imx8qxp. Change-Id: Ifc88010fe8802d3550e42dff0bbd5a5e5ad922a3 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 0fd1b5e41645ac3f5c05ad82258df1645c59fb5a) (cherry picked from commit 6a5125b9caf4c2e036853d8f53f8398c147758b3) (cherry picked from commit ca4258ca0702e082ad975e08ee33fd05d518b690)
2022-04-18MA-18634-1 Android: refine config dependencyJi Luo
Refine the dependency of some configs to make it easier to add/modify android config files. Test: builds. Change-Id: Iccb044dadc7ce1e0b839bf83e2e9157e718f286c Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 86f4f99a367bbc0ef99d4ab2a0b4078babfbfbd2) (cherry picked from commit 8f3e86b52a27948ba1be1d93dae5e5a4c8a73a0a) (cherry picked from commit ff17b410ea60f6450c2ef9342a5b9e55e1929470)
2022-04-18MA-18508 Sync keymaster bootloader commands IDJi Luo
AOSP adds command 'KM_CLEAR_ATTESTATION_CERT_CHAIN' to clear the attestation cert chain, but its ID will conflict with 'KM_SET_ATTESTATION_KEY_ENC'. This commit will reorder the keymaster commands to avoid conflicts. Test: ID attestation provision. Change-Id: I0046b5bee4e0ffea3bdcff31859452da53d8e50d Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit e19aa1c26047dc719e7561695100dac807925ae7) (cherry picked from commit b9a1bcaea22da0491df322b36740d7498e39cd38) (cherry picked from commit fe937af1aaa05a211e0af67d52c2ced0e944b9f5)
2022-04-18MA-18422 Locate the misc partition by nameJi Luo
Locating the misc partition by ID can help reduce the boot time but error may happen if the ID of the misc partition is changed. Moving the misc partition to the start of the GPT and locate the partition by name is another option but it will break the backward compatibility as the GPT is changed. part_get_info_by_name() will loop the PTE and return the matched partition info, but it will cost much time as it will reload the whole PTE from storage in each loop. This commit provides part_get_info_efi_by_name() to support return the partition info by name without reloading the whole PTE. Test: A/B slot switch in dual bootloader. Change-Id: I13cb2a7b3217f73aecc2aec6e06abc0d6e8abcdd Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit cd8f603f0d977ed73f0d0b44437c5c68fcebde25) (cherry picked from commit d9972736dc0272377f89ccf528e8a873199c7903) (cherry picked from commit 945bde8da972c30b87027b43a42b21035707fea7)
2022-04-18MA-18352-5 Support device IDs provisionJi Luo
The device IDs are provisioned from bootloader, this commit add commands to provision the deivce IDs: $ fastboot oem append-device-id Test: Device IDs provision and attest. Change-Id: Id3c737d3da02f7ba463e51b0525f3cb9bcf0c6d1 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 7575ac07ac625c35269868511297385a69c96196) (cherry picked from commit 7f300b1fc543d8f4cbe7329a78e31273678162a5) (cherry picked from commit 9cef720d338cd24edcf59d957543a5ff82eef4ac)
2022-04-18MA-18392-2 pass imx8 soc revision info to kernelfaqiang.zhu
pass imx8 soc revision info to kernel so it can be used to judge bootloader0 partition offset in postinstall command and update the partition. Change-Id: Ifc4d3d2abe8a694d7ec6f368c3e56f3d175982e5 Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com> (cherry picked from commit cc51505010505ad39a12c07e7405bb992407d927) (cherry picked from commit ca6530da25c826ff400b372333f46c3ad026db00) (cherry picked from commit e99b84da4f667cba52fdccab4c7a589151d83085)
2022-04-18MA-18406 Fix panic when provision keys on boards without rpmb keyJi Luo
The keymaster client won't be initialized if the rpmb key is not set, return early with error in such case to avoid panic. Test: provision attestation keys & certs on boards without rpmb key set. Change-Id: I6f908aecafd15ab390629cb89b090c9ee817ba1e Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit b999b03c3eb153a99b481e42315e048653247107) (cherry picked from commit 8e2cacff502629d88d5dd49baae3e547728e7af7) (cherry picked from commit ca81aac985b80f614e422e1834ca209a50ad45b1)
2022-04-18MA-16954 set partition type to efi after flash gpt partitionfaqiang.zhu
If the target device have DOS partition, uboot will save the partition type as dos partition at early stage when the driver bind the device. After the gpt partition is flashed, uboot will try to reload the DOS partition, instead of the the EFI partition. In this commit, if the GPT partition is successfully flashed, set the partition type to be PART_TYPE_EFI if necessary, so the EFI partitions will be reloaded. Change-Id: I6095cb56c73aecee24f76d169db89daba3783e29 Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com> (cherry picked from commit 62becd667e5f3ebbefef796818eda78f4d0e167b) (cherry picked from commit 358efa24b714738ce145fa60f0b4d194b68c4c49) (cherry picked from commit beef004c1daa5494f590c3307e7cb28d460a65eb)
2022-04-18MA-18325 Pad keyslot_package struct to one block sizeJi Luo
blk_dwrite() will write data in blocks, padding the keyslot_package struct to one block to avoid redundant data write. Test: RPMB key set. Change-Id: I326d7f4394d15e6e22b12c3abd6a5e2de18920cc Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 8a0deb19628d2752b516fbce00fc1b988f2e78b5) (cherry picked from commit baaa810e604aa3afd8cf9832a5b29828d6ffc6f4) (cherry picked from commit 921c67e1dac7de63f274339510366af128bcba6b)
2022-04-18MA-18304 pass ramdisk address when boot up evk_7ulpfaqiang.zhu
evk_7ulp images has normal ramdisk in boot.img and recovery ramdisk in recovery.img. Normal ramdisk in boot.img is used to boot up Android, ramdisk addr need to be passed to kernel any way. Recovery ramdisk in recovery.img is not used to boot up Android, there is no need to pass "androidboot.force_normal_boot=1". Change-Id: Id1e9c31035cbf65cd325c70a0aa9df05ea1d90b2 Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com> (cherry picked from commit 3f4d826944f7f0db9251cf26f6f65014ca3f5e8a) (cherry picked from commit 6ecfd9ed2af555f589c7cdfe32134ea1e6a41d80) (cherry picked from commit b7d26e7516d817db354066074844bf1d5706df60)
2022-04-18MA-18214-1 Hard code the BT mac address for imx8mpJi Luo
imx8mp has serial number as all zeros, hard code the BT mac address for such case instead of setting it by property. Test: BT on imx8mp. Change-Id: I99f5b49164e1fa40c7fc6ecb639c71fa89158852 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 501690cb93c4df30700c1bf40f0f2eaed2444503) (cherry picked from commit 312109135045b450d57c3095a822db827a587be6) (cherry picked from commit 31f0ec99bb753ae357d4da442d3497e651a77427)
2022-04-18MA-18221 Fix build break for imx7ulpJi Luo
GCC for arm32 doesn't support division between signed and unsigned integer. Clean up the code to use 'long' for both arm32 and arm64 platforms. Test: build on 7ulp and 8mm. Change-Id: I21c23b1948994558237b27bfe7452e78e3d45172 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 2062183df063e0653e9e88a690764647702af7dd) (cherry picked from commit 49aad2989b6256934b146c50af5cf26b7486d658) (cherry picked from commit dee550412c2da98061a726e64781f75aa69ee38a)
2022-04-18MA-18192 Only bump the rollback index when avb verify okJi Luo
AVB verify should fail for GKI boot image but we should allow it continue to boot in UNLOCKED state. In such case, we should not update the stored rollback index. This commit will update the rollback index only when the AVB verify is OK to prevent rollback index check error. Test: boots. Signed-off-by: Ji Luo <ji.luo@nxp.com> Change-Id: I82678d288edd4df6de40a1ca863ed36d3b3658a8 (cherry picked from commit ea48b544581d630bc031a7968a90b2fcf328424a) (cherry picked from commit 8619089859b6c24f82a2f6fda9bd2c58c2e38851) (cherry picked from commit 5893d8707dd66e0f36bc6dbd7c805cd20c05f725)
generated by cgit v1.2.3 (git 2.0.4) at 2024-09-17 10:12:23 +0000