summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://git.denx.de/u-boot-atmelTom Rini2016-06-136-0/+281
|\
| * arm: at91: Add support for gurnardAndre Renaud2016-06-121-0/+155
| | | | | | | | | | | | | | | | | | | | | | | | This board is based on Snapper 9G45 which has an Atmel AT91SAM9G45 chip and 128MB of SDRAM. It includes a small LCD, 2xUSB host, SD card, Ethernet and two UARTs. Signed-off-by: Andre Renaud <andre@designa-electronics.com> Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Andreas Bießmann <andreas@biessmann.org> [apply CONFIG_BOOTDELAY transition] Signed-off-by: Andreas Bießmann <andreas@biessmann.org>
| * at91: video: Support driver-model for the LCD driverSimon Glass2016-06-121-0/+9
| | | | | | | | | | | | | | | | Add driver-model support to this driver. Most features can be controlled from the device tree. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Andreas Bießmann <andreas@biessmann.org>
| * linux/compat.h: add dev_warn()Andreas Bießmann2016-06-121-0/+2
| | | | | | | | | | | | | | | | | | In order to prevent build errors for copied code from linux introduce dev_warn(). Suggested-by: Scott Wood <oss@buserror.net> Signed-off-by: Andreas Bießmann <andreas@biessmann.org> Acked-by: Simon Glass <sjg@chromium.org>
| * arm: at91: dts: Bring in device tree file for AT91SAM9G45Simon Glass2016-06-123-0/+115
| | | | | | | | | | | | | | | | | | | | Add this file from Linux v4.5. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Heiko Schocher <hs@denx.de> Tested-on: smartweb, corvus, taurus, axm Tested-by: Heiko Schocher <hs@denx.de> Reviewed-by: Andreas Bießmann <andreas@biessmann.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-uniphierTom Rini2016-06-125-15/+0
|\ \
| * | autoboot: follow-up cleanup after CONFIG_BOOTDELAY movesMasahiro Yamada2016-06-134-13/+0
| | | | | | | | | | | | | | | | | | | | | Tidy up garbage left by commit bb597c0eeb7e ("common: bootdelay: move CONFIG_BOOTDELAY into a Kconfig option"). Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: stm32: remove unused CONFIG_AUTOBOOTMasahiro Yamada2016-06-131-2/+0
| |/ | | | | | | | | | | | | At this point, this is not referenced from anywhere, so remove it (but it will be re-added later for a different meaning). Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | ti_armv7_common: env: Remove no longer needed mem_reserveAndrew F. Davis2016-06-121-1/+0
| | | | | | | | | | | | | | | | | | | | The kernel can now use DT to reserve memory carveouts and these areas are now the default for drivers that need reserved memory, so reserving more here is unneeded and any memory reserved this way will be wasted. Signed-off-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
* | Merge branch 'master' of http://git.denx.de/u-boot-sunxiTom Rini2016-06-121-3/+2
|\ \
| * | sunxi: Move the SPL stack top to 0x1A000 on Allwinner A64/A80Siarhei Siamashka2016-06-101-3/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Since the SRAM C corruption issue is now resolved on Allwinner A64, it is possible to move the stack top to the address 0x1A000 on both A64 and A80. The boot ROM can load SPL binaries with up to 32 KiB size on A64 (the 24 KiB SPL size limitation only affects A10/A20), and this patch also ensures the availability of 8 KiB stack. Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2016-06-123-34/+68
|\ \
| * | board: ge: bx50v3: add missing partnum variableKimmo Surakka2016-06-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing ${partnum} to set rootdev correctly when booting from USB or MMC. Signed-off-by: Kimmo Surakka <kimmo.surakka@ge.com> [Rebased against v2016.05 and adjusted the variable name] Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
| * | board: ge: bx50v3: make SATA optional and disabled by defaultAndrew Shadura2016-06-071-1/+2
| | | | | | | | | | | | | | | | | | | | | The SATA support is only useful for development and shouldn't be enabled in production, so it has to be disabled in U-boot by default. Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
| * | board: ge: bx50v3: make network support optional and disabled by defaultAndrew Shadura2016-06-071-0/+2
| | | | | | | | | | | | | | | | | | | | | The network support is only useful for development and shouldn't be enabled in production, so it has to be disabled in U-boot by default. Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
| * | board: ge: bx50v3: make USB support optional and disabled by defaultAndrew Shadura2016-06-071-7/+17
| | | | | | | | | | | | | | | | | | | | | The USB support is only useful for development and shouldn't be enabled in production, so it has to be disabled in U-boot by default. Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
| * | board: ge: bx50v3: make CONFIG_VIDEO optional and disabled by defaultAndrew Shadura2016-06-071-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | The kernel already knows how to initialise the display, and initialising the display from U-boot is only useful for debugging and isn't necessary in production, so no need to have it enabled in U-boot by default. Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
| * | imx: ventana: config: add PREBOOT supportTim Harvey2016-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | | This allows the 'preboot' env variable to be executed prior to bootcmd if defined. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: config: use explicit addr in loadscriptTim Harvey2016-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | If we are loading a script to ${loadaddr} then we need to use that address explicitly when calling the source command in case user has changed loadaddr Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: config: use fs env var for block dev filesystem typeTim Harvey2016-05-311-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to make the default boot scripts more flexible, use the variable 'fs' to specify the filesystem type to use for block storage devices (USB/MMC/SATA) when loading files. Additionally default this to ext4 and enable ext4 filesystem support (which encompasses ext2 support) instead of just ext2 support. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: config: use bootdir env var for directory of fdt filesTim Harvey2016-05-311-6/+6
| | | | | | | | | | | | | | | | | | | | | In order to make the default boot scripts more flexible, use the variable 'bootdir' to specify the filesystem directory to look for fdt files in. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: config: add fixfdt script to apply manual fdt fixupsTim Harvey2016-05-311-10/+15
| | | | | | | | | | | | Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: config: add env vars for disk and partTim Harvey2016-05-311-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | In order to make the default boot scripts more flexible, use the variable 'disk' to specify the disk device number and the variable 'part' to specify the partition number. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | ts4800: add CONFIG_SYS_FSL_ERRATUM_ESDHC_A001Sebastien Bourdelin2016-05-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the MMC data transactions timeout problem on the TS4800. The changes introduced in the commit e978a31 on the timeout calculation for the MMC data transactions has revealed there is something wrong with the timeout setting of the eSDHC controller used in the IMX51. The IMX51 seems to be concerned by this erratum and without this change the MMC driver is unable to do any transactions. Signed-off-by: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
| * | ts4800: update environment to boot with device treeDamien Riegel2016-05-241-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the environment variables to be able to boot with a device tree. The expected partition layout on the SD card is: - partition 1: type 0xDA, contains u-boot.bin - partition 2: type 0xC (fat), contains zImage and device tree - partition 3: type 0x83, root filesystem. Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
| * | imx: ventana: remove SPL_EXT_SUPPORTTim Harvey2016-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove SPL_EXT_SUPPORT to resolve build issue. It may be useful to bring it back in the future after comparing its merits to storing the args/kernel in fixed raw locations. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: use EEPROM register for falcon boot modeTim Harvey2016-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | NAND+MMC env support costs 12KB in the SPL which is fairly expensive just for the ability to specify whether or not to boot to uboot or directly to linux. The Ventana boards have plenty of EEPROM storage so we will use a byte there to signify if we should boot to the bootloader or to the OS. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: config: remove redundant configTim Harvey2016-05-241-3/+0
| | | | | | | | | | | | | | | | | | remove redundant define that exists in mx6_common.h Signed-off-by: Tim Harvey <tharvey@gateworks.com>
* | | armv8: ls2080aqds: Enable QSPI boot supportYuan Yao2016-06-102-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds QSPI boot support for LS2080AQDS board. The QSPI boot image need to be programmed into the QSPI flash first. Then we can switch to booting from QSPI memory space. Signed-off-by: Yuan Yao <yao.yuan@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
* | | configs: ls2080a: Increase load image len in NAND bootYuan Yao2016-06-102-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Yuan Yao <yao.yuan@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
* | | armv8: ls2080aqds: Config QSPI pin mux via FPGA in NAND bootYuan Yao2016-06-101-0/+6
| | | | | | | | | | | | | | | Signed-off-by: Yuan Yao <yao.yuan@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
* | | configs: ls2080aqds: Enable QSPI flash supportYuan Yao2016-06-101-1/+14
| | | | | | | | | | | | | | | | | | | | | Enable QSPI flash related configure options. Signed-off-by: Yuan Yao <yao.yuan@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
* | | armv8: ls2080aqds: disable IFC NOR & QIXIS when QSPI enableYuan Yao2016-06-101-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | When QSPI is enabled, NOR flash and QIXIS can't be accessed through IFC due to pin mux. Enable I2C QIXIS access and I2C early init to read the sysclk and ddrclk. Signed-off-by: Yuan Yao <yao.yuan@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
* | | configs: ls2080a_common: Remove duplicate NOR configsYuan Yao2016-06-102-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The NOR flash related configure options appear in ls2080aqds.h and ls2080ardb.h, and the two files both includ ls2080a_common.h. This patch remove the duplicated options in ls2080a_common.h. Signed-off-by: Yuan Yao <yao.yuan@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
* | | drivers: i2c: mxc: Add early initYuan Yao2016-06-101-0/+3
| |/ |/| | | | | | | | | | | | | Add early i2c init function with conservative divider when the exact clock rate is not available. Signed-off-by: Yuan Yao <yao.yuan@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
* | siemens,am33x: add draco etamin boardHeiko Schocher2016-06-097-2/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | In the draco CPU board family, etamin is a new variant with bigger flash and more RAM. Due to new flash that uses larger pages (4K) some changes are necessary because it impacts the MTD partition layout and the ubi mount parameters. Signed-off-by: Samuel Egli <samuel.egli@siemens.com> Signed-off-by: Heiko Schocher <hs@denx.de> [trini: Move BOOTDELAY into defconfig, just always be 3 now] Signed-off-by: Tom Rini <trini@konsulko.com>
* | siemens,am33x: add ubi fastmap supportSamuel Egli2016-06-091-0/+2
| | | | | | | | | | | | From: Samuel Egli <samuel.egli@siemens.com> Signed-off-by: Heiko Schocher <hs@denx.de>
* | am335x, shc: add support for the am335x based bosch shc boardHeiko Schocher2016-06-091-0/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U-Boot SPL 2016.03-rc3-00019-g6dfb4c2-dirty (Mar 09 2016 - 07:40:06) SHC C3-Sample MPU reference clock runs at 6 MHz Setting MPU clock to 594 MHz Enabling Spread Spectrum of 18 permille for MPU Trying to boot from MMC reading u-boot.img reading u-boot.img U-Boot 2016.03-rc3-00019-g6dfb4c2-dirty (Mar 09 2016 - 07:05:35 +0100) Watchdog enabled I2C: ready DRAM: 512 MiB reloc off 1f783000 MMC: OMAP SD/MMC: 0, OMAP SD/MMC: 1 Net: cpsw U-Boot# Signed-off-by: Heiko Schocher <hs@denx.de>
* | bootstage: call show_boot_progress also in SPLHeiko Schocher2016-06-091-3/+3
| | | | | | | | | | | | show_boot_progress() is now called from SPL also. Signed-off-by: Heiko Schocher <hs@denx.de>
* | power, tps65217: add some definesHeiko Schocher2016-06-091-0/+3
| | | | | | | | | | | | | | | | add the following defines, needed for the upcoming shc board support: Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com>
* | common: bootdelay: move CONFIG_BOOTDELAY into a Kconfig optionHeiko Schocher2016-06-09304-351/+0
| | | | | | | | | | | | | | | | | | | | | | move CONFIG_BOOTDELAY into a Kconfig option. Used for this purpose the moveconfig.py tool in tools. Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
* | ARM: uniphier: do not erase when updating U-Boot image in eMMC deviceMasahiro Yamada2016-06-091-1/+0
| | | | | | | | | | | | Unlike NAND, eMMC can be re-written without erasing. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | ARM: uniphier: support eMMC boot for PH1-LD11 and PH1-LD20Masahiro Yamada2016-06-091-1/+3
| | | | | | | | | | | | | | | | The Boot ROM on PH1-LD11/LD20 exports built-in APIs to load images from an eMMC device. They are useful to reduce the memory footprint of SPL, rather than compiling the whole MMC framework. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | Merge http://git.denx.de/u-boot-samsungTom Rini2016-06-0615-17/+413
|\ \ | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: configs/peach-pi_defconfig configs/peach-pit_defconfig
| * | ARM: exynos: Disable serial support in SPLMarek Vasut2016-05-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The exynos5 platforms use DM in U-Boot and do not use DM in SPL. The serial driver, serial_s5p.c, is DM-only. This is OK for U-Boot, but in SPL, this will fail with the following compile error: drivers/built-in.o: In function `get_current': ...u-boot/drivers/serial/serial.c:387: undefined reference to `default_serial_console' This warning happens because common/console.c is compiled into U-Boot SPL if CONFIG_SPL_SERIAL_SUPPORT . The common/console.c invokes serial_*() functions and since exynos5 does not use DM in SPL, these functions come from drivers/serial/serial.c . The serial_*() locate default serial port by calling default_serial_console(), but because the serial_s5p.c is DM-only, it does no longer define default_serial_console(). Thus the error. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| * | exynos: video: Convert several boards to driver model for videoSimon Glass2016-05-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update several boards to use driver model for video. This involves changes to the EDP and FIMD (frame buffer) drivers. Existing PWM, simple-panel and pwm-backlight drivers are used. These work without additional configuration since they use the device tree settings in the same way as Linux. Boards converted are: - snow - spring - peach-pit - peach-pi All have been tested. Not converted: - MIPI display driver - s5pc210_universal - smdk5420 - smdk5250 - trats - trats2 Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| * | exynos: video: Rename variables for driver modelSimon Glass2016-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use 'priv' for a private pointer and 'regs' for a register pointer. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| * | dts: Add clock and regulator binding files for max77802Simon Glass2016-05-252-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | These are used by peach_pit and peach_pi. Add them so they can be referenced in the device tree files. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| * | exynos: Disable LCD display for boards we can't convertSimon Glass2016-05-255-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | Some boards have the LCD enabled but I cannot test operation for the driver model conversion. Disable the LCD on these to avoid build errors. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| * | exynos: Allow tizen to be built without an LCDSimon Glass2016-05-251-0/+2
| | | | | | | | | | | | | | | | | | | | | This file currently requires an LCD. Adjust it to work without one. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
OpenPOWER on IntegriCloud