05 Feb, 2021
2 commits
-
i.MX8MQ B2 also has fixed value in OCOTP_READ_FUSE_DATA register,
so it does not support "fuse sense" command like B1.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 357cf646bc3b9fc8d3b4f760e030545e83df2cdf) -
i.MX8MQ B2 is using same value in OCOTP_READ_FUSE_DATA like B1, so
we have to check the ROM verision to distinguish the revision.As we have checked the B1 rev for sticky bits work around in
secure boot. So it won't apply on B2.Signed-off-by: Ye Li
Reviewed-by: Peng Fan
(cherry picked from commit 1ac96bde4920fa3e2a3bb4a79b342ca4f5adb4a5)
28 Jan, 2021
3 commits
-
* origin/imx_v2020.04:
MA-18635 Android: eliminate build warnings
MA-18634-2 Android: sync config change
MA-18634-1 Android: refine config dependency -
* origin/ls_v2020.04:
arm: dts: ls1028a: define QDS networking protocol combinations -
Includes DT definition for the following serdes protocols using various
PHY cards: 85xx, 13xx, 65xx, 9999, 7777.Note that the default device tree for QDS now uses 85xx.
Enabling any of the others requires patching the fsl-ls1028a-qds.dtsi
file (the includes at the bottom of the file).Signed-off-by: Alex Marginean
Signed-off-by: Vladimir Oltean
27 Jan, 2021
3 commits
-
* origin/ls_v2020.04:
net: memac_phy: add a timeout to MDIO operations
armv8: lx2: SVR_SOC_VER: Mask CAN_FD and security bit -
We have encountered circumstances when a board design does not include
pull-up resistors on the external MDIO buses which are not used. This
leads to the MDIO data line not being pulled-up, thus the MDIO controller
will always see the line as busy.Without a timeout in the MDIO bus driver, the execution is stuck in an
infinite loop when any access is initiated on that external bus.Add a timeout in the driver so that we are protected in this
circumstance. This is similar to what is being done in the Linux
xgmac_mdio driver.Signed-off-by: Ioana Ciornei
-
Multiple LX2(LX2160A/LX2162A SoC) personality variants
exists based on CAN-FD and security bit in SVR.Currenly SVR_SOC_VER mask only security bit.
Update SVR_SOC_VER to mask CAN_FD and security bit
for LX2 products.Signed-off-by: Wasim Khan
17 Jan, 2021
3 commits
-
Fix warning: unused variable 'status'.
Test: build.
Change-Id: I948a33686892f940d6be0e315756c23e0ae561ae
Signed-off-by: Ji Luo
(cherry picked from commit 0bb05e819f427780a3a74b95a78f12b6dd0acaa7) -
Sync config change after refining the config
dependency.Test: builds.
Change-Id: I32c36e822458c8eea9dde4ba4d874a65475f3a26
Signed-off-by: Ji Luo
(cherry picked from commit 45cd8014f7e81ed7b9ed7766e5d5911384eb3de4) -
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
3 commits
-
* origin/imx_v2020.04:
LF-3161-2 mx6ul: bee: Remove XN bit for bee enabled region
LF-3161-1 arm: imx: Fix speculative instruction prefetch issue -
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)
13 Jan, 2021
4 commits
-
* origin/ls_v2020.04:
armv8: ls1028a: fix stream id allocation
configs: ls1088aqds: add COMMON_ENV to fix distroboot
board: fsl: ls2088ardb: Program GIC LPI configuration table -
When A-050382 errata is enabled, ECAM and EDMA have
conflicting stream id 40. This patch fixes the same.Signed-off-by: Nipun Gupta
-
Add COMMON_ENV(kernel_addr_r, fdt_addr_r and so on)
to fix a bug that faild to boot to ubuntu, failed
log as follows,
## Executing script at 80000000
load - load binary file from a filesystemUsage:
load [ [ [ [bytes [pos]]]]]
- Load binary file filename from partition part on device
type interface instance dev to address addr in memory.
bytes gives the size to load in bytes.
If bytes is 0 or omitted, the file is read until the end.
pos gives the file byte position to start reading from.
If pos is 0 or omitted, the file is read from the start.
...
Bad Linux ARM64 Image magic!
SCRIPT FAILED: continuing...Signed-off-by: Biwen Li
-
Program GIC LPI configuration table:
1. Redistributor PROCBASER configuration table (which is common for all
redistributors)2. Redistributor pending table (PENDBASER), for all the available
redistributors.3.Reserve DDR memory region used for GIC LPI configuration table.
Signed-off-by: Nikhil Gupta
11 Jan, 2021
1 commit
-
* origin/imx_v2020.04: (11 commits)
LF-3117 wdog: imx_watchdog: Change default reset_cpu to internal reset
MA-18534 imx8mp: Enable trusty for powersave config
MA-18525 Enable HDMI RX as external camera on mek_8qm
MA-18346-11 Android refine power on imx8mp board
MA-18508 Sync keymaster bootloader commands ID
...
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
1 commit
-
* 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
...