aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2022-01-07Merge branch '2022-01-07-imx8-and-buildman-updates'WIP/07Jan2022Tom Rini41-887/+670
- A large number of updates for i.MX8 platforms. We update buildman / binman to be able to fake binaries if needed, for CI, and tell the user the binary won't work. Update platforms to build again with these changes.
2022-01-07imx: imx8mm: imx8mm-kontron-n801x-s: Fix binman errorAdam Ford1-146/+0
The binman node is part of the imx8mm-u-boot.dtsi file which is duplicated in imx8mm-kontron-n801x-s-u-boot.dtsi and causes a build error. Remove the duplicate. Fixes: 3cbb31f0e848 ("arm64: dts: imx8mm: use common binman configuration") Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
2022-01-07board: phytec: imx8mm-phycore: Remove duplicate binman nodeAdam Ford1-122/+0
The binman node is part of the imx8mm-u-boot.dtsi file which is duplicated in phycore-imx8mm-u-boot.dtsi and causes a build error. Remove the duplicate. Fixes: 3cbb31f0e848 ("arm64: dts: imx8mm: use common binman configuration") Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
2022-01-07imx8mm_venice: switch to use binman to pack imagesTim Harvey5-5/+14
Use binman to pack images. Note that imx8mm_venice supports several boards via multiple DTB's thus in the fit node we must use: - fit,fdt-list = "of-list" - fdt-SEQ - config-SEQ Signed-off-by: Tim Harvey <tharvey@gateworks.com> Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
2022-01-07arm64: dts: imx8mm-u-boot.dtsi: improve odd blob-ext namingMarcel Ziswiler1-9/+18
Rather than using odd implicit blob-ext naming, explicitly specify the type to be of blob-ext and therefore also simplify the node naming. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2022-01-07arm64: dts: imx8mm-u-boot.dtsi: explicitly add spl filenameMarcel Ziswiler1-0/+1
Explicitly add SPL aka u-boot-spl.bin filename. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2022-01-07arm64: dts: imx8mm-u-boot.dtsi: alphabetically re-order propertiesMarcel Ziswiler1-17/+17
Alphabetically re-order properties. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2022-01-07arm64: dts: imx8mm: use common binman configurationMarcel Ziswiler6-582/+147
With the move to using binman to generate SPL aka u-boot-spl-ddr.bin and U-Boot proper aka u-boot.itb every board now covers such configuration in its own U-Boot specific device tree include. Move the comon part of that configuration to the common imx8mm-u-boot.dtsi include file. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2022-01-07arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: use common imx8mm-u-boot.dtsiMarcel Ziswiler2-70/+4
Use common imx8mm-u-boot.dtsi. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2022-01-07arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: alphabetically re-orderMarcel Ziswiler2-202/+202
Alphabetically re-order nodes and properties. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2022-01-07imx8mm-cl-iot-gate: fix imximage intermediate binary namingMarcel Ziswiler1-1/+1
This fixes the following build time issue: ... BINMAN all binman: Error 1 running 'mkimage -d ./mkimage.spl.mkimage -n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000 ./mkimage-out.spl.mkimage': mkimage.flash.mkimage: Can't open: No such file or directory make: *** [Makefile:1094: all] Error 1 Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2022-01-07doc: imx8mq_evk: update doc after using binmanPeng Fan1-1/+2
Update doc after using binman to pack images Signed-off-by: Peng Fan <peng.fan@nxp.com>
2022-01-07imx: imx8mq use common imximage.cfgPeng Fan7-45/+6
After all these board switch to binman, we could use common imximage.cfg Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Patrick Wildt <patrick@blueri.se>
2022-01-07imx: pico-imx8mq: switch to use binmanPeng Fan5-2/+15
Switch to use binman to pack images Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Patrick Wildt <patrick@blueri.se>
2022-01-07imx: imx8mq_phanbell: switch to binmanPeng Fan5-5/+19
Switch to binman to pack images Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Patrick Wildt <patrick@blueri.se>
2022-01-07imx: imx8mq_evk: switch to binmanPeng Fan6-2/+138
Switch to use binman to pack images Signed-off-by: Peng Fan <peng.fan@nxp.com>
2022-01-07imx8mn_beacon_2g: Switch to binmanAdam Ford1-1/+1
The standard 1GB Nano was converted to binman, but the 2G version was neglected. Convert it to binman as well. Reviewed-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Adam Ford <aford173@gmail.com>
2022-01-07imx8mn_beacon: Fix booting hang and switch to binmanAdam Ford5-3/+148
Somewhere along the line, the board stopped being able to boot. Rather than just fixing the issue, let's fix the issue and migrate to binman to eliminate a warning when using custom imx tools for generating the binary. Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
2022-01-07imx8mm_beacon: Switch to binman for generating imageAdam Ford6-5/+137
To eliminate a warning when using custom imx tools for generating a binary, use binman to generate flash.bin. Signed-off-by: Adam Ford <aford173@gmail.com> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2022-01-07binman: add support for creating dummy files for external blobsHeiko Thiery10-8/+139
While converting to binman for an imx8mq board, it has been found that building in the u-boot CI fails. This is because an imx8mq requires an external binary (signed_hdmi_imx8m.bin). If this file cannot be found mkimage fails. To be able to build this board in the u-boot CI a binman option (--fake-ext-blobs) is introduced that can be switched on via the u-boot makefile option BINMAN_FAKE_EXT_BLOBS. With that the needed dummy files are created. Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2022-01-07Merge branch '2022-01-06-assorted-important-fixes'Tom Rini9-57/+110
- Revert a clk change, to enable some platforms to work again - Updates to the udoo NEO family of boards to work correctly - Fix SiFive Unleashes/Unmatched boards booting - Update rockchip maintainer entry
2022-01-07Revert "clk: Detect failure to set defaults"Marek Vasut1-5/+1
This reverts commit 92f1e9a4b31c0bf0f4f61ab823a6a88657323646. The aforementioned patch causes massive breakage on all platforms which have 'assigned-clock' DT property in their DT which references any clock that are not supported by the platform clock driver. That can easily happen either in SPL, or because the clock driver is reduced. Currently it seems all iMX8M are affected and fail to boot altogether. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Peng Fan <peng.fan@oss.nxp.com> Cc: Simon Glass <sjg@chromium.org> Reviewed-by: Sean Anderson <seanga2@gmail.com> Reviewed-by: Fabio Estevam <festevam@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2022-01-07udoo: neo: Do not print the Model informationFabio Estevam1-1/+2
By default the Model information from DT is printed: CPU: Freescale i.MX6SX rev1.2 996 MHz (running at 792 MHz) CPU: Extended Commercial temperature grade (-20C to 105C) at 63C Reset cause: POR Model: UDOO Neo Basic Board: UDOO Neo FULL I2C: ready As the udoo basic DT is used, such output may be confusing. Improve it by only printing the Board model instead, which is read from the board identification GPIOs. Signed-off-by: Fabio Estevam <festevam@gmail.com> Acked-by: Tommaso Merciai <tomm.merciai@gmail.com> Tested-by: Tommaso Merciai <tomm.merciai@gmail.com>
2022-01-07udoo: neo: Fix the board model printingFabio Estevam1-41/+50
Currently, the board model is not printed correctly: Board: UDOO Neo UNDEFINED Read the model type in SPL and store it the internal OCRAM, so that U-Boot proper can retrieve it correctly. Signed-off-by: Fabio Estevam <festevam@gmail.com>
2022-01-07udoo_neo: Enable support for USB and storagePeter Robinson2-0/+8
Enable support for USB and USB storage on the UDOO Neo. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
2022-01-07udoo_neo: Fix ethernetPeter Robinson2-2/+3
The ethernet has a RMII not RGMII, also needs DM_MDIO and finally initialise it later in the process as it's not needed that early on and not everything is ready so it locks up the device. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
2022-01-07udoo_neo: Fixes for booting from the mSD cardPeter Robinson4-9/+43
This fixes booting from the mSD card from both SPL and when using it for the OS booting. It also cleans up a few mmc booting bits that are no longer needed. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
2022-01-07udoo_neo: Call gpio_request()Peter Robinson1-0/+4
Calling gpio_request() prior to its usage is now mandatory. This fixes the following GPIO errors: gpio@20a8000: set_dir_flags: error: gpio GPIO4_16 not reserved gpio@20a8000: set_dir_flags: error: gpio GPIO4_13 not reserved gpio@20a8000: set_dir_flags: error: gpio GPIO4_0 not reserved gpio@20a8000: get_value: error: gpio GPIO4_13 not reserved gpio@20a8000: get_value: error: gpio GPIO4_0 not reserved gpio@20a0000: set_dir_flags: error: gpio GPIO2_1 not reserved gpio@20a0000: set_value: error: gpio GPIO2_1 not reserved Fixes: 191840ae99 ("ARM: imx: udoo_neo: Enable OF_CONTROL and DM gpio/pin control") Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
2022-01-07riscv: sifive: Fix OF_BOARD boot failureBin Meng2-2/+2
When using QEMU to have a quick test of booting U-Boot S-mode payload directly without the needs of preparing the SPI flash or SD card images for SiFive Unleashed board, as per the instructions [1], it currently does not boot any more. This was caused by the OF_PRIOR_STAGE removal, as gd->fdt_blob no longer points to a valid DTB. OF_BOARD is supposed to replace OF_PRIOR_STAGE, hence we need to add the OF_BOARD logic in board_fdt_blob_setup(). [1] https://qemu.readthedocs.io/en/latest/system/riscv/sifive_u.html#running-u-boot Fixes: 2e8d2f88439d ("riscv: Remove OF_PRIOR_STAGE from RISC-V boards") Fixes: d6f8ab30a2af ("treewide: Remove OF_PRIOR_STAGE") Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> Reviewed-by: Simon Glass <sjg@chromium.org>
2022-01-07rockchip: puma/lion: update MAINTAINERS fileQuentin Schulz2-2/+2
Philipp does not work at Theobroma Systems anymore so let's swap Philipp's address with mine. Cc: Philipp Tomsich <philipp.tomsich@vrull.eu> Cc: Quentin Schulz <foss+u-boot@0leil.net> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@vrull.eu>
2022-01-05Merge https://source.denx.de/u-boot/custodians/u-boot-marvellTom Rini1-3/+3
- kwbimage: Fix checksum calculation for v1 images (Pierre)
2022-01-05tools: kwbimage: Fix checksum calculation for v1 imagesPierre Bourdon1-3/+3
Recent changes caused fields in the image main header to be modified after the header checksum had already been computed. Move the checksum computation to once again be the last operation performed on the header. Fixes: 2b0980c24027 ("tools: kwbimage: Fill the real header size into the main header") Signed-off-by: Pierre Bourdon <delroth@gmail.com> Reviewed-by: Pali Rohár <pali@kernel.org> Reviewed-by: Stefan Roese <sr@denx.de>
2021-12-28Merge tag 'video-20211228' of ↵Tom Rini1-2/+2
https://source.denx.de/u-boot/custodians/u-boot-video - mxsfb axi/disp_axi clock enable fix
2021-12-28Merge tag 'efi-2022-01-rc4-4' of ↵WIP/28Dec2021Tom Rini9-18/+29
https://source.denx.de/u-boot/custodians/u-boot-efi Pull request for efi-2022-01-rc4-4 UEFI: * allow for more than 16 KiB UEFI variable size when using StMM Others: * make watchdog sysreset compatible with separate poweroff driver * avoid OpenSSL deprecation warnings
2021-12-27doc: Fix usage of CFG_RPMB_WRITE_KEYIlias Apalodimas1-3/+3
This is a 'y/n' selection, so fix it. While at it remove the duplicate usage of CFG_CORE_HEAP_SIZE Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> Acked-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2021-12-27video: mxsfb: fix clk_get_by_name() return value checkGiulio Benetti1-2/+2
If clk_get_by_name() returns 0 it means it executed successfully while now we consider it as an error. So let's check if return value is negative to be an error. Otherwise this prevents "axi" and "disp_axi" to be enabled. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
2021-12-26Merge https://source.denx.de/u-boot/custodians/u-boot-spiWIP/26Dec2021Tom Rini3-6/+22
2021-12-26Merge tag 'u-boot-rockchip-20211226' of ↵Tom Rini36-374/+1225
https://source.denx.de/u-boot/custodians/u-boot-rockchip - Add kaslrseed support; - rk3568 spl and image tool support; - px30 dts sync from kernel; - rk3399 emmc fix; - rockchip fastboot cmd fix;
2021-12-26tools: avoid OpenSSL deprecation warningsHeinrich Schuchardt4-0/+9
Our Gitlab CI buildsystem is set up to treat warnings as errors. With OpenSSL 3.0 a lot of deprecation warnings occur. With the patch compatibility with OpenSSL 1.1.1 is declared. In the long run we should upgrade our code to use the current API. A -Wdiscarded-qualifiers warning is muted by casting. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2021-12-26sysreset: watchdog: watchdog cannot power offHeinrich Schuchardt1-3/+10
The watchdog system reset driver can reboot the device but it cannot power it off. If power off is requested, the driver should not reset the system but leave powering off to one of the other system reset drivers. As power cycling is typically not a feature of a watchdog driver the reset types SYSRESET_POWER and SYSRESET_POWER_OFF shall both be excluded. Fixes: 17a0c14164dc ("dm: sysreset: add watchdog-reboot driver") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Stefan Roese <sr@denx.de>
2021-12-26efi_loader: Don't limit the StMM buffer size explicitlyIlias Apalodimas2-11/+6
Currently we allow and explicitly check a single shared page with StandAloneMM. This is dictated by OP-TEE which runs the application. However there's no way for us dynamically discover the number of pages we are allowed to use. Since writing big EFI signature list variable requires more than a page, OP-TEE has bumped the number of shared pages to four. Let's remove our explicit check and allow the request to reach OP-TEE even if it's bigger than what it supports. There's no need to sanitize the number of pages internally. OP-TEE will fail if we try to write more than it's allowed. The error will just trigger later on, during the StMM access. While at it add an error message to help users figure out what failed. Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> Tested-by: Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org> Signed-off-by: Ilias Apalodimas <apalos@gmail.com>
2021-12-26efi: fix typo in description of struct efi_entry_hdrHeinrich Schuchardt1-1/+1
Add missing colon. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2021-12-24rockchip: mkimage: Add support for rk3568 SoCKever Yang1-0/+1
rk3568 is the first SoC which supports idb header v2. Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2021-12-24rockchip: mkimage: Add support for idb header V2Yi Liu1-28/+158
Rockchip BootRom supports new idb header v2 instead of legacy version. Add support for it so that we can generate image for new SoCs. Signed-off-by: Yi Liu <liuyi@rock-chips.com> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2021-12-24rockchip: mkimage: Add image header versionKever Yang1-12/+17
We are going to have more than one version header, add the version in the header info. Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2021-12-24rockchip: mkimage: rename RK_SIGNATURE to RK_MAGICKever Yang1-5/+5
The first 4byte of idbimage is a magic number instead of signature, correct it. Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2021-12-24configs: rock-pi-4: Enable rockchip efuse supportSjoerd Simons2-0/+2
Enable efuse support for reading the cpuid#, serial# and generate a board unique mac address Signed-off-by: Sjoerd Simons <sjoerd@collabora.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2021-12-24rockchip: boot_mode: fix fastboot commandJohn Keeping1-1/+1
The USB controller index must be separated from the type argument, otherwise the preboot command fails with the error: Error: Wrong USB controller index format Add the missing space to fix fastboot mode here. Signed-off-by: John Keeping <john@metanate.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2021-12-24power: pmic/fan53555: allow dm be omitted by SPLQuentin Schulz2-1/+15
Allow the dm driver be omitted by SPL. Cc: Quentin Schulz <foss+u-boot@0leil.net> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2021-12-24engicam: px30: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OFJagan Teki4-0/+123
PX30.Core is an EDIMM SOM based on Rockchip PX30 from Engicam. C.TOUCH 2.0 is a general purpose carrier board with capacitive touch interface support. 10.1" OF is a capacitive touch 10.1" Open Frame panel solutions. PX30.Core needs to mount on top of C.TOUCH 2.0 carrier with pluged 10.1" OF for creating complete PX30.Core C.TOUCH 2.0 10.1" Open Frame. Add support for it. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>