summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* configs: Migrate all of the existing USB symbols, except fastbootTom Rini2017-09-01230-115/+314
| | | | | | | | | | | | This syncs all of the currently Kconfig'd symbols out of the headers and into the defconfig files. This has two exceptions, first am335x_evm needs to be converted to DM in SPL and then it can stop undef'ing CONFIG_DM_USB. Leaving this as-is results in a build failure, and without work, run time failure. The other case is am43xx_evm.h and in turn am43xx_evm_usbhost_boot. The problem here is that we need DWC3 USB host mode in SPL, but still desire to have gadget mode in U-Boot proper. Signed-off-by: Tom Rini <trini@konsulko.com>
* Revert "Merge git://git.denx.de/u-boot-video"Tom Rini2017-09-012-17/+1
| | | | | | | | | This reverts commit 1d20170467b079642be96996dcd71db64c3c365c, reversing changes made to 6aee2ab68c362ace5a59f89a63abed82e0bf19e5. The mxc_ipuv3_fb.c changes introduce build failures on some targets. Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge git://git.denx.de/u-boot-sunxiTom Rini2017-09-015-6/+5
|\
| * sunxi: Fix CONFIG_SUNXI_GMAC referencesDave Prue2017-09-015-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SUNXI_GMAC was still used to configure the code where as the same has been renamed and moved to Kconfig in below commit "sunxi: Move SUNXI_GMAC to Kconfig" (sha1: 4d43d065db3262f9a9918ba72457bf36dfb8e0bb) Signed-off-by: Dave Prue <dave@prue.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jagan Teki <jagan@openedev.com> Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Tested-by: Mark Kettenis <kettenis@openbsd.org> [Tweek commit message, config_whitelist.txt, build-whitelist.sh] Signed-off-by: Jagan Teki <jagan@openedev.com>
* | Merge git://git.denx.de/u-boot-videoTom Rini2017-09-012-1/+17
|\ \
| * | video: ipuv3_fb: skip IPU shutdown if IPU was not enabled beforeAnatolij Gustschin2017-08-291-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Boards can skip display interface init using board_video_skip(). If display interface was not initialized (e.g. no ipuv3 framebuffer registered or IPU clock disabled), booting Linux stops due to the crash in IPU shutdown function, when accessing IPU registers. Check IPU clock and skip shutdown if clock is not enabled. Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * | splash_source: Verify FIT magicNiko Mauno2017-08-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before reading entire FIT image, add sanity check by testing image header against FDT_MAGIC. This should help avoid problems in situations where FIT is not yet available from storage device, for example when performing initial programming of device. Cc: Anatolij Gustschin <agust@denx.de> Acked-by: Tomas Melin <tomas.melin@vaisala.com>
* | | Merge git://git.denx.de/u-boot-imxTom Rini2017-09-0147-279/+1156
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: configs/imx6qdl_icore_mmc_defconfig configs/imx6qdl_icore_rqs_defconfig
| * | | i.MX6Q: icorem6: Add falcon modeJagan Teki2017-08-303-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Add Falcon mode support in Engicam i.CoreM6 board. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * | | i.MX6Q: spl: Fix falcon to use dram_init_banksizeJagan Teki2017-08-301-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memory dt node update introduced by spl_fixup_fdt() in below commit was making DDR configuration in-appropriate to boot falcon mode. Hence added dram_init_banksize for explicit assignment of proper base and size of DDR. "boot: fdt: Perform arch_fixup_fdt() on the given device tree for falcon boot" (sha1: 6e7585bb64b12f632681c80c4b193349e1985d92) Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * | | imx: remove SATA boot mode for i.MX 6UL and 6ULLStefan Agner2017-08-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NXP i.MX 6UL and 6ULL do not support SATA and have no SATA boot mode, hence remove it from the boot device detecion. This fixes a build error introduced with 3bd1642d4d50 ("imx: fix USB boot mode detection for i.MX 6UL and 6ULL") Fixes: 3bd1642d4d50 ("imx: fix USB boot mode detection for i.MX 6UL and 6ULL") Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Reviewed-by: Stefano Babic <sbabic@denx.de> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * | | icorem6: Fix to find MMC devicesJagan Teki2017-08-292-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U-Boot proper is using DM_MMC so, enable CONFIG_BLK otherwise find_mmc_device failed to detect MMC device. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Stefano Babic <sbabic@denx.de>
| * | | imx6: don't include unneeded boot_mode array in SPLAnatolij Gustschin2017-08-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The soc_boot_modes array is only used by bmode command and not needed in SPL. Don't include it into SPL. Signed-off-by: Anatolij Gustschin <agust@denx.de> Reviewed-by: Stefano Babic <sbabic@denx.de>
| * | | spl: do not repeat timer init on i.MX6Anatolij Gustschin2017-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GPT timer was already initialised in board_init_f() as it is needed in dram init. Do not repeat timer init in board_init_r(). Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Stefano Babic <sbabic@denx.de>
| * | | imx: timer: don't clear the GPT control register multiple timesAnatolij Gustschin2017-08-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to clear the control register 100 times in a loop, a single zero write clears the register. I didn't find any justification why clearing this register in a loop is needed (no info in i.MX6 errata or GPT timer linux driver, linux driver uses single write to clear this control register). Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Stefano Babic <sbabic@denx.de>
| * | | pfla02: Fix RAM detection and support 1 bank SOMStefano Babic2017-08-292-33/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of 2 banks, the address space of the first CS must be defined and not let to the higher value. Add support for SOM with a single bank of RAM. It was tested with i.MX6Q modules in the following configurations: - 2 Banks, 4 GB - 2 Banks, 1 GB - 1 Bank, 1 GB Signed-off-by: Stefano Babic <sbabic@denx.de>
| * | | imx: imx6: Move gpr_init() function to soc.cBreno Lima2017-08-2819-200/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the gpr_init() function is common for boards using MX6S, MX6DL, MX6D, MX6Q and MX6QP processors move it to the soc.c file. Signed-off-by: Breno Lima <breno.lima@nxp.com> Acked-by: Stefano Babic <sbabic@denx.de> Reviewed-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
| * | | imx: use BOOT_DEVICE_BOARD instead of UARTStefan Agner2017-08-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i.MX 6 serial downloader is not necessarily booting via UART but can also boot from USB. In fact only some i.MX chips have serial downloader support via UART (e.g. 6UL/ULL and Vybrid) but all of them have serial downloader support via USB. Use the more appropriate BOOT_DEVICE_BOARD define which is used for ROM provided recovery mechanisms in general. Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
| * | | imx: fix USB boot mode detection for i.MX 6UL and 6ULLStefan Agner2017-08-252-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the reserved boot mode used in the bmode command for i.MX 6UL and 6ULL as introduced in commit 3fd9579085fa ("imx: mx6ull: fix USB bmode for i.MX 6UL and 6ULL"). Also replace BMODE_UART with BMODE_RESERVED, which is more appropriate. Commit 96aac843b68d ("imx: Use IMX6_BMODE_* macros instead of numericals") added macros for boot modes, in the process the reserved boot mode got named BMODE_UART. We use the reserved boot mode in the bmode command to let the boot ROM enter serial downloader recovery mode. But this is only a side effect, the actual boot mode is reserved... Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
| * | | pinctrl: imx7ulp: Add new info instance for iomuxc1Peng Fan2017-08-231-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To i.MX7ULP, we need to create two info instances for iomux0 and iomux1 respectively, otherwise iomuxc0/1 will share one info instance and use one base, because imx_pinctrl_probe will use info to store base address and etc. But iomuxc0/1 actually have different base address. Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Simon Glass <sjg@chromium.org> Cc: Stefano Babic <sbabic@denx.de>
| * | | pinctrl: imx: Fix mask when SHARE_MUX_CONF_REG is setPeng Fan2017-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using SHARE_MUX_CONF_REG, wrong mask is used for writing config value, which causes mux value is cleared. Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Simon Glass <sjg@chromium.org> Cc: Stefano Babic <sbabic@denx.de>
| * | | imx: fix licensing in i.MX filesStefano Babic2017-08-234-35/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some files for i.MX do not yet have the SPDX ID to reference the correct license. Signed-off-by: Stefano Babic <sbabic@denx.de> Reviewed-by: Wolfgang Denk <wd@denx.de>
| * | | imx: mx7: psci: add copyright and licensePeng Fan2017-08-232-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add copyright and license header. Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Stefano Babic <sbabic@denx.de>
| * | | apalis/colibri_imx6: enable SDP by defaultStefan Agner2017-08-232-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Serial Download Protocol (SDP) in SPL and U-Boot. This is useful to make use of imx_usb to download the complete U-Boot (u-boot.img) after SPL has been downloaded. The U-Boot command sdp allows to enumerate as SDP capable device again, e.g. to download a Linux kernel and/or U-Boot script. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
| * | | apalis/colibri_imx6: use independent USB PID for SPLStefan Agner2017-08-232-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a completely independent USB Product ID for SPL. This allows to differentiate a SDP running in SPL and SDP running in a U-Boot which could not read the config block successfully. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> Reviewed-by: Łukasz Majewski <lukma@denx.de>
| * | | doc: add Serial Download Protocol documentationStefan Agner2017-08-231-0/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the U-Boot Serial Download Protocol implementation and some typical use cases. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Reviewed-by: Łukasz Majewski <lukma@denx.de>
| * | | spl: add serial download protocol (SDP) supportStefan Agner2017-08-234-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add USB serial download protocol support to SPL. If the SoC started in recovery mode the SPL will immediately switch to SDP and wait for further downloads/commands from the host side. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Reviewed-by: Stefano Babic <sbabic@denx.de> Reviewed-by: Łukasz Majewski <lukma@denx.de>
| * | | cmd: add sdp commandStefan Agner2017-08-233-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new command to start USB Serial Download Protocol (SDP) state machine. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Reviewed-by: Łukasz Majewski <lukma@denx.de> Reviewed-by: Stefano Babic <sbabic@denx.de>
| * | | usb: gadget: sdp: extend images compatible for jumpsStefan Agner2017-08-231-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support U-Boot images in SPL so that u-boot.img files can be directly downloaded and executed. Furthermore support U-Boot scripts download and execution in full U-Boot so that custom recovery actions can be downloaded from the host in a third step. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Reviewed-by: Łukasz Majewski <lukma@denx.de> Reviewed-by: Stefano Babic <sbabic@denx.de>
| * | | usb: gadget: add SDP driverStefan Agner2017-08-234-0/+745
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SDP (Serial Downloader Protocol) implementation for U-Boot. The protocol is used in NXP SoC's boot ROM and allows to download program images. Beside that, it can also be used to read/write registers and download complete Device Configuration Data (DCD) sets. This basic implementation supports downloading images with the imx header format reading and writing registers. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Reviewed-by: Łukasz Majewski <lukma@denx.de>
| * | | imx: move imximage header to common locationStefan Agner2017-08-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the imximage.h header file to a common location so we can make use of it from U-Boot too. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Reviewed-by: Łukasz Majewski <lukma@denx.de>
* | | | Merge git://git.denx.de/u-boot-marvellTom Rini2017-09-011-1/+1
|\ \ \ \
| * | | | ARM: mvebu: add "spi-flash" compatible stringChris Packham2017-08-301-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U-boots spi-nor support is currently considered a work in progress. For now to avoid issues it is necessary to add a "spi-flash" compatible string. Eventually the "jedec,spi-nor" will be sufficient when the core U-boot code is updated to support it. Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Signed-off-by: Stefan Roese <sr@denx.de>
* | | | Merge git://git.denx.de/u-boot-uniphierTom Rini2017-09-0151-169/+554
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add {ofnode,dev}_read_resource_byname - provide DT probe hook to Denali NAND driver - update clk/reset driver - update DT - misc cleanups
| * | | | ARM: uniphier: enable Denali NAND driver for 64bit SoCsMasahiro Yamada2017-08-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the entry to the NAND driver init can be is controlled by DT; it should not hurt to compile the driver all the time. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | ARM: uniphier: set system bus pinmux for PXs3Masahiro Yamada2017-08-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The system bus is not enabled by default for NAND, eMMC boot etc. of PXs3. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | ARM: uniphier: move CONFIG_NAND to defconfigMasahiro Yamada2017-08-304-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This imply was added when the option was moved by the moveconfig tool, but the intention is not clear. Move it to defconfig. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | ARM: dts: uniphier: update PXs3 SoC/board DTMasahiro Yamada2017-08-302-50/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support PXs3 SoC and its reference development board. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | ARM: dts: uniphier: sync with LinuxMasahiro Yamada2017-08-3022-62/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import updates queued up for Linux 4.14-rc1. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | reset: uniphier: add PXs3 supportMasahiro Yamada2017-08-301-0/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | reset: uniphier: fix compatible for SD reset node for LD11/LD20Masahiro Yamada2017-08-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LD20 has SD ctrl instead of MIO ctrl. LD11 has both of them. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | clk: uniphier: add System clock supportMasahiro Yamada2017-08-304-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support system clocks for LD4, Pro4, sLD8, Pro5, PXs2/LD6b, LD11, LD20. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | ARM: uniphier: fix DSPLL init code for LD20 SoCDai Okamura2017-08-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dai Okamura <okamura.dai@socionext.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | ARM: uniphier: remove ad-hoc pin settings for NANDMasahiro Yamada2017-08-301-24/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now set up by the pinctrl driver when the NAND driver is probed. Remove the legacy code. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | ARM: uniphier: enable CONFIG_NAND_DENALI_DTMasahiro Yamada2017-08-303-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate to the DT-based NAND init entry. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | ARM: uniphier: remove unneeded NAND config optionsMasahiro Yamada2017-08-301-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_NAND_DENALI select's CONFIG_SYS_NAND_SELF_INIT, so the NAND initialization process is driven by the driver itself. CONFIG_SYS_NAND_MAX_CHIPS and CONFIG_SYS_NAND_BASE are unused. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | ARM: uniphier: add PLL settings for PXs3Masahiro Yamada2017-08-301-0/+55
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | ARM: uniphier: move PLLCTRL register macros to each SoC .c fileMasahiro Yamada2017-08-303-21/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new SoC PXs3 changed the address of PLL, but still uses the same PLL name. We can not define SC_*PLLCTRL in the common header. Move them to per-SoC .c file. Also, fix some PLL comments. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | ARM: uniphier: replace <common.h> with <linux/delay.h> in pll settingsMasahiro Yamada2017-08-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The #include <common.h> was added for mdelay(). Later, the declaration of mdelay was moved to <linux/delay.h> by commit 5bc516ed661a ("delay: collect {m, n, u}delay declarations to include/linux/delay.h"). There is no need to include <common.h> now. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | | mtd: nand: denali_dt: add a DT driverMasahiro Yamada2017-08-305-1/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A patch for NAND uclass support was proposed about half a year ago: https://patchwork.ozlabs.org/patch/722282/ It was not merged and I do not see on-going work for this. Without DM-based probing, we need to set up pinctrl etc. in an ad-hoc way and give lots of crappy CONFIG options for base addresses and properties, which are supposed to be specified by DT. This is painful. This commit just provides a probe hook to retrieve "reg" from DT and allocate private data in a DM manner. This DT driver is not essentially a NAND driver, in fact it is (ab)using UCLASS_MISC. Once UCLASS_NAND is supported, it would be possible to migrate to it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>