summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://gitlab.denx.de/u-boot/custodians/u-boot-imxWIP/23Sep2019Tom Rini2019-09-23145-2770/+5083
|\ | | | | | | | | | | | | | | | | | | | | | | | | - Fixes i.MX7ULP - No default CSF size in case of SECURE_BOOT - Technexion boards - Nitrogen boards ported to DM - fix for mx53loco - Sync DTS for i.MX6UL(L) - Fuses for i.MX7ULP - i.mx8 : container image, fixes - Fixes for Toradex (apalis) - SPL: allow bigger size for i.MX6Q/D
| * Merge branch 'for-imx' of https://github.com/OSSystems/u-bootStefano Babic2019-09-2219-22/+1520
| |\ | | | | | | | | | Signed-off-by: Stefano Babic <sbabic@denx.de>
| | * pico-imx6: Add Falcon modeFabio Estevam2019-09-202-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Falcon mode support, which allows the SPL to load and jump to the Linux kernel directly, without the need of loading U-Boot proper. CONFIG_SPL_OS_BOOT=y needs to be passed in the defconfig in order to use Falcon mode. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * pico-imx6: Add splashscreen supportFabio Estevam2019-09-203-0/+222
| | | | | | | | | | | | | | | | | | | | | | | | Add splashscreen support. Tested with the parallel FT5x06-WVGA panel. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * pico-imx6: Add Ethernet supportFabio Estevam2019-09-202-0/+84
| | | | | | | | | | | | | | | | | | | | | Add Ethernet support. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * pico-imx6: Fix bootmenu handlingOtavio Salvador2019-09-202-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | We should use a common script to allow booting the U-Boot console as fallback so we ended using a 'default_boot' and 'base_boot' environment scripts to accomplish that. Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * pico-imx6: Add initial supportFabio Estevam2019-09-2013-0/+1155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the initial support for the pico-imx6 variants. DDR initialization is based on the TechNexion's U-Boot code. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * mx6: clock: Allow enable_ipu_clock() to be built for SPL codeFabio Estevam2019-09-201-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | Allow enable_ipu_clock() to be built for SPL code. This is done in preparation for configuring the NoC registers on i.MX6QP in SPL. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * mx53loco: Fix U-Boot corruption after saving the environmentFabio Estevam2019-09-201-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U-Boot binary has grown in such a way that it goes beyond the reserved area for the environment variables. Running "saveenv" causes U-Boot to hang because of this overlap. Fix this problem by increasing the CONFIG_ENV_OFFSET size. Also, in order to prevent this same problem in the future, use CONFIG_BOARD_SIZE_LIMIT, which will detect the overlap in build-time. CONFIG_BOARD_SIZE_LIMIT does not accept math expressions, so declare CONFIG_ENV_OFFSET with its direct value instead. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * configs: Sync all baseboard specific pico-imx7dOtavio Salvador2019-09-164-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This syncs all baseboard specific defconfig using the pico-imx7d_defconfig as base. It changes: - pico-dwarf-imx7d_defconfig - pico-hobbit-imx7d_defconfig - pico-nymph-imx7d_defconfig - pico-pi-imx7d_defconfig Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | board: imx6dl_mamoj: set the value for CSF sizeStefano Babic2019-09-201-1/+2
| |/ | | | | | | | | | | | | | | | | | | Default value is too high and it covers the worst case. SPL for imx6dl_mamoj becomes too big and cannot fit into the OCRAM, but CSF size can be reduced. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Jagan Teki <jagan@amarulasolutions.com> CC: Breno Lima <breno.lima@nxp.com>
| * configs: pico-imx7d: Convert to DM_VIDEOJoris Offouga2019-09-169-38/+137
| | | | | | | | | | | | This commit convert all pico-imx7d to DM_VIDEO Signed-off-by: Joris Offouga <offougajoris@gmail.com>
| * ARM: dts: pico-imx7d: sync device tree with v5.3-rc6Joris Offouga2019-09-161-1/+1
| | | | | | | | | | | | Synchronize device tree with v5.3-rc6 label Signed-off-by: Joris Offouga <offougajoris@gmail.com>
| * ARM: dts: pico-imx7d: Add u-boot.dtsi for uboot specific dts changeJoris Offouga2019-09-162-7/+12
| | | | | | | | | | | | | | This commit introduce u-boot.dtsi Signed-off-by: Joris Offouga <offougajoris@gmail.com> Suggested-by: Peng Fan <peng.fan@nxp.com>
| * imx: fix missing MAINTAINERS pico boardsStefano Babic2019-09-161-0/+2
| | | | | | | | | | | | | | | | | | | | Add missing files pico-nymph-imx7d_defconfig and c>onfigs/pico-dwarf-imx7d_defconfig Signed-off-by: Stefano Babic <sbabic@denx.de> Reviewed-by: Peng Fan <peng.fan@nxp.com> CC: Fabio Estevam <festevam@gmail.com> CC: Otavio Salvador <otavio@ossystems.com.br>
| * imx: sksimx6_defconfig: remove SPL misc option to fix build errorAnatolij Gustschin2019-09-141-1/+0
| | | | | | | | | | | | | | | | | | Remove CONFIG_SPL_DRIVERS_MISC_SUPPORT since it is already defined in include/configs/mx6_common.h for SPL builds. When this option is in defconfig, we get build warnings (or errors when building with -Werror). Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * pico: Convert to CONFIG_FSL_USDHCFabio Estevam2019-09-143-3/+3
| | | | | | | | | | | | | | | | | | | | The eSDHC config symbol has been converted to CONFIG_FSL_USDHC, so adjust it accordingly in order to fix the build errors: https://travis-ci.org/sbabic/u-boot-imx/jobs/584781580#L1287 Reported-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Fabio Estevam <festevam@gmail.com>
| * logos: Add the TechNexion's logoFabio Estevam2019-09-131-0/+0
| | | | | | | | | | | | | | Add the TechNexion's logo from their internal U-Boot tree. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * pico-imx7d: Provide a way to escape the Falcon modeFabio Estevam2019-09-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | When CONFIG_SPL_OS_BOOT is selected, it is still convenient to be able to escape from Falcon mode and boot to U-Boot proper. Add a mechanism that allows booting in U-Boot proper when the key 'c' is entered on console at boot time. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * pico-imx7d: Add instructions for booting in Falcon modeFabio Estevam2019-09-131-0/+91
| | | | | | | | | | | | | | | | | | Improve the README by adding instructions on how to boot using Falcon mode, which allows the SPL to load the kernel directly, without using U-Boot proper. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * pico-imx7d: Add NYMPH baseboard supportOtavio Salvador2019-09-132-1/+71
| | | | | | | | | | | | | | | | This add the boot menu option for the NYMPH baseboard as well as a specific config file for users which wish to use it as a pre-defined board. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * pico-imx7d: Add DWARF baseboard supportOtavio Salvador2019-09-132-1/+71
| | | | | | | | | | | | | | | | This add the boot menu option for the DWARF baseboard as well as a specific config file for users which wish to use it as a pre-defined board. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * pico-imx7d: Sync pico-hobbit-imx7d_defconfigFabio Berton2019-09-131-1/+1
| | | | | | | | | | | | | | | | Update pico-hobbit-imx7d_defconfig using pico-imx7d_defconfig as base to fix device tree file generation. With this all pico-imx7d are creating u-boot-dtb.img files. Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
| * pico-imx6ul: Provide a way to escape the Falcon modeFabio Estevam2019-09-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | When CONFIG_SPL_OS_BOOT is selected, it is still convenient to be able to escape from Falcon mode and boot to U-Boot proper. Add a mechanism that allows booting in U-Boot proper when the key 'c' is entered on console at boot time. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * pico-imx6ul: Update the Falcon mode instructionsFabio Estevam2019-09-131-4/+4
| | | | | | | | | | | | | | Sync the Falcon mode instructions with the ones fro pico-imx7d. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * pico-imx6ul: Add LCD supportFabio Estevam2019-09-136-1/+71
| | | | | | | | | | | | | | | | Add support for the VXT VL050-8048NT-C01 panel connected through the 24 bit parallel LCDIF interface. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * pico-imx6ul: Increase the CONFIG_ENV_OFFSET sizeFabio Estevam2019-09-131-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U-Boot binary has grown in such a way that it goes beyond the reserved area for the environment variables. Running "saveenv" causes U-Boot to hang because of this overlap. Fix this problem by increasing the CONFIG_ENV_OFFSET size. Also, in order to prevent this same problem in the future, use CONFIG_BOARD_SIZE_LIMIT, which will detect the overlap in build-time. CONFIG_BOARD_SIZE_LIMIT does not accept math expressions, so declare CONFIG_ENV_OFFSET with its direct value instead. Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * pico-imx6ul: Add DWARF baseboard supportOtavio Salvador2019-09-132-2/+68
| | | | | | | | | | | | | | | | This add the boot menu option for the DWARF baseboard as well as a specific config file for users which wish to use it as a pre-defined board. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * Revert "habv4: tools: Avoid hardcoded CSF size for SPL targets"Stefano Babic2019-09-132-9/+4
| | | | | | | | This reverts commit 62a52f3f85bf33e286632e99f0d39b2c166af0c4.
| * habv4: tools: Avoid hardcoded CSF size for SPL targetsBreno Matheus Lima2019-09-132-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it's not possible to authenticate the U-Boot proper of mx6ul_14x14_evk_defconfig target: Authenticate image from DDR location 0x877fffc0... bad magic magic=0x0 length=0x00 version=0x3 bad length magic=0x0 length=0x00 version=0x3 bad version magic=0x0 length=0x00 version=0x3 spl: ERROR: image authentication fail Commit 0633e134784a ("imx: hab: Increase CSF_SIZE for i.MX6 and i.MX7 devices") has increased CSF_SIZE to avoid a possible issue when booting encrypted boot images. Commit d21bd69b6e95 ("tools: mkimage: add firmware-ivt image type for HAB verification") is hardcoding the CSF and IVT sizes, the new CSF size is not being considered and u-boot-ivt.img fails to boot. Avoid hardcoded CSF and IVT size to fix this issue. Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
| * imx8: cpu: fix mac fuse word for i.MX8QMPeng Fan2019-09-131-0/+7
| | | | | | | | | | | | | | i.MX8QM does not share same FUSE MAC word index, so update the word index for i.MX8QM. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx8: move i.MX8 cpu desc code to drivers/cpu/imx8_cpu.cPeng Fan2019-09-133-168/+183
| | | | | | | | | | | | | | Move cpu desc code to cpu driver directory and name it imx8_cpu.c No functional change. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx: scu_api: add sc_pm_is_partition_startedPeng Fan2019-09-133-1/+32
| | | | | | | | | | | | | | | | | | Add sc_pm_is_partition_started to check whether a partition has been started. This will be used to detect M4 partition booted up or not, then we could choose which dtb to use. If M4 is up, we need use dtb, such as imx8qm-mek-rpmsg.dtb. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx8: fdt: add optee nodePeng Fan2019-09-131-1/+51
| | | | | | | | | | | | | | | | Add OP-TEE device tree node for Linux according to args passed from ATF. If ATF has been built with OP-TEE running, boot_pointer[1] will indicate that. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx8: save args passed from ATFPeng Fan2019-09-133-1/+38
| | | | | | | | | | | | | | We use information from ATF to know whether OP-TEE is running or not. So save args passed from ATF. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx8: fdt: configure sid for mastersPeng Fan2019-09-131-0/+134
| | | | | | | | | | | | | | | | | | | | On i.MX8QM, sid is programmable, so we could program sid according the value encoded in device tree. This patch support legacy bindings which are still being used by XEN and new bindings used by Linux Kernel. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx: scu_api: add sc_rm_set_master_sidPeng Fan2019-09-132-0/+23
| | | | | | | | | | | | | | Add sc_rm_set_master_sid to set stream sid of masters to make sure they could use smmu. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * configs: imx8qm/qxp_mek: enable CONFIG_OF_SYSTEM_SETUPPeng Fan2019-09-132-0/+2
| | | | | | | | | | | | | | Enable CONFIG_OF_SYSTEM_SETUP to let U-Boot could disable device tree nodes that could not be used by Linux. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx8: disable node when the resource is not ownedPeng Fan2019-09-132-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | When resource is not assigned to non-secure Linux, if linux continue to use the node, linux may crash or hang. So need to set the node status to disabled for not owned resources. The resource id is in the power-domains property in device tree, so parse the power-domains property to get the resource id and use scfw api to check whether it is owned by current partition. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx8qm: correct fdt_filePeng Fan2019-09-131-1/+1
| | | | | | | | | | | | imx8qm-mek.dtb is the correct fdt file, not fsl-imx8qxp-mek.dtb Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx8qm: power up SMMUPeng Fan2019-09-131-0/+7
| | | | | | | | | | | | There is SMMU in i.MX8QM. To use SMMU in Linux, need power up it. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx: sys_proto: add is_imx8qm helperPeng Fan2019-09-131-0/+1
| | | | | | | | | | | | Add is_imx8qm helper which could be used by SoC and Driver code. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx8: Probe the SCU driver by using uclass functionYe Li2019-09-131-9/+2
| | | | | | | | | | | | | | | | Since SCU MU driver has been bound in dm_init, so we don't need to bind it again. Just replace by using uclass function to probe it. Signed-off-by: Ye Li <ye.li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * doc: imx: mkimage: introduce i.MX8 image formatPeng Fan2019-09-131-0/+45
| | | | | | | | | | | | Introduce i.MX8 container set configuration file and add example Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx8qm_mek: switch to use container imagePeng Fan2019-09-133-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | Because FIT could not be used for AHAB secure boot on i.MX8, so switch to use container image that could let SPL verify ATF and U-Boot with AHAB. Enable HUSH_PARSER in defconfig to make run netboot could work. Note: The AHAB related code has not been added. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx8qxp_mek: switch to use container imagePeng Fan2019-09-133-6/+16
| | | | | | | | | | | | | | | | | | | | Because FIT could not be used for AHAB secure boot on i.MX8, so switch to use container image that could let SPL verify ATF and U-Boot with AHAB. Note: The AHAB related code has not been added. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx: add container targetPeng Fan2019-09-133-2/+27
| | | | | | | | | | | | | | | | To support SPL loading container file, add a new Makefile target, and introduce a new Kconfig file to source the cfg file which will be parsed by mkimage. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * spl: mmc: support loading i.MX container format filePeng Fan2019-09-132-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i.MX8 only support AHAB secure boot with Container format image, we could not use FIT to support secure boot, so introduce container support to let SPL could load container images. Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Cc: Tien Fong Chee <tien.fong.chee@intel.com> Cc: York Sun <york.sun@nxp.com> Cc: Marek Vasut <marex@denx.de> Cc: Alex Kiernan <alex.kiernan@gmail.com> Cc: Simon Glass <sjg@chromium.org> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Cc: Kever Yang <kever.yang@rock-chips.com> Cc: Heiko Schocher <hs@denx.de> Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx8: support parsing i.MX8 Container filePeng Fan2019-09-134-0/+186
| | | | | | | | | | | | | | Add parsing i.MX8 Container file support, this is to let SPL could load images in a container file to destination address. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx: imx8qxp_mek: fix CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTORPeng Fan2019-09-132-2/+2
| | | | | | | | | | | | | | | | The first stage of flash.bin is larger than 584 * 512, so when writting u-boot.itb, some data will be override. Enlarge the CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR to fix boot. Signed-off-by: Peng Fan <peng.fan@nxp.com>