summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* trace: Remove the const from write functionsSimon Glass2019-10-111-7/+6
| | | | | | | | The write functions do actually change the contents of memory so it is not correct to use 'const'. Remove it. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* sandbox: pci: Remember the device being emulatedSimon Glass2019-10-111-0/+20
| | | | | | | | | | | | Add a field to the PCI emulator per-device data which records which device is being emulated. This is useful when the emulator needs to check the device for something. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com> [bmeng: rebase the patch against u-boot-x86/master to get it applied cleanly] Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
* Merge tag 'u-boot-imx-20191009' of ↵Tom Rini2019-10-0929-104/+862
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.denx.de/u-boot/custodians/u-boot-imx u-boot-imx-20191009 ------------------- Travis : https://travis-ci.org/sbabic/u-boot-imx/builds/595148532 - MX6UL / ULZ - Toradex board - Allow to set OCRAM for MX6Q/D - MX7ULP - MX8: (container image, imx8mq_mek), SCU API - fix several board booting from SD/EMMC (cubox-i for example) - pico boards [trini: display5 merged manually] Signed-off-by: Tom Rini <trini@konsulko.com>
| * pico-imx7d: fix splash logo drawingJoris Offouga2019-10-081-0/+1
| | | | | | | | | | Signed-off-by: Joris Offouga <offougajoris@gmail.com> Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
| * apalis_imx6: use distroboot by defaultIgor Opaniuk2019-10-081-2/+2
| | | | | | | | | | | | | | Use distro_bootcmd as default bootcmd instead of legacy wrappers. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com> Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
| * colibri_imx6/imx7/imx8x: use distroboot by defaultIgor Opaniuk2019-10-083-4/+6
| | | | | | | | | | | | | | Use distro_bootcmd as defauult bootcmd instead of legacy wrappers. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com> Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
| * imx: Add i.MX8MM EVK board support.Peng Fan2019-10-081-0/+153
| | | | | | | | | | | | | | | | Add board and SoC dts Add ddr training code support SD/MMC/GPIO/PINCTRL/UART Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx: imx8mm: add clock bindings headerPeng Fan2019-10-081-0/+253
| | | | | | | | | | | | Import clock bindings header file from Linux 5.3.0-rc2 Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * imx: mx6ul_14x14_evk: fix link issueAnatolij Gustschin2019-10-081-0/+1
| | | | | | | | | | | | | | | | | | | | Since recent splash changes common code for splashscreen logo should be used instead of adding duplicated code under board directories. mx6ul_9x9_evk and mx6ul_14x14_evk configurations used old board specific logo code and do not link, fix them. Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Peng Fan <peng.fan@nxp.com>
| * imx: add support for i.MX7/i.MX8MQ reset controllerPatrick Wildt2019-10-082-0/+116
| | | | | | | | | | | | | | | | | | | | Add support for the reset controller that's used on the i.MX7D and i.MX8MQ. This will be needed to be able to assert the PCIe reset pins. Bindings taken from Linux, driver implementation mostly taken from Linux and adjusted to U-Boot infrastructure. Signed-off-by: Patrick Wildt <patrick@blueri.se> Reviewed-by: Fabio Estevam <festevam@gmail.com>
| * imx: add support for i.MX8MQ power domain controllerPatrick Wildt2019-10-082-0/+24
| | | | | | | | | | | | | | | | | | | | Add support for the power domain controller that's used on the i.MX8MQ. This will be needed to be able to power on the PCIe controller. Bindings taken from Linux, driver implementation taken from the i.MX8 power domain controller and adjusted for the i.MX8M SoC. Signed-off-by: Patrick Wildt <patrick@blueri.se>
| * imx: wandboard: convert FEC support to DM_ETHAnatolij Gustschin2019-10-081-8/+0
| | | | | | | | | | | | Remove CONFIG_DM_ETH conversion warning to avoid board removal. Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * DM: WDT: Convert WDT driver to use DM/DTS (including SYSRESET)Lukasz Majewski2019-10-081-1/+5
| | | | | | | | | | | | | | | | | | | | This commit enables support for CONFIG_WDT in the U-Boot proper. Moreover, the SYSRESET_WATCHDOG driver is used to support 'reset' command. As SPL is not yet ready for DM conversion, the CONFIG_HW_WATCHDOG is enabled for it. This allows the legacy SPL code to work properly. Signed-off-by: Lukasz Majewski <lukma@denx.de>
| * DM: SPI: Convert display5 to use SPI with DM/DTS (but no in SPL)Lukasz Majewski2019-10-081-2/+5
| | | | | | | | | | | | | | The DM/DTS support for SPI is disabled on purpose for SPL, as it is not supported as of time of this conversion. Signed-off-by: Lukasz Majewski <lukma@denx.de>
| * DM: eth: Switch display5 board to use DM_ETHLukasz Majewski2019-10-081-8/+0
| | | | | | | | | | | | | | After this commit the display5 device would use FEC driver supporting driver model (DM_ETH). Signed-off-by: Lukasz Majewski <lukma@denx.de>
| * DM: I2C: Switch display5 board to use DM_I2CLukasz Majewski2019-10-081-8/+0
| | | | | | | | | | | | | | | | | | | | After this commit the display5 device would use I2C driver supporting driver model (DM_I2C). The 'i2c' and 'eeprom' commands now use DM I2C drivers and initialize on-bus devices according to device tree description. Signed-off-by: Lukasz Majewski <lukma@denx.de>
| * pico-imx6: Add Falcon modeFabio Estevam2019-10-081-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | 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-10-081-0/+10
| | | | | | | | | | | | | | | | 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-10-081-0/+10
| | | | | | | | | | | | | | 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-10-081-9/+11
| | | | | | | | | | | | | | | | | | 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-10-081-0/+130
| | | | | | | | | | | | | | | | | | | | 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>
| * mx53loco: Fix U-Boot corruption after saving the environmentFabio Estevam2019-10-081-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: pico-imx7d: Convert to DM_VIDEOJoris Offouga2019-10-081-1/+1
| | | | | | | | | | | | This commit convert all pico-imx7d to DM_VIDEO Signed-off-by: Joris Offouga <offougajoris@gmail.com>
| * pico-imx7d: Add NYMPH baseboard supportOtavio Salvador2019-10-081-1/+3
| | | | | | | | | | | | | | | | 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-10-081-1/+3
| | | | | | | | | | | | | | | | 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-imx6ul: Add LCD supportFabio Estevam2019-10-081-0/+13
| | | | | | | | | | | | | | | | 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-10-081-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-10-081-2/+4
| | | | | | | | | | | | | | | | 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>
| * imx8qm: correct fdt_filePeng Fan2019-10-081-1/+1
| | | | | | | | | | | | imx8qm-mek.dtb is the correct fdt file, not fsl-imx8qxp-mek.dtb Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * spl: mmc: support loading i.MX container format filePeng Fan2019-10-081-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * imx: imx8qxp_mek: fix CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTORPeng Fan2019-10-081-1/+1
| | | | | | | | | | | | | | | | 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>
| * imx: configs: Cleanup CONFIG_SECURE_BOOT commentsBreno Matheus Lima2019-10-082-6/+0
| | | | | | | | | | | | | | | | | | | | Since commit 6e1f4d2652e7 ("arm: imx-common: add SECURE_BOOT option to Kconfig") the SECURE_BOOT option is selected through Kconfig. Cleanup comments in code to align with this change. Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
| * Kconfig: Migrate CONFIG_CSF_SIZE to KconfigBreno Matheus Lima2019-10-087-31/+0
| | | | | | | | | | | | | | | | | | | | Move CONFIG_CSF_SIZE to Kconfig and define default value as 0x4000. mx8mqevk requires 0x2000 add this configuration in imx8mq_evk_defconfig file. Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
| * ARM: imx: Support larger SPL size on IMX6DQRobert Hancock2019-10-081-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously the SPL size on all iMX6 platforms was restricted to 68KB because the OCRAM size on iMX6SL/DL parts is only 128KB. However, the other iMX6 variants have 256KB of OCRAM. Add an option CONFIG_MX6_OCRAM_256KB which allows using the full size on boards which don't need to support the SL/DL variants. This allows for an SPL size of 196KB, which makes it much easier to use configurations such as SPL with driver model and FDT control. Signed-off-by: Robert Hancock <hancock@sedsystems.ca> Tested-by: Adam Ford <aford173@gmail.com> #imx6q_logic
| * spl: pass args to board_return_to_bootromPeng Fan2019-10-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | Pass spl_image and bootdev to board_return_bootrom. i.MX8MN needs the args to let ROM to load images Cc: Simon Glass <sjg@chromium.org> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Cc: Kever Yang <kever.yang@rock-chips.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * imx: mx6ul_14x14_evk: convert to DM_VIDEOPeng Fan2019-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | To support DM_VIDEO, Add display node for lcdif Drop board iomuxc settings. Enable DM_VIDEO Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Anatolij Gustschin <agust@denx.de>
| * imx: add i.MX6ULZ boardPeng Fan2019-10-081-1/+12
| | | | | | | | | | | | | | | | | | | | Add i.MX6ULZ board support. the i.MX6ULZ is SW compatible with i.MX6ULL. so most code of i.MX6ULL can be reused by i.MX6ULZ. Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
| * arm: dts: sync dts for i.MX6ULPeng Fan2019-10-081-21/+29
| | | | | | | | | | | | | | | | | | Sync kernel dts for i.MX6UL from commit <0a8ad0ffa4d8> ("Merge tag 'for-linus-5.3-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux") Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
* | Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvellTom Rini2019-10-0810-12/+0
|\ \ | | | | | | | | | - Move WATCHDOG_TIMEOUT_MSECS to Kconfig (Heiko)
| * | watchdog: move WATCHDOG_TIMEOUT_MSECS to KconfigHeiko Schocher2019-10-0810-12/+0
| |/ | | | | | | | | | | | | | | | | | | | | move WATCHDOG_TIMEOUT_MSECS to Kconfig and fix all board defconfigs. Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Stefan Roese <sr@denx.de> Acked-by: Lukasz Majewski <lukma@denx.de> Acked-by: Martyn Welch <martyn.welch@collabora.com> Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86Tom Rini2019-10-0816-41/+306
|\ \ | | | | | | | | | | | | | | | | | | - Rename existing FSP code to fsp1 - Add fsp2 directory in preparation to support FSP 2.0 - Various x86 platform codes update - Various bug fixes and updates in dm core, sandbox and spl
| * | dm: core: Drop fdtdec_get_pci_addr()Simon Glass2019-10-081-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | This function ise effectively replaced by ofnode_read_pci_addr() which works with flat tree. Delete it to avoid code duplication. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | x86: Move acpi_s3.h to a common locationSimon Glass2019-10-081-0/+130
| | | | | | | | | | | | | | | | | | | | | | | | At present this hedaer is only available on x86. To allow sandbox to use it for testing, move it to a common location. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | spl: Allow distinguishing between two phases in U-BootSimon Glass2019-10-081-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U-Boot has two distinct phases: before and after relocation. These are commonly referred to as F (running from Flash) and R (Relocated and running from RAM). Some drivers want to do different things in these phases so update the SPL phase function to return a different value for each. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | arm: mxs: Correct CONFIG_SPL_NO_CPU_SUPPORT optionSimon Glass2019-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present this is defined in Kconfig but there is a separate one in the CONFIG whitelist. It looks like these are duplicates. Rename the non-Kconfig one and remove it from the whitelist. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | cros_ec: Add MEC_EMI_BASE and size to the header fileSimon Glass2019-10-081-0/+4
| | | | | | | | | | | | | | | | | | | | | Provide these values which are part of the EC interface now. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | log: Add log_nop() to avoid unused-variable warningsSimon Glass2019-10-081-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | If a log statement includes a variable and logging is disabled, this can generate warnings about unused variables. Add a bit more complexity to the macros to avoid this for the common case. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | serial: ns16550: Add a PCI device/function fieldSimon Glass2019-10-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this UART is used early in boot (before PCI is set up) it is convenient to store the PCI BDF of the UART so that it can be manually configured. This is useful when it is used as a debug UART, for example. Add a new field to hold this information, so that drivers can simply use the existing platform data. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | dm: pci: Add a function to read a PCI BARSimon Glass2019-10-082-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present PCI address transaction is not supported so drivers must manually read the correct BAR after reading the device tree info. The ns16550 has a suitable implementation, so move this code into the core DM support. Note that there is no live-tree equivalent at present. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com> [bmeng: correct the unclear comments in test.dts] Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
| * | pci: Correct 'specifified' and 'Plese' typosSimon Glass2019-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix these spelling errors the header file and documentation. Fix a small typo in the PCI documentation. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>