summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-10Prepare v2022.01v2022.01Tom Rini
Signed-off-by: Tom Rini <trini@konsulko.com>
2022-01-10.mailmap: add Atish Patra, Anup PatelHeinrich Schuchardt
Both have left Western Digital. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2022-01-10lib/rsa: avoid -Wdiscarded-qualifiersHeinrich Schuchardt
The return type of EVP_PKEY_get0_RSA() is const struct rsa_st *. Our code drops the const qualifier leading to In file included from tools/lib/rsa/rsa-sign.c:1: ./tools/../lib/rsa/rsa-sign.c: In function ‘rsa_add_verify_data’: ./tools/../lib/rsa/rsa-sign.c:631:13: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] 631 | rsa = EVP_PKEY_get0_RSA(pkey); | ^ Add a type conversion. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2022-01-08Merge branch '2022-01-08-further-important-updates'Tom Rini
- Further udoo_neo fixes, nitrogen6x mmc pinctrl fix - dwc2_udc_otg fix - Make imx8mq be consistent with yesterdays imx8 fixes
2022-01-08imx8mq: Generate a single bootable flash.bin againPatrick Wildt
All i.MX8MQ boards have been converted to binman, which makes it necessary to flash both flash.bin and u-boot.itb to get a bootable system. Prior to the conversion, only flash.bin was needed. Such new requirement breaks existing distro mechanisms to generate the final binary because the extra u-boot.itb is now required. Generate a final flash.bin that can be used again as a single bootable binary to keep the original behavior. After this change the SPL binary is called spl.bin, which is a more descriptive name for its purpose, and can still be used standalone (for example, for secure boot purposes). Also update imx8mq_evk.rst to remove the u-boot.itb copy step. This is a cherry-pick of 028abfd9b157 ("imx8mm-evk: Generate a single bootable flash.bin again") adjusted to apply to i.MX8MQ. Signed-off-by: Patrick Wildt <patrick@blueri.se> Reviewed-by: Fabio Estevam <festevam@denx.de>
2022-01-08nitrogen6x: add missing pinctrl to fix mmcGary Bisson
Since commit f7ac30b042d, the pin muxing for mmc was removed from the board file to be managed by DM_MMC which requires PINCTRL to work. It made the change for sabrelite but nitrogen configs were forgotten. Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> Reviewed-by: Fabio Estevam <festevam@gmail.com> Acked-by: Troy Kisky <troy.kisky@boundarydevices.com>
2022-01-08usb: gadget: dwc2_udc_otg: set ep's desc during enable/disableGary Bisson
Fastboot support has been broken on platforms using dwc2 controller since the gadget gets its max packet size from it. This patch is the equivalent of 723fd5668ff which fixed the same issue but for the chipidea controller. Fixes: 27c9141b111 ("usb: gadget: fastboot: use correct max packet size") Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
2022-01-08udoo: Select CMD_DMFabio Estevam
CMD_DM is useful for showing the whole DM tree. Enable it via "imply CMD_DM". Signed-off-by: Fabio Estevam <festevam@gmail.com> Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
2022-01-08udoo: Increase CONFIG_ENV_OFFSETFabio Estevam
Increase CONFIG_ENV_OFFSET to avoid the environment region to overlap with U-Boot proper. Signed-off-by: Fabio Estevam <festevam@gmail.com> Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
2022-01-08udoo: Adjust the SD card device numberingFabio Estevam
After the conversion to DM the SD card shows up as 'mmc 2' device. Adjust the 'mmcdev' and the distro command 'func' accordingly. Signed-off-by: Fabio Estevam <festevam@gmail.com> Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
2022-01-08udoo: Call gpio_request()Fabio Estevam
Calling gpio_request() prior to its usage is now mandatory. This fixes the following GPIO errors: U-Boot SPL 2022.01-rc3-00067-g7a5be871c0ec (Dec 18 2021 - 17:45:07 -0300) Trying to boot from MMC1 U-Boot 2022.01-rc3-00067-g7a5be871c0ec (Dec 18 2021 - 17:45:07 -0300) CPU: Freescale i.MX6Q rev1.2 at 792 MHz Reset cause: WDOG Model: Udoo i.MX6 Quad Board Board: Udoo Quad DRAM: 1 GiB MMC: FSL_SDHC: 2 Loading Environment from MMC... OK In: serial Out: serial Err: serial gpio@20a0000: set_dir_flags: error: gpio GPIO2_31 not reserved gpio@20a4000: set_dir_flags: error: gpio GPIO3_23 not reserved gpio@20b0000: set_dir_flags: error: gpio GPIO6_24 not reserved gpio@20b0000: set_dir_flags: error: gpio GPIO6_25 not reserved gpio@20b0000: set_dir_flags: error: gpio GPIO6_27 not reserved gpio@20b0000: set_dir_flags: error: gpio GPIO6_28 not reserved gpio@20b0000: set_dir_flags: error: gpio GPIO6_29 not reserved gpio@20a4000: set_value: error: gpio GPIO3_23 not reserved Net: Could not get PHY for FEC0: addr -2 No ethernet found. Signed-off-by: Fabio Estevam <festevam@gmail.com> Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
2022-01-08ARM: dts: imx6qdl-udoo: Properly describe the SD card detectFabio Estevam
GPIO7_IO00 is used as SD card detect. Properly describe this in the devicetree. Signed-off-by: Fabio Estevam <festevam@gmail.com>
2022-01-08udoo_spl: Initialize the eSDHC controller in SPLFabio Estevam
Currently, imx6q udoo board fails to boot like this: U-Boot SPL 2022.01-rc3-00061-g95ca715adad3 (Dec 18 2021 - 18:04:40 -0300) Trying to boot from MMC1 The reason is that the eSDHC controller is not initialized in SPL. Initialize the eSDHC controller in SPL via C code as DM is not used in SPL. Signed-off-by: Fabio Estevam <festevam@gmail.com> Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
2022-01-07Merge branch '2022-01-07-imx8-and-buildman-updates'Tom Rini
- 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 Ford
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 Ford
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 Harvey
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 Ziswiler
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 Ziswiler
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 Ziswiler
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 Ziswiler
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 Ziswiler
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 Ziswiler
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 Ziswiler
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 Fan
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 Fan
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 Fan
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 Fan
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 Fan
Switch to use binman to pack images Signed-off-by: Peng Fan <peng.fan@nxp.com>
2022-01-07imx8mn_beacon_2g: Switch to binmanAdam Ford
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 Ford
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 Ford
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 Thiery
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 Rini
- 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 Vasut
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 Estevam
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 Estevam
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 Robinson
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 Robinson
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 Robinson
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 Robinson
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 Meng
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 Schulz
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 Rini
- kwbimage: Fix checksum calculation for v1 images (Pierre)
2022-01-05tools: kwbimage: Fix checksum calculation for v1 imagesPierre Bourdon
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 Rini
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 ↵Tom Rini
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 Apalodimas
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 Benetti
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-spiTom Rini