summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ARM: imx: novena: Convert to DM VIDEOMarek Vasut2019-06-113-5/+18
| | | | | | | | | | 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>
* ARM: imx: novena: Enable DM USBMarek Vasut2019-06-111-0/+1
| | | | | | | | | 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>
* ARM: imx: novena: Convert block devices to DMMarek Vasut2019-06-114-63/+12
| | | | | | | | | | 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>
* ARM: imx: novena: Enable DM GPIOMarek Vasut2019-06-113-0/+6
| | | | | | | | | | 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>
* ARM: imx: novena: Enable DM pin controlMarek Vasut2019-06-111-0/+5
| | | | | | | | | 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>
* ARM: dts: imx: novena: Import Novena DT from LinuxMarek Vasut2019-06-113-2/+796
| | | | | | | | | | 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>
* pico-imx7d: enable boot without PMICJun Nie2019-06-111-2/+5
| | | | | | | | | | | | 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>
* pico-imx7d: README: Add BL33 usage caseJun Nie2019-06-111-0/+44
| | | | | | | 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>
* pico-imx7d: Add bl33 configJun Nie2019-06-111-0/+66
| | | | | | | | 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>
* pico-imx7d: Add boot option for verified bootJun Nie2019-06-111-3/+35
| | | | | | | | 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>
* pico-imx7d: Reserve region of memory to OPTEEJun Nie2019-06-111-0/+5
| | | | | | | | | | | | 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>
* pico-imx7d: Correct uart clock rootJun Nie2019-06-112-1/+19
| | | | | | | | | | | 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>
* imx: mx7: Skip secure init in arch_cpu_initJun Nie2019-06-111-15/+28
| | | | | | | | 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>
* mx7_common: Share configs to skip low level initJun Nie2019-06-112-11/+11
| | | | | | | | | | | | | 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>
* spi: imx: work with cs greater 0Heiko Schocher2019-06-111-22/+52
| | | | | | | currently spi mxc driver can only handle cs 0. Allow it to handle also cs > 0. Signed-off-by: Heiko Schocher <hs@denx.de>
* spi: imx: remove doubled pointer from mxc_spi_probeHeiko Schocher2019-06-111-4/+3
| | | | | | | | | | | 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>
* arm, imx, Makefile: fix u-boot-dtb.imx build in CONFIG_MULTI_DTB_FIT caseHeiko Schocher2019-06-112-1/+14
| | | | | | | | | | | | 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>
* wandboard: Rework Makefile to prevent spl.o from being builtEzequiel Garcia2019-06-112-4/+2
| | | | | | | | 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>
* ARM: imx: dh-imx6: Convert SPI support to DMMarek Vasut2019-06-113-10/+9
| | | | | | | | | | 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>
* ARM: imx: dh-imx6: Convert USB support to DMMarek Vasut2019-06-111-0/+1
| | | | | | | | | | 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>
* ARM: imx: dh-imx6: Convert SATA support to DMMarek Vasut2019-06-113-9/+4
| | | | | | | | | | 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>
* ARM: imx: dh-imx6: Convert SD/MMC support to DMMarek Vasut2019-06-112-57/+3
| | | | | | | | | | 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>
* ARM: imx: dh-imx6: Enable DM GPIOMarek Vasut2019-06-112-0/+11
| | | | | | | | | | 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>
* ARM: imx: dh-imx6: Enable DM pin controlMarek Vasut2019-06-111-0/+3
| | | | | | | | | 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>
* ARM: dts: imx: dh-imx6: Fix SPI CS polarity on DHCOM iMX6 PDK2Marek Vasut2019-06-111-1/+1
| | | | | | | | | 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>
* ARM: dts: imx: dh-imx6: Import DHCOM iMX6 PDK2 DTs from LinuxMarek Vasut2019-06-114-2/+632
| | | | | | | | | | 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>
* Revert "drivers/crypto/fsl: assign job-rings to non-TrustZone"Breno Matheus Lima2019-06-112-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* config: Update KP's imx53 HSC config to pass key pressed informationLukasz Majewski2019-06-111-0/+2
| | | | | | | | | 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>
* config: Update KP's imx53 HSC config to support SWUpdateLukasz Majewski2019-06-111-2/+5
| | | | | | | 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>
* imx: Use a convenient default value for SYS_MALLOC_F_LENFabio Estevam2019-06-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* opos6uldev: don't call enable_lcdif_clockSébastien Szymanski2019-06-111-3/+0
| | | | | | | 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>
* opos6ul: set REFSEL and REFR fieldsSébastien Szymanski2019-06-111-0/+2
| | | | Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
* imx: hab: Increase CSF_SIZE for i.MX6 and i.MX7 devicesBreno Matheus Lima2019-06-112-2/+2
| | | | | | | | | | | | | | | | | | 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>
* colibri-imx6ull: fix usb host modeMarcel Ziswiler2019-06-111-1/+1
| | | | | | | 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>
* ARM: imx: apalis_imx6: Drop ad-hoc SATA bindingMarek Vasut2019-06-111-49/+0
| | | | | | | | | | | | | 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>
* regulator: bd71837: copy the bd71837 pmic driver from NXP imx u-bootMatti Vaittinen2019-06-114-0/+159
| | | | | | | | | | | | 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>
* colibri_imx7: migrate usb to driver modelIgor Opaniuk2019-06-114-0/+95
| | | | | | | | 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>
* configs: imx6-engicam: Update the recoveryboot settingJagan Teki2019-06-111-12/+7
| | | | | | | | | 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>
* toradex apalis/colibri: extend CONFIG_SYS_MALLOC_F_LENIgor Opaniuk2019-06-1111-1/+11
| | | | | | | | | | | | 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>
* apalis_imx6: add device tree to makefileMarcel Ziswiler2019-06-111-0/+1
| | | | | | | | | | | | | | 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>
* apalis/colibri imx6: provide proper fdtfile valueIgor Opaniuk2019-06-112-2/+2
| | | | | | | Provide proper fdtfile env variable value before invoking distro_bootcmd command. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
* ARM: dts: i.MX6ULL: U-Boot specific dts for u-boot, dm-splParthiban Nallathambi2019-06-112-0/+35
| | | | | | | 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>
* power: pfuze100: Fix off by one error in voltage table handlingTrent Piepho2019-06-111-2/+2
| | | | | | | | | | | 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>
* mx7ulp: Add common plugin codes for mx7ulpYe Li2019-06-112-1/+94
| | | | | | | | 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>
* board: toradex: add colibri imx8qxp 2gb wb it v1.0b module supportMarcel Ziswiler2019-06-1112-4/+970
| | | | | | | | | | | | | | | | | | | | | | 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>
* imx: fix building for i.mx8 without splMarcel Ziswiler2019-06-111-0/+2
| | | | | | | | | | | | | | 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>
* ARM: imx6logic: Stop overwriting fdt_file if manually setAdam Ford2019-06-111-1/+2
| | | | | | | | | | 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>
* spl: Correct SPL_SIZE_LIMIT Kconfig optionTom Rini2019-06-081-1/+1
| | | | | | | | | | | 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>
* Merge branch '2019-06-07-master-imports'Tom Rini2019-06-076-26/+95
|\ | | | | | | | | | | | | - 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.
| * spl: add overall SPL size checkSimon Goldschmidt2019-06-075-9/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
View Lorry Controller Status