17 Jan, 2021
1 commit
-
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
(cherry picked from commit 86f4f99a367bbc0ef99d4ab2a0b4078babfbfbd2)
14 Jan, 2021
2 commits
-
We will test a program on BEE enabled region, so remove XN bit
to allow execution when current MMU domain is changed to client.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit e4bd1734bcba2012d4d7dea7598635256f155c96) -
Default ARM32 MMU setting in u-boot sets XN bit to entire 4GB space no
matter which DCACHE option is used, and set domain permission to manager.
This causes MMU ignores the access check and XN bit, so speculative
instruction can fetch from entire space.This patch sets the DDR, ROM, OCRAM without XN bit, and set domain to client
to enable the XN and access check. So speculative instruction fetch can only
happens on these 3 regions to avoid prefetch from peripherals and invalid
regions.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 25d70768c460bad91aa65f367203af41122399cd)
08 Jan, 2021
11 commits
-
Default reset_cpu in imx_watchdog driver is clearing the WDA bit
to assert WDOG_B output. However, this requires the iomuxc for the WDOG_B
is configured by board codes or DTS. Without it, next external reset
with WDOG_B iomuxc configured will not work.On iMX6, we always use internal reset to support some features like bmode.
So the iomuxc for WDOG_B never be set. Change back the reset_cpu to use
internal reset.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit aa97f1de484a165212cec56bd8ed38227c8f828a) -
Add trusty support to the imx8mp powersave config.
Change-Id: I269f565f9c50a3db4c4138fca9279d8aa7c47043
Signed-off-by: zhai.he
(cherry picked from commit bdf8f5abca965039f54cba8c9e8e5fbafcb14e6a) -
Add uboot defconfig to load hdmi rx firmware
Signed-off-by: yang.tianChange-Id: If9ab1b40c01442570a7ba8599ab521a3e38349cc
(cherry picked from commit cbd3d0f18a9b71374195b17eb6f59bb42fa656f5) -
VDD SOC normal run changed to 0.85V
LPDDR4 freq0 change from 4000MTS to 2400MTSChange-Id: I69676ea5b582a817fb3c367bd861db96ba647540
(cherry picked from commit 1205f1edfaed1383181d4d52344cc55e5e92a351) -
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
(cherry picked from commit e19aa1c26047dc719e7561695100dac807925ae7) -
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
(cherry picked from commit cd8f603f0d977ed73f0d0b44437c5c68fcebde25) -
This commit fixes Coverity Issue: 11468195, avoid
uninitialized value using.Test: AVB check.
Change-Id: I04eb8faafd6c9a9fec1aeae0b29edc6940251094
Signed-off-by: Ji Luo
(cherry picked from commit 742cc182bf9d0d0a7c8cecdac2a328e5c0bd64cb) -
Enable configs to support ID attestation.
Change-Id: I1478d4981e7a1a10e11e4e71dcbfd49c64331a9d
Signed-off-by: Ji Luo
(cherry picked from commit a9ee1ce64fe5b1a79cfcd3ae1da9ed8acaa645fb) -
The device IDs are provisioned from bootloader, this commit
add commands to provision the deivce IDs:
$ fastboot oem append-device-idTest: Device IDs provision and attest.
Change-Id: Id3c737d3da02f7ba463e51b0525f3cb9bcf0c6d1
Signed-off-by: Ji Luo
(cherry picked from commit 7575ac07ac625c35269868511297385a69c96196) -
The values printed for DCD block have wrong order. To follow CSF
authenticate data format, the first value should be load address,
second value is file offset.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit f3fd88408eb14a337b74ba4428c6e9df92934ecb) -
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
(cherry picked from commit cc51505010505ad39a12c07e7405bb992407d927)
21 Dec, 2020
1 commit
-
* origin/imx_uboot:
MA-18406 Fix panic when provision keys on boards without rpmb key
MA-16954 set partition type to efi after flash gpt partition
MLK-25046 imx: bee: Fix build warning of flush_dcache_range
MA-18325 Pad keyslot_package struct to one block size
MA-18304 pass ramdisk address when boot up evk_7ulp
11 Dec, 2020
5 commits
-
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
(cherry picked from commit b999b03c3eb153a99b481e42315e048653247107) -
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
(cherry picked from commit 62becd667e5f3ebbefef796818eda78f4d0e167b) -
Fix below build warning when enabling BEE config on iMX6UL EVK board.
arch/arm/mach-imx/mx6/bee.c: In function ‘bee_test’:
arch/arm/mach-imx/mx6/bee.c:201:2: warning: implicit declaration of
function ‘flush_dcache_range’; did yomean ‘check_cache_range’?
[-Wimplicit-function-declaration]
201 | flush_dcache_range(address, address + range);
| ^~~~~~~~~~~~~~~~~~
| check_cache_rangeSigned-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 134d22e59af3931d283c123c1aa3fc44cb86761d) -
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
(cherry picked from commit 8a0deb19628d2752b516fbce00fc1b988f2e78b5) -
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
(cherry picked from commit 3f4d826944f7f0db9251cf26f6f65014ca3f5e8a)
10 Dec, 2020
3 commits
-
* origin/dn_uboot:
watchdog: sbsa: timeout should be in "millisecond"
usb: xhci: Fix armv7 compile warning -
timeout should be in "millisecond" instead of second,
so divided it by 1000 when calculate the load value.Signed-off-by: Zhao Qiang
-
drivers/usb/host/xhci-ring.c: In function 'xhci_bulk_tx':
drivers/usb/host/xhci-ring.c:726:6: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
726 | if ((void *)le64_to_cpu(event->trans_event.buffer) != last_transfer_trb_addr) {
| ^Signed-off-by: Ran Wang
20 Nov, 2020
3 commits
-
* origin/dn_uboot: (14 commits)
Revert "mmc: move mmc_power_cycle() after controller initialization"
Revert "mmc: rework mmc_set_initial_state"
board: freescale: vid.c: add parantheses to fix build warning
net: pfe_eth: read PFE ESBC header flash with spi_flash_read API
lx2160a: Fix address for secure boot headers
... -
Use the struct lpspi when it is not a NULL ptr.
Reviewed-by: Fugang Duan
Signed-off-by: Clark Wang
(cherry picked from commit 697198f65dba420534e8df1d5443f0b0869cc31f) -
TEE memory region are moved to 0x56000000 ~ 0x58000000 to
support i.MX 8MN DDR3L board:TEE-619 imx: 8mn: add support for i.MX 8MN DDR3L EVK
DD3L EVK board only has 512MB of DDR.
move OP-TEE mapping for all the 8MN boards.Signed-off-by: Silvano di Ninno
Adjust the fastboot buffer region to avoid conflicts.
Test: Super partition flash on imx8mn.
Change-Id: I56bd0194f24f9f267f436b4b6d762948d96bf815
Signed-off-by: Ji Luo
(cherry picked from commit e70c3875de6060cd3ab983fdc6cc207c45e646a7)
19 Nov, 2020
5 commits
-
This reverts commit db5e48bab9ef90b05da8c4ad396a9a959506b2fe.
The changes needs rework to work on i.mx devices
LFU-40Signed-off-by: Priyanka Jain
-
This reverts commit ef959d695523c391a68093550a3bfb8714ab7ac9.
The changes needs rework to work on i.mx devices
LFU-40Signed-off-by: Priyanka Jain
-
To avoid u-boot MMU table overlap M4 RPMSG vring buffer, reserve
the top 1MB DDR.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit e00224b10c9ce10c76fa9ba452d88565bee7024a) -
To avoid u-boot MMU table overlap M4 RPMSG vring buffer. Reserve
the top 1MB DDR when bootaux is enabled.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 44cf26781117c484e5f7e46fe6008c0b31c297e4) -
When booting with M4 RPMSG demo in u-boot, the M4 will use top 1MB
DDR for RPMSG vring buffer. This overlaps with u-boot MMU table and
modifies some MMU entries.
On mx7dsabresd, this cause u-boot failed to access LCDIF registers
due to the wrong MMU entries.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 8a03d17c92cc04765c6b93f716ea081486fd15f0)
16 Nov, 2020
5 commits
-
Low drive mode needs to update GPU freq in kernel DTB. But 5.4 and 5.10
kernel are using different GPU node pathes. Update low_drive_gpu_freq
to support both two paths.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit cb1c6e4279030b859133b9e4e4a0fb2c3e3cd45c) -
For dual core and single core iMX8M parts, the thermal node and PMU node
in kernel DTB also needs update to remove the refers to deleted core nodes.
Otherwise both driver will fail to work.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 5434603dc85553f353a127594ca764c06e54de0a) -
There are 3 part numbers for 11x11 i.MX8MNano with different core number
configuration: UltraLite Quad/Dual/SoloComparing with i.MX8MN Lite parts, they have MIPI DSI disabled. So
checking the MIPI DSI disable fuse to recognize these parts.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 05af9ac08052c92d011908726534e227db3143c4) -
On imx6Q/imx6DL, we find if config the DTOCV to 0~3, it will impact
cmd6 behavior, after cmd6 get transfer complete interrupt, the data0
line will keep low over 5 seconds. This should be a IC bug on imx6Q/DL.
For other platforms, do not has this issue.To fix this issue, fix the DTOCV to 0xE, the max setting, this also align
with Linux configuration.Signed-off-by: Haibo Chen
Reviewed-by: Ye Li
(cherry picked from commit 6df53e27277d43353cfffd895b7b1c1e1b847ab3) -
Since optee has moved to 0x56000000 on iMX8MN EVK. So mtest address
will conflict with optee and u-boot relocation. Set the mtest space
after the optee reserved region and adjust size for 1GB DDR3L EVK.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 96d1791189f1cd4a81e77f7b39d21fa160236981)
09 Nov, 2020
4 commits
-
Add "cpufreq.default_governor=SCHEDUTIL" to iMX8QM MEK bootargs, so that
v5.10 kernel can uses schedutil cpufreq governor as default.Signed-off-by: Ye Li
Reviewed-by: Anson Huang -
Two LCD data pins (D16 and D17) are missed in DTS to cause color issue,
also update pad setting to align with kernel.Signed-off-by: Ye Li
Acked-by: Peng Fan
(cherry picked from commit 90cf964cb4daebd66d5b8b0af944e2a2282b13d5) -
The value of Unique ID in uboot and kernel is different for iMX8MP:
serial#=02e1444a0002aaff
root@imx8mpevk:/sys/devices/soc0# cat soc_uid
D699300002E1444AThe reason is that Fuse Addresses of Unique ID of iMX8MP are 0x420 and
0x430.Reviewed-by: Ye Li
Signed-off-by: Alice Guo
(cherry picked from commit 38bcdd0bf78951480cb67e1b9d58b37c364195fc) -
Since iMX8MP LPDDR4 EVK uses OD for VDD_SOC, so we can set GIC clock
to 500Mhz to align with kernel. For DDR4 EVK, uses default 400Mhz for
ND VDD_SOC.
Move the codes from SOC codes to board level to match with voltage
setting.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit ba50b01b74873cbddaeba61f69e7763a8ba63227)