summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-11imx: mx7: Skip secure init in arch_cpu_initJun Nie
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>
2019-06-11mx7_common: Share configs to skip low level initJun Nie
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>
2019-06-11spi: imx: work with cs greater 0Heiko Schocher
currently spi mxc driver can only handle cs 0. Allow it to handle also cs > 0. Signed-off-by: Heiko Schocher <hs@denx.de>
2019-06-11spi: imx: remove doubled pointer from mxc_spi_probeHeiko Schocher
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>
2019-06-11arm, imx, Makefile: fix u-boot-dtb.imx build in CONFIG_MULTI_DTB_FIT caseHeiko Schocher
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>
2019-06-11wandboard: Rework Makefile to prevent spl.o from being builtEzequiel Garcia
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>
2019-06-11ARM: imx: dh-imx6: Convert SPI support to DMMarek Vasut
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>
2019-06-11ARM: imx: dh-imx6: Convert USB support to DMMarek Vasut
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>
2019-06-11ARM: imx: dh-imx6: Convert SATA support to DMMarek Vasut
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>
2019-06-11ARM: imx: dh-imx6: Convert SD/MMC support to DMMarek Vasut
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>
2019-06-11ARM: imx: dh-imx6: Enable DM GPIOMarek Vasut
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>
2019-06-11ARM: imx: dh-imx6: Enable DM pin controlMarek Vasut
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>
2019-06-11ARM: dts: imx: dh-imx6: Fix SPI CS polarity on DHCOM iMX6 PDK2Marek Vasut
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>
2019-06-11ARM: dts: imx: dh-imx6: Import DHCOM iMX6 PDK2 DTs from LinuxMarek Vasut
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>
2019-06-11Revert "drivers/crypto/fsl: assign job-rings to non-TrustZone"Breno Matheus Lima
Commit 22191ac35344 ("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 22191ac353445ad8fafc5a78aefcd94e78963041. 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>
2019-06-11config: Update KP's imx53 HSC config to pass key pressed informationLukasz Majewski
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>
2019-06-11config: Update KP's imx53 HSC config to support SWUpdateLukasz Majewski
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>
2019-06-11imx: Use a convenient default value for SYS_MALLOC_F_LENFabio Estevam
Commit 3a7c45f6a772 ("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>
2019-06-11opos6uldev: don't call enable_lcdif_clockSébastien Szymanski
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>
2019-06-11opos6ul: set REFSEL and REFR fieldsSébastien Szymanski
Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
2019-06-11imx: hab: Increase CSF_SIZE for i.MX6 and i.MX7 devicesBreno Matheus Lima
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>
2019-06-11colibri-imx6ull: fix usb host modeMarcel Ziswiler
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>
2019-06-11ARM: imx: apalis_imx6: Drop ad-hoc SATA bindingMarek Vasut
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>
2019-06-11regulator: bd71837: copy the bd71837 pmic driver from NXP imx u-bootMatti Vaittinen
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>
2019-06-11colibri_imx7: migrate usb to driver modelIgor Opaniuk
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>
2019-06-11configs: imx6-engicam: Update the recoveryboot settingJagan Teki
Since recovery boot on mmc can get the mmcpart and mmcroot dynamically, drop the static definitions and handle it properly. Tested-by: Shyam Saini <shyam.saini@amarulasolutions.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
2019-06-11toradex apalis/colibri: extend CONFIG_SYS_MALLOC_F_LENIgor Opaniuk
Extend size of the malloc() pool for use before relocation, from 0x400 (default one) to 0x2000 (CONFIG_SYS_MALLOC_F_LEN=0x2000), as adding of DM_FLAG_PRE_RELOC flag to simple-bus driver introduced a regression on multiple boards, because of more intensive usage of malloc() pool and therefore a broken boot as the size of pool isn't sufficient. Fixes: 3a7c45f6a7 ("simple-bus: add DM_FLAG_PRE_RELOC flag to simple-bus") Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2019-06-11apalis_imx6: add device tree to makefileMarcel Ziswiler
Add device tree to Makefile to avoid newly introduced error: Device Tree Source is not correctly specified. Please define 'CONFIG_DEFAULT_DEVICE_TREE' or build with 'DEVICE_TREE=<device_tree>' argument make[1]: *** [dts/Makefile:28: arch/arm/dts/imx6-apalis.dtb] Error 1 make: *** [Makefile:1009: dts/dt.dtb] Error 2 Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2019-06-11apalis/colibri imx6: provide proper fdtfile valueIgor Opaniuk
Provide proper fdtfile env variable value before invoking distro_bootcmd command. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2019-06-11ARM: dts: i.MX6ULL: U-Boot specific dts for u-boot, dm-splParthiban Nallathambi
u-boot,dm-spl property is specific to U-Boot, so created one for i.MX6ULL platforms. Signed-off-by: Parthiban Nallathambi <parthitce@gmail.com>
2019-06-11power: pfuze100: Fix off by one error in voltage table handlingTrent Piepho
The code that sets a regulator by looking up the voltage in a table had an off by one error. vsel_mask is a bitmask, not the number of table entries, so a vsel_mask value of 0x7 indicates there are 8, not 7, entries in the table. Cc: Peng Fan <Peng.Fan@freescale.com> Cc: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Trent Piepho <tpiepho@impinj.com>
2019-06-11mx7ulp: Add common plugin codes for mx7ulpYe Li
Add common plugin codes to call ROM's hwcnfg_setup and generate IVT2 header. Signed-off-by: Ye Li <ye.li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com>
2019-06-11board: toradex: add colibri imx8qxp 2gb wb it v1.0b module supportMarcel Ziswiler
This commit adds initial support for the Toradex Colibri iMX8QXP 2GB WB IT V1.0B module. Unlike the V1.0A early access samples exclusively booting from SD card, they are now strapped to boot from eFuses which are factory fused to properly boot from their on-module eMMC. U-Boot supports either booting from the on-module eMMC or may be used for recovery purpose using the universal update utility (uuu) aka mfgtools 3.0. Functionality wise the following is known to be working: - eMMC and MMC/SD card - Ethernet - GPIOs - I2C Unfortunately, there is no USB functionality for the i.MX 8QXP as of yet. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2019-06-11imx: fix building for i.mx8 without splMarcel Ziswiler
Building with Travis CI complained and stopped with the following error: +cc1: fatal error: opening output file spl/u-boot-spl.cfgout: No such file or directory +compilation terminated. This fixes commit caceb739ea07 ("imx: build flash.bin for i.MX8") which took SPL being enabled on i.MX8 for granted. Reported-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2019-06-11ARM: imx6logic: Stop overwriting fdt_file if manually setAdam Ford
The board file uses the processor type to determine what dtb file is set. Unfortunately, if the user wants to manually set this, it get gets overwritten upon boot. This patch adds a check to see if the value is already set and only changes it if the value is empty. Signed-off-by: Adam Ford <aford173@gmail.com>
2019-06-08spl: Correct SPL_SIZE_LIMIT Kconfig optionTom Rini
When introduced this limit was an int but was then changed to hex without noting as much in the prompt nor changing existing users. Put this back to an int. Reported-by: Fabio Estevam <festevam@gmail.com> Tested-by: Fabio Estevam <festevam@gmail.com> Fixes: 2577015dc5c4 ("spl: add overall SPL size check") Signed-off-by: Tom Rini <trini@konsulko.com>
2019-06-07Merge branch '2019-06-07-master-imports'Tom Rini
- Include Heinrich's series to move the i.MX board size check function to be more widely available. - Include Simon Goldschmidt's patch to make it possible to have a more accurate SPL size check applied.
2019-06-07spl: add overall SPL size checkSimon Goldschmidt
This adds a size check for SPL that can dynamically check generated SPL binaries (including devicetree) for a size limit that ensures this image plus global data, heap and stack fit in initial SRAM. Since some of these sizes are not available to make, a new host tool 'spl_size_limit' is added that dumps the resulting maximum size for an SPL binary to stdout. This tool is used in toplevel Makefile to implement the size check on SPL binaries. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
2019-06-07configs: rk3288: Tinker Board SPL file must fit into 32 KiBHeinrich Schuchardt
The SPL image for the Tinker Board has to fit into 32 KiB. This includes up to 2 KiB for the file header. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
2019-06-07configs: define CONFIG_SPL_SIZE_LIMITHeinrich Schuchardt
A new configuration variable CONFIG_SPL_SIZE_LIMIT is introduced to define the board specific maximum size for the SPL file. Use Makefile function size_check() to implement the test. Depending on the size of CONFIG_SPL_SIZE_LIMIT an error like the following is thrown: spl/u-boot-spl.bin exceeds file size limit: limit: 30720 bytes actual: 33426 bytes excess: 2706 bytes make: *** [Makefile:1663: spl/u-boot-spl.bin] Error 1 Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
2019-06-07imx: move BOARD_SIZE_CHECK to main MakefileHeinrich Schuchardt
We currently have duplicate definitions for BOARD_SIZE_CHECK in Makefile and arch/arm/mach-imx/Makefile. Move the board size check from arch/arm/mach-imx/Makefile to Makefile. Depending on the value of CONFIG_BOARD_SIZE_LIMIT an error like an error like the following is thrown: u-boot-dtb.imx exceeds file size limit: limit: 503696 bytes actual: 509720 bytes excess: 6024 bytes make: *** [Makefile:1051: u-boot-dtb.imx] Error 1 Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Fabio Estevam <festevam@gmail.com>
2019-06-07Makefile: reusable function for BOARD_SIZE_CHECKHeinrich Schuchardt
Carve out function size_check from macro BOARD_SIZE_CHECK. This will allow us to reuse the function for other file size checks. Depending on the value of CONFIG_BOARD_SIZE_LIMIT an error like the following is thrown: u-boot-dtb.img exceeds file size limit: limit: 409516 bytes actual: 444346 bytes excess: 34830 bytes make: *** [Makefile:1212: u-boot-dtb.img] Error 1 Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
2019-06-07lib/vsprintf: allow printing upper case GUIDsHeinrich Schuchardt
In the UEFI context GUIDs are expected to be rendered in upper case. The patch uses the formerly unused bit 1 of the parameter str_format of function uuid_bin_to_str() to indicate if we need upper or lower case output. Function uuid_string() in vsprint.c is adjusted to correctly set the bit depending on the print format code. %pUb: 01020304-0506-0708-090a-0b0c0d0e0f10 %pUB: 01020304-0506-0708-090A-0B0C0D0E0F10 %pUl: 04030201-0605-0807-090a-0b0c0d0e0f10 %pUL: 04030201-0605-0807-090A-0B0C0D0E0F10 Up to this point only a diagnostic message in mount_ubifs() using '%pUB' is concerned by the change. Further patches are needed to adjust the UEFI subsystem. A unit test is provided inside the ut_print command. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
2019-06-05Merge tag 'efi-2019-07-rc4-2' of git://git.denx.de/u-boot-efiTom Rini
Pull request for UEFI sub-system for v2019.07-rc4-2 Support for managing the non-volatile attribute of UEFI variables is added though we do not have a backend for persistence yet. Error messages for changes of UEFI variables are provided. UEFI boottime service implementations are corrected.
2019-06-05Merge branch '2019-06-05-master-imports'Tom Rini
- More DaVinci fixes - BuR platform fix
2019-06-05cmd/led: check subcommand "list" instead "l"Heiko Schocher
current implementation for checking if "led list" command is called checks only if "l" is passed to the led command. This prevents switching leds with name which starts also with a "l". So check for passing "list". While at it, also fix a typo in led command usage. Signed-off-by: Heiko Schocher <hs@denx.de>
2019-06-05board: am335x/mux: configure the pins for 8-bit data transfer on MMC1Jean-Jacques Hiblot
This is required for proper operation of the 8-bit data transfers. This fixes transient errors seen on BeagleBone Black. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
2019-06-05board/km: update maintainer e-mailHolger Brunck
Signed-off-by: Holger Brunck <holger.brunck@ch.abb.com>
2019-06-05arm: davinci: remove leftover assemblyBartosz Golaszewski
There are no more users of lowlevel_init.S. Remove the file. Suggested-by: Adam Ford <aford173@gmail.com> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
2019-06-05configs/legoev3: define CONFIG_SKIP_LOWLEVEL_INITDavid Lechner
This adds a define for CONFIG_SKIP_LOWLEVEL_INIT in the legoev3 config. On the EV3, U-Boot is loaded into RAM by another bootloader, so we don't need the lowlevel init in U-Boot. Signed-off-by: David Lechner <david@lechnology.com> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>