summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-atmelTom Rini2016-02-20-4/+432
|\
| * ARM: Add Support for the VInCo platformGregory CLEMENT2016-02-19-0/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Versatile Industrial Communication platform is a community oriented board from Landis + Gyr. It comes with: - an RS-485 port - 2 Ethernet ports - a wireless M-BUS - a 4G modem - a 4MB SPI flash - a 4GB eMMC Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> [rebase on current TOT] Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * arm: at91: Add support for DENX MA5D4 SoM and EVKMarek Vasut2016-02-18-0/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | Add support for DENX MA5D4 SoM and MA5D4EVK board, based on the Atmel SAMA5D4 SoC. The SoM contains the SoC, eMMC, SPI NOR, SPI CAN controllers and DRAM, the baseboard contains UART connectors, ethernet port, microSD slot, LCD header, 2x CAN connector and a lot of expansion headers. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Andreas Bießmann <andreas.devel@googlemail.com> Reviewed-by: Heiko Schocher <hs@denx.de> Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * siemens,at91: enable features for smartwebMatthias Michel2016-02-18-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | New features for smartweb: * switch to hush command parser * change autoboot stop to <ESC><ESC> * allow to write ethaddr Signed-off-by: Matthias Michel <matthias.michel@siemens.com> Reviewed-by: Samuel Egli <samuel.egli@siemens.com> Cc: Roger Meier <r.meier@siemens.com> Cc: Heiko Schocher <hs@denx.de> Reviewed-by: Heiko Schocher <hs@denx.de> Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
* | ARM: tegra: enable USB device mode port on DalmoreStephen Warren2016-02-18-0/+1
| | | | | | | | | | | | | | | | | | This allows U-Boot to expose UMS and DFU protocols on this port in device mode, or to act as a USB host on the port, using an "OTG" (micro-B to female A host) cable. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* | ARM: tegra: don't set CONFIG_USB_MAX_CONTROLLER_COUNTStephen Warren2016-02-18-14/+0
| | | | | | | | | | | | | | | | This option is no longer used now that DM_USB is enabled. Fixes: 534f9d3feffd ("dm: tegra: usb: Move USB to driver model") Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* | tegra: Convert CONFIG_PWM_TEGRA to KconfigSimon Glass2016-02-16-8/+0
| | | | | | | | | | | | | | | | Move this option to Kconfig and clean up the header files. Adjust the only user (the LCD driver) to work with the new driver. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
* | tegra: video: Convert tegra20 LCD driver to driver modelSimon Glass2016-02-16-14/+0
| | | | | | | | | | | | | | | | | | | | | | Move this driver over to use driver model. This involves rearranging the code somewhat. The effect is that everything is run from the probe() method. Boards which use this are fixed up, but only seaboard is tested. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Tom Warren <twarren@nvidia.com>
* | tegra: video: Rename CONFIG_VIDEO_TEGRA to CONFIG_VIDEO_TEGRA20Simon Glass2016-02-16-7/+0
| | | | | | | | | | | | | | | | | | | | | | This option refers only to the tegra20 video driver, so name it as such to avoid confusion with tegra124. Also move this option to Kconfig. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Tom Warren <twarren@nvidia.com>
* | tegra: nyan-big: Move the LCD driver to driver modelSimon Glass2016-02-16-3/+0
| | | | | | | | | | | | | | | | | | | | Adjust the driver to use driver model. The SOR becomes a bridge device. We use the normal simple_panel driver to handle the display itself. We also need to enable some options such as regulators, PWMs and DM_VIDEO itself. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Tom Warren <twarren@nvidia.com>
* | tegra: Allow CONFIG_DM_VIDEO to be used as well as CONFIG_LCDSimon Glass2016-02-16-2/+8
| | | | | | | | | | | | | | | | While we transition to using driver model for video, we need to support both options. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
* | tegra: dts: Sync up the tegra124 device tree files with LinuxSimon Glass2016-02-16-332/+410
|/ | | | | | | Sync up these files with Linux v4.4. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
* ARM: rpi: set initrd_highLubomir Rintel2016-02-15-0/+1
| | | | | | | | | | | | | | | | | | | The kernel gets much too sad when the ramdisk is loaded too high into the 1GiB of memory on Raspberry Pi 2: ## Flattened Device Tree blob at 00000100 Booting using the fdt blob at 0x000100 Loading Ramdisk to 39c14000, end 3ab45067 ... OK Using Device Tree in place at 00000100, end 000045ea ... [ 0.599346] Unpacking initramfs... [ 0.602924] Unable to handle kernel paging request at virtual address f9c14000 Placement of the device tree was fixed in 89ca1000 (ARM: rpi: set fdt_high in the default environment). Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
* OMAP3_logic: Add NAND args to boot UBIFSAdam Ford2016-02-15-0/+6
| | | | | | | | | | With the recent addition of UBI support, this patch will add the preset parameters to allow for mouting an UBIFS from the 'fs' partition in NAND. -V2: ubi.mtd=fs instead of ubi.mtd=4 Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* am43xx: qspi: Fix config to select SPI modeVignesh R2016-02-15-1/+1
| | | | | | | | | | CONFIG_SF_DEFAULT_MODE is used to select default SPI mode when using sf commands. Therefore fix am43xx to use CONFIG_SF_DEFAULT_MODE instead of CONFIG_DEFAULT_SPI_MODE. Signed-off-by: Vignesh R <vigneshr@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Jagan Teki <jteki@openedev.com>
* ARM : DRA7: Switch QSPI to use MODE-0 at 64MHzVignesh R2016-02-15-2/+2
| | | | | | | | | | According to Data Manual(SPRS915P) of AM572x, TI QSPI controller on DRA74 EVM(rev 1.1+) can support up to 64MHz in MODE-0, whereas MODE-3 is limited to 48MHz. Hence, switch to MODE-0 for better throughput. Also, add IODelay parameters for the same. Signed-off-by: Vignesh R <vigneshr@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* arm: VCMA9: because of NOR flash space constrains, activate THUMB build modeDavid Müller (ELSOFT AG)2016-02-15-0/+2
| | | | Signed-off-by: David Müller <d.mueller@elsoft.ch>
* OMAP3: omap3_logic: Grow SPL to 64K from 54KAdam Ford2016-02-15-0/+6
| | | | | | | | Based on the work done by Overo, this seems to help some compilers that have a hard time fitting all the code into the allocated space. Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* OMAP3: am3517_evm: SD/MMC boot with uEnv.txt, zImage, and FDTDerald D. Woods2016-02-15-11/+37
| | | | | | | | | | | | | | | | | | | | | Boot with the Linux zImage and am3517-evm.dtb pair, when SD/MMC media is present. This behavior can be overridden by creating a 'uEnv.txt' file with 'uenvcmd' defined. To boot an existing 'uImage', create the following 'uEnv.txt': [start]----------------------------------------------------------------- loaduimage=fatload mmc 0:1 ${loadaddr} ${bootfile} uenvcmd=run loaduimage; run mmcargs; bootm ${loadaddr} [end]------------------------------------------------------------------- Inspired by similar patches, for other OMAP3 boards, from EEWiki - https://github.com/eewiki/u-boot-patches/tree/master/v2016.01 Signed-off-by: Derald D. Woods <woods.technical@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* Merge branch 'master' of git://git.denx.de/u-boot-uniphierTom Rini2016-02-14-17/+23
|\
| * ARM: uniphier: drop unnecessary "bootm_low" environment defineMasahiro Yamada2016-02-14-1/+0
| | | | | | | | | | | | | | | | | | | | | | This environment define has been here to work around the LMB allocation error introduced by commit 9c11135ce053 ("image: fix getenv_bootm_size() function"). It is no longer needed because the root cause was fixed by commit 0cb389dd1a38 ("image: fix getenv_bootm_size() function again"). Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: change stack pointer address for SPLMasahiro Yamada2016-02-14-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No special reason for the current stack address 0x0ff08000. Change it to 0x00100000 to simplify the init_page_table. There are two types of SoCs in terms of the load address of SPL. [1] PH1-sLD3, PH1-LD4, PH1-sLD8 SPL is loaded at 0x00040000-0x0004ffff [2] PH1-Pro4, PH1-Pro5, ProXstream2, PH1-LD6b SPL is loaded at 0x00100000-0x0010ffff The new stack area (0x000f8000-0x00100000) should be safe for all the cases. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: update U-Boot file names in workflowMasahiro Yamada2016-02-14-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit ad1ecd2063da ("fdt: Build a U-Boot binary without device tree") and commit 03c25bcd263a ("fdt: Build an SPL binary without device tree"), we can use shorter file names for the output images. The default configuration for UniPhier SoCs enables CONFIG_OF_SEPARATE and CONFIG_SPL_OF_CONTROL. In this case, spl/u-boot-spl.bin is the same as spl/u-boot-spl-dtb.bin. Likewise, u-boot.img is the same as as u-boot-dtb.img. So, this change of the flow has no impact. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * ARM: uniphier: fix nfsboot commandMasahiro Yamada2016-02-14-2/+8
| | | | | | | | | | | | This is no longer working, so needs reworking. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: factor out common part of boot commandsMasahiro Yamada2016-02-14-11/+10
| | | | | | | | | | | | | | | | The environment "bootm_low" is updated before the "bootz" command. This is common for all the boot modes (NOR, NAND, TFTP, etc.), so can be factored out. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: add default bootm_low to fix FIT bootMasahiro Yamada2016-02-14-0/+1
| | | | | | | | | | | | | | | | Commit 25d4eb8091f4 ("ARM: uniphier: add bootm_low environment") missed to add "bootm_low" for FIT boot. Set "bootm_low" to the DRAM base address. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * ARM: uniphier: fix NOR boot commandMasahiro Yamada2016-02-14-2/+3
| | | | | | | | | | | | | | | | | | | | Commit 89835b3557fe ("ARM: uniphier: allow to run zImage rather than uImage") changed the kernel boot commands. Unlike "bootm", "bootz" does not relocate the kernel image. When the boot device is a NOR flash, the zImage should be copied from the NOR onto the DRAM before it is passed to the "bootz" command. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | zynqmp: nand: Add Nand driver support for zynqmpSiva Durga Prasad Paladugu2016-02-12-0/+9
|/ | | | | | | | | | Add nand driver support for zynqmp. The Nand controller used in ZynqMP is Arasan Nand Flash controller. Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> [scottwood: Fix checkpatch warning] Signed-off-by: Scott Wood <oss@buserror.net>
* sniper: Drop references to P970Paul Kocialkowski2016-02-08-1/+1
| | | | | | | | | There are various different boards with the same hardware sold as LG Optimus Black, such as P970, P970g and KU5900. Since this port is functional for all variants, it doesn't make sense to keep references to P970. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Reviewed-by: Tom Rini <trini@konsulko.com>
* Remove unused CONFIG_CMD_HWFLOW option and associated dead code.David Müller (ELSOFT AG)2016-02-08-1/+0
| | | | Signed-off-by: David Müller <d.mueller@elsoft.ch>
* Remove unused CONFIG_MODEM_SUPPORT option and associated dead code.David Müller (ELSOFT AG)2016-02-08-4/+0
| | | | Signed-off-by: David Müller <d.mueller@elsoft.ch>
* ARM: rpi: set fdt_high in the default environmentStephen Warren2016-02-08-0/+1
| | | | | | | | | | | | The ARM Linux kernel requires the DT to be in memory accessible early during the boot process. This always happens naturally on the RPi 1, since the maximum memory size of 512MiB, and additionally some of that is reserved for use by the GPU. The RPi 2 has 1GiB of RAM (minus some GPU usage), and so if the DT is relocated to the top of RAM, Linux cannot access it. Prevent this from happening by setting fdt_high. Cc: Daniel Stone <daniels@collabora.com> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
* ARM: rpi: update memory layout env. var. documentationStephen Warren2016-02-08-5/+11
| | | | | | | | | | | | | Update rpi-common.h's documentation that describes the rationale for choosing various addresses for standardized variables used by boot scripts. This comment was correct when written, but not updated when some of the values were changed. Fixes: 14006a567105 ("rpi: set fdt_addr_r to 0x00000100 to match default ...device_tree_address") Cc: Jonathan Liu <net147@gmail.com> Cc: Daniel Stone <daniels@collabora.com> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
* OMAP3: omap3_logic: Remove YAFFS support.Adam Ford2016-02-08-2/+0
| | | | | | | | UBIFS is the preferred FS, and YAFFS isn't officially included in Linux. Removing this feature reduces the code size. Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* OMAP3: omap3_logic: Enable CONFIG_SMC911X_32_BITAdam Ford2016-02-08-1/+1
| | | | | | | | The interface automatically converts one 32-bit word into two 16 words. The README said it is permissible to use this flag in that scenario. Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* OMAP3: omap3_logic: Enable Android FastbootAdam Ford2016-02-08-0/+21
| | | | | | | | | Android Fastboot requires USB. The TWL4030 PMIC on omap3_logic handles USB traffic. This patch sets up the USB gadget and Android Fastboot to match what is done in the omap3_beagle project. Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* dm: freescale: Drop mxs_auart serial driverSimon Glass2016-02-08-2/+0
| | | | | | | This does not appear to be used, and has not been converted to driver model by the deadline (doc/driver-model/serial-howto.txt). Signed-off-by: Simon Glass <sjg@chromium.org>
* OMAP3: Enable SPL on omap3_logicAdam Ford2016-02-08-124/+129
| | | | | | | | | | | Previously, Omap3_logic assumed X-loader was present. With this patch, we can finally replace X-loader with an MLO generated by U-Boot. This requires ECC to be setup to match the Linux Kernel and the PBIAS confgured for the SD card. Signed-off-by: Derald D. Woods <woods.technical@gmail.com> Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* tools: env validate: pass values as 0-based arrayAndreas Fenkart2016-02-08-1/+1
| | | | | | passing argv/argc can produce off-by-one errors Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com>
* Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-stagingTom Rini2016-02-08-71/+80
|\
| * fdt: introduce fdtdec_get_child_countPeng Fan2016-02-06-0/+9
| | | | | | | | | | | | | | | | | | Introduce fdtdec_get_child_count for get the number of subnodes of one parent node. Signed-off-by: Peng Fan <van.freenix@gmail.com> Cc: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
| * Use correct spelling of "U-Boot"Bin Meng2016-02-06-71/+71
| | | | | | | | | | | | | | | | | | | | Correct spelling of "U-Boot" shall be used in all written text (documentation, comments in source files etc.). Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Heiko Schocher <hs@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Minkyu Kang <mk7.kang@samsung.com>
* | dm: pci: Add missing forward declarationsBin Meng2016-02-05-11/+5
| | | | | | | | | | | | | | | | When CONFIG_DM_PCI_COMPAT is not on, there is only a forward declaration for pci_write_config32(). Add other missing ones. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | x86: chromebox_panther: Drop the cache line size hackBin Meng2016-02-05-2/+0
| | | | | | | | | | | | | | Now that the RTL8169 driver warning is fixed we can drop this. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | efi: app: Disable CONFIG_USB_EHCI_PCIBin Meng2016-02-05-0/+1
| | | | | | | | | | | | | | | | It does not build if without CONFIG_DM_PCI_COMPAT. For now we just disable it, until some day we add USB support to EFI application. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | efi: app: Clean up defconfigBin Meng2016-02-05-3/+0
| | | | | | | | | | | | | | | | Move some #undef from efi-x86.h to efi-x86_defconfig as these are already Kconfig options. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | dm: pch: Add get_io_base opBin Meng2016-02-05-0/+18
| | | | | | | | | | | | | | | | | | | | On some newer chipset (eg: BayTrail), there is an IO base address register on the PCH device which configures the base address of a memory-mapped I/O controller. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
* | dm: pch: Add get_gpio_base opBin Meng2016-02-05-0/+18
| | | | | | | | | | | | | | | | | | | | x86 GPIO registers are accessed via I/O port whose base address is configured in a PCI configuration register on the PCH device. Add an op get_gpio_base to get the GPIO base address from PCH. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
* | dm: pch: Rename get_sbase op to get_spi_baseBin Meng2016-02-05-4/+4
| | | | | | | | | | | | | | | | Spell out 'sbase' to 'spi_base' so that it looks clearer. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
* | dm: pch: Remove pch_get_version opBin Meng2016-02-05-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | pch_get_version op was only used by the ich spi controller driver, and does not really provide a good identification of pch controller so far, since we see plenty of Intel PCH chipsets and one differs from another a lot, which is not simply either a PCHV_7 or PCHV_9. Now that ich spi controller driver was updated to not get such info from pch, the pch_get_version op is useless now. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>