Commits · d73ce5e754087c45586a1591ab01d7fd73327dc1 · U-Boot / Custodians / MMC U-Boot Custodian Tree

Jun 11, 2019

pico-imx6ul: MAINTAINERS: Unify all board entries · d73ce5e7
Fabio Estevam authored 5 years ago and Stefano Babic committed 5 years ago
```
It is easier to consolidate all boards into a single entry.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
```
d73ce5e7
pico-imx7d: MAINTAINERS: Unify all board entries · f4825ab6
Fabio Estevam authored 5 years ago and Stefano Babic committed 5 years ago
```
It is easier to consolidate all boards into a single entry.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
```
f4825ab6

colibri_imx7: fastboot support · c7aa64ab

Igor Opaniuk authored 5 years ago and

Stefano Babic committed 5 years ago


Enable fastboot support (including "fastboot oem" subset of commands).

Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

c7aa64ab

ARM: imx: novena: Convert to DM VIDEO · 2f1c06c7

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Enable DM Video support on iMX6Q Novena and fix minor details
to restore previous behavior of the system.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Vagrant Cascadian <vagrant@debian.org>

2f1c06c7

ARM: imx: novena: Enable DM USB · 8d1e95ac

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Enable DM USB support on iMX6Q Novena.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Vagrant Cascadian <vagrant@debian.org>

8d1e95ac

ARM: imx: novena: Convert block devices to DM · 6b98b94c

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Enable DM block, DM MMC and DM SATA support on iMX6Q Novena
convert board code to match the DM support.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Vagrant Cascadian <vagrant@debian.org>

6b98b94c

ARM: imx: novena: Enable DM GPIO · c4e93f6a

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Enable DM GPIO support on iMX6Q Novena and fix up board code
where applicable.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Vagrant Cascadian <vagrant@debian.org>

c4e93f6a

ARM: imx: novena: Enable DM pin control · b697ed09

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Enable DM pin control support on iMX6Q Novena.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Vagrant Cascadian <vagrant@debian.org>

b697ed09

ARM: dts: imx: novena: Import Novena DT from Linux · 11a3cae7

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Import iMX6Q Novena device tree from Linux 5.1-rc7 37624b58542f .
Enable DT control in full U-Boot .

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Vagrant Cascadian <vagrant@debian.org>

11a3cae7

pico-imx7d: enable boot without PMIC · c72a2370

Jun Nie authored 5 years ago and

Stefano Babic committed 5 years ago


If PMIC is not probed successfully, it is still OK to boot
with default configuration although power is not optimized.

Default voltage of SW1A/SW1B is 1.1V/1.0V for PC32PF3000A1EP
on pico according to table 42 of spec of PF3000 ver 9.0.

Default mode of SW1A/SW1B is APS as expected(table 47).

Signed-off-by: Jun Nie <jun.nie@linaro.org>

c72a2370

pico-imx7d: README: Add BL33 usage case · 76ed1036

Jun Nie authored 5 years ago and

Stefano Babic committed 5 years ago


Add Documentation of BL33 usage case. U-boot is in
non-secure world in this case.

Signed-off-by: Jun Nie <jun.nie@linaro.org>

76ed1036

pico-imx7d: Add bl33 config · 367f77ad

Jun Nie authored 5 years ago and

Stefano Babic committed 5 years ago


Add default configuration to run u-boot as BL33 in the boot flow case
of ATF(ARM Trusted Firmware) -> OPTEE -> U-boot.

Signed-off-by: Jun Nie <jun.nie@linaro.org>
Reviewed-by: Fabio Estevam <festevam@gmail.com>

367f77ad

pico-imx7d: Add boot option for verified boot · a1513f28

Jun Nie authored 5 years ago and

Stefano Babic committed 5 years ago


Add boot option to boot from fitimage to support verified boot.
The boot script plain text file should be packed into fit blob as
image with name of bootscr.

Signed-off-by: Jun Nie <jun.nie@linaro.org>

a1513f28

pico-imx7d: Reserve region of memory to OPTEE · 1d3b852e

Jun Nie authored 5 years ago and

Stefano Babic committed 5 years ago


Subtracts CONFIG_OPTEE_TZDRAM_SIZE from the available DRAM size so that
the OPTEE memory is not override during u-boot relocation.

Note the OPTEE live in the end part of DRAM and OPTEE boot process will
itself subtract the DRAM region it lives in from the memory map passed
to Linux.

Signed-off-by: Jun Nie <jun.nie@linaro.org>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

1d3b852e

pico-imx7d: Correct uart clock root · 79fcbde8

Jun Nie authored 5 years ago and

Stefano Babic committed 5 years ago


Correct uart clock root ID. Incorrect ID may result the
clock is gated because rate value 0 is returned in
imx_get_uartclk()

The ID can be ignored if CONFIG_SKIP_LOWLEVEL_INIT is not enabled
because init_clk_uart() will enable all uart clocks in that case.

Signed-off-by: Jun Nie <jun.nie@linaro.org>

79fcbde8

imx: mx7: Skip secure init in arch_cpu_init · bc7c9ed3

Jun Nie authored 5 years ago and

Stefano Babic committed 5 years ago


Skip secure related initialization in arch_cpu_init if low level
init is skipped.  Because these should be done in early stage
firmware, such as ARM trusted firmware.

Signed-off-by: Jun Nie <jun.nie@linaro.org>

bc7c9ed3

mx7_common: Share configs to skip low level init · 3ad0d268

Jun Nie authored 5 years ago and

Stefano Babic committed 5 years ago


Share configs in mx7 to skip low level init if we are in the case where
OPTEE is loaded already (maybe by ARM Trusted Firmware) and that most of
the low level initialization is already done and that we may/should skip
it doing them here.

Fix the definition detection with size detection to decide whether to skip
it.

Signed-off-by: Jun Nie <jun.nie@linaro.org>
Reviewed-by: Fabio Estevam <festevam@gmail.com>

3ad0d268

spi: imx: work with cs greater 0 · 7a3faf31

Heiko Schocher authored 5 years ago and

Stefano Babic committed 5 years ago


currently spi mxc driver can only handle cs 0.
Allow it to handle also cs > 0.

Signed-off-by: Heiko Schocher <hs@denx.de>

7a3faf31

spi: imx: remove doubled pointer from mxc_spi_probe · 2b849e1f

Heiko Schocher authored 5 years ago and

Stefano Babic committed 5 years ago


in mxc_spi_probe() plat and mxcs pointer are created:

struct mxc_spi_slave *plat = bus->platdata;
struct mxc_spi_slave *mxcs = dev_get_platdata(bus);

which have the same value. Remove plat pointer.

Signed-off-by: Heiko Schocher <hs@denx.de>

2b849e1f

arm, imx, Makefile: fix u-boot-dtb.imx build in CONFIG_MULTI_DTB_FIT case · 16c776d3

Heiko Schocher authored 5 years ago and

Stefano Babic committed 5 years ago


in case CONFIG_MULTI_DTB_FIT is set and u-boot-dtb.imx
image is build, currently u-boot-dtb.bin is used for
generating the u-boot-dtb.imx binary, which is wrong, as
it contains only a dtb blob not the fit.blob

Use instead the u-boot-fit-dtb.bin for generating
u-boot-dtb.imx which contains the fit.blob.

Signed-off-by: Heiko Schocher <hs@denx.de>

16c776d3

wandboard: Rework Makefile to prevent spl.o from being built · 5ef237ad

Ezequiel Garcia authored 5 years ago and

Stefano Babic committed 5 years ago


The spl.c source was entirely conditioned by CONFIG_SPL_BUILD.
Change this moving CONFIG_SPL_BUILD to be used in the Makefile,
which is slightly cleaner and more readable.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>

5ef237ad

ARM: imx: dh-imx6: Convert SPI support to DM · cc48c2a5

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Enable DM SPI and SF support on DHCOM iMX6 PDK2.
Convert board code to match the DM support.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Stefano Babic <sbabic@denx.de>

cc48c2a5

ARM: imx: dh-imx6: Convert USB support to DM · 9352c629

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Enable DM USB host support on DHCOM iMX6 PDK2.
Convert board code to match the DM support.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Stefano Babic <sbabic@denx.de>

9352c629

ARM: imx: dh-imx6: Convert SATA support to DM · 0050c929

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Enable DM SATA support on DHCOM iMX6 PDK2.
Convert board code to match the DM support.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Stefano Babic <sbabic@denx.de>

0050c929

ARM: imx: dh-imx6: Convert SD/MMC support to DM · 198fee84

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Enable DM block and DM MMC support on DHCOM iMX6 PDK2.
Convert board code to match the DM support.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Stefano Babic <sbabic@denx.de>

198fee84

ARM: imx: dh-imx6: Enable DM GPIO · 3a05eb8f

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Enable DM GPIO support on DHCOM iMX6 PDK2 and fix up board code
where applicable.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Stefano Babic <sbabic@denx.de>

3a05eb8f

ARM: imx: dh-imx6: Enable DM pin control · 53bb233b

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Enable DM pin control support on DHCOM iMX6 PDK2.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Stefano Babic <sbabic@denx.de>

53bb233b

ARM: dts: imx: dh-imx6: Fix SPI CS polarity on DHCOM iMX6 PDK2 · f54dc48c

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


The SPI nCS signal is active low, make it so.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Stefano Babic <sbabic@denx.de>

f54dc48c

ARM: dts: imx: dh-imx6: Import DHCOM iMX6 PDK2 DTs from Linux · 5f6d90aa

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Import DHCOM iMX6 PDK2 device tree from Linux 5.1.1 b724e9356404 .
Enable DT control in full U-Boot .

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Stefano Babic <sbabic@denx.de>

5f6d90aa

Revert "drivers/crypto/fsl: assign job-rings to non-TrustZone" · 51f1357f

Breno Matheus Lima authored 5 years ago and

Stefano Babic committed 5 years ago

Commit 22191ac3 ("drivers/crypto/fsl: assign job-rings to
 non-TrustZone") breaks HABv4 encrypted boot support in the
following i.MX devices:

- i.MX6UL
- i.MX7S
- i.MX7D
- i.MX7ULP

For preparing a HABv4 encrypted boot image it's necessary to
encapsulate the generated DEK in a blob. In devices listed
above the blob generation function takes into consideration
the Job Ring TrustZone ownership configuration (JROWN_NS)
and can be only decapsulated by the same configuration.

The ROM code expects DEK blobs encapsulated by the Secure World
environments which commonly have JROWN_NS = 0.

As U-Boot is running in Secure World we must have JROWN_NS = 0
so the blobs generated by dek_blob tool can be decapsulated
by the ROM code.

Job-rings assignment is now handled in OP-TEE OS, this commit can
be safely reverted.
https://github.com/OP-TEE/optee_os/pull/2986



This reverts commit 22191ac3.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Acked-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>

51f1357f

config: Update KP's imx53 HSC config to pass key pressed information · 5f6d63ad

Lukasz Majewski authored 5 years ago and

Stefano Babic committed 5 years ago


The information about pressed key is relevant in performing correct
update and recovery scenarios via USB pendrive.

This commit modifies envs to provide it.

Signed-off-by: Lukasz Majewski <lukma@denx.de>

5f6d63ad

config: Update KP's imx53 HSC config to support SWUpdate · a73b4b60

Lukasz Majewski authored 5 years ago and

Stefano Babic committed 5 years ago


This commit updates envs responsible for using USB pendrive as a
SWUpdate based tool for recovery and update.

Signed-off-by: Lukasz Majewski <lukma@denx.de>

a73b4b60

imx: Use a convenient default value for SYS_MALLOC_F_LEN · 08919d38

Fabio Estevam authored 5 years ago and

Stefano Babic committed 5 years ago


Commit 3a7c45f6 ("simple-bus: add DM_FLAG_PRE_RELOC flag to
simple-bus driver") causes some i.MX boards that were converted
to DM, such as warp7, to fail to boot.

As explained by Lukas Auer:

"With the patch, U-Boot probes the drivers for devices under simple-bus
device tree nodes in the pre-relocation device model. The default value
of CONFIG_SYS_MALLOC_F_LEN (0x400) leaves U-Boot with not enough memory to
do this, causing it to hang."

Fix this problem by providing a convenient default value for
CONFIG_SYS_MALLOC_F_LEN.

Reported-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Suggested-by: Lukas Auer <lukas.auer@aisec.fraunhofer.de>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Tested-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Lukas Auer <lukas.auer@aisec.fraunhofer.de>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Tested-by: Heiko Schocher <hs@denx.de>

08919d38

opos6uldev: don't call enable_lcdif_clock · a3f358a2

Sébastien Szymanski authored 5 years ago and

Stefano Babic committed 5 years ago


The mxsfb driver already calls enable_lcdif_clock.

Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>

a3f358a2

opos6ul: set REFSEL and REFR fields · 0ab85fe6
Sébastien Szymanski authored 5 years ago and Stefano Babic committed 5 years ago
```
Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
```
0ab85fe6

imx: hab: Increase CSF_SIZE for i.MX6 and i.MX7 devices · 0633e134

Breno Matheus Lima authored 5 years ago and

Stefano Babic committed 5 years ago


In certain i.MX devices the encrypted boot image is failing to boot.

According to AN12056 "Encrypted Boot on HABv4 and CAAM Enabled Devices"
it's necessary to pad CSF to 0x2000 and append DEK blob.

In this case the total image size in boot data structure must cover the
entire binary otherwise the dek_blob won't be copied to memory and image
won't be decrypted.

Increase CSF_SIZE to 0x4000 to avoid such issue when booting encrypted
boot images.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Fabio Estevam <festevam@gmail.com>

0633e134

colibri-imx6ull: fix usb host mode · 4721d7d3

Marcel Ziswiler authored 5 years ago and

Stefano Babic committed 5 years ago


This fixes an issue with USB host mode.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>

4721d7d3

ARM: imx: apalis_imx6: Drop ad-hoc SATA binding · 64c751f6

Marek Vasut authored 5 years ago and

Stefano Babic committed 5 years ago


Drop the ad-hoc AHCI binding code, this is superseded by
CONFIG_DWC_AHSATA_AHCI=y resp. drivers/ata/dwc_ahsata.c

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Cc: Max Krummenacher <max.krummenacher@toradex.com>
Cc: Stefan Agner <stefan.agner@toradex.com>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

64c751f6

regulator: bd71837: copy the bd71837 pmic driver from NXP imx u-boot · 1023c873

Matti Vaittinen authored 5 years ago and

Stefano Babic committed 5 years ago

https://source.codeaurora.org/external/imx/uboot-imx



cherry picked, styled and merged commits:
- MLK-18387 pmic: Add pmic driver for BD71837: e9a3bec2e95a
- MLK-18590 pmic: bd71837: Change to use new fdt API: acdc5c297a96

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

1023c873

colibri_imx7: migrate usb to driver model · 5d2cd9f1

Igor Opaniuk authored 5 years ago and

Stefano Babic committed 5 years ago


Migrate USB to Driver Model (CONFIG_DM_USB=y).

Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>

5d2cd9f1