summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* common: add CMD_GPIO to KconfigThomas Chou2015-11-18-56/+0
| | | | | | | Add CMD_GPIO to Kconfig and run tools/moveconfig.py . Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Reviewed-by: Simon Glass <sjg@chromium.org>
* spl: mmc: add support for BOOT_DEVICE_MMC2Nikita Kiryanov2015-11-18-1/+1
| | | | | | | | | | | Currently the mmc device that SPL looks at is always mmc0, regardless of the BOOT_DEVICE_MMCx value. This forces some boards to implement hacks in order to boot from other mmc devices. Make SPL take into account the correct mmc device. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Reviewed-by: Tom Rini <trini@konsulko.com>
* arm: mx6: cm-fx6: define fallback boot devices for splNikita Kiryanov2015-11-18-1/+0
| | | | | | | | | | | | Use spl alternate boot device feature to define fallback to the main boot device as it is defined by hardware. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Stefano Babic <sbabic@denx.de> Cc: Tom Rini <trini@konsulko.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Stefano Babic <sbabic@denx.de>
* spl: change return values of spl_*_load_image()Nikita Kiryanov2015-11-18-9/+9
| | | | | | | | | | | | | | | | | | | | | | | Make spl_*_load_image() functions return a value instead of hanging if a problem is encountered. This enables main spl code to make the decision whether to hang or not, thus preparing it to support alternative boot devices. Some boot devices (namely nand and spi) do not hang on error. Instead, they return normally and SPL proceeds to boot the contents of the load address. This is considered a bug and is rectified by hanging on error for these devices as well. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Tom Rini <trini@konsulko.com> Cc: Simon Glass <sjg@chromium.org> Cc: Ian Campbell <ijc@hellion.org.uk> Cc: Hans De Goede <hdegoede@redhat.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Jagan Teki <jteki@openedev.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* board: ti: beagle_x15: Rename to indicate support for TI am57xx evmsKipisz, Steven2015-11-18-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BeagleBoard X15 (http://beagleboard.org/x15) support in u-boot does actually support two different platform configuration offered by TI. In addition to BeagleBoard X15, it also supports the TMDXEVM5728 (or more commonly known as AM5728-evm). Information about the TI AM57xx EVM can be found here http://www.ti.com/tool/tmdxevm5728 The EVM configuration is 1-1 compatible with BeagleBoard X15 with the additional support for mPCIe, mSATA, LCD, touchscreen, Camera, push button and TI's wlink8 offering. Hence, we rename the beagle_x15 directory to am57xx to support TI EVMs that use the AM57xx processor. By doing this we have common code reuse. This sets the stage to have a common u-boot image solution for multiple TI EVMs such as that already done for am335x and am437x. This sets the stage for upcoming multiple TI EVMs that share the same code base. NOTE: Commit eae7ae185335 ("am437x: Add am57xx_evm_defconfig using CONFIG_DM") introduced DT support for beagle_x15 under am57xx_evm platform name. However, this ignored the potential confusion arising for users as a result. To prevent this, existing beagle_x15_defconfig is renamed as am57xx_evm_nodt_defconfig to denote that this is the "non device tree" configuration for the same platform. We still retain am57xx-beagle-x15.dts at this point, since we just require the common minimum dts. As a result of this change, users should expect changes in build procedures('make am57xx_evm_nodt_defconfig' instead of 'make beagle_x15_defconfig'). Hopefully, this would be a one-time change. Signed-off-by: Steve Kipisz <s-kipisz2@ti.com> Signed-off-by: Schuyler Patton <spatton@ti.com> Acked-by: Nishanth Menon <nm@ti.com> Acked-by: Lokesh Vutla <lokeshvutla@ti.com>
* Merge git://git.denx.de/u-boot-marvellTom Rini2015-11-17-150/+79
|\
| * arm: kirkwood: ib62x0: drop duplicate defines from CONFIG_SYS_MVFSLuka Perkov2015-11-17-15/+0
| | | | | | | | | | | | These options were already defined in mv-common.h file. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
| * arm: kirkwood: ib62x0: drop dev CONFIG_OF_LIBFDTLuka Perkov2015-11-17-5/+0
| | | | | | | | | | | | It is already defined in included mv-common.h file. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
| * arm: kirkwood: ib62x0: make use of defconfigLuka Perkov2015-11-17-3/+0
| | | | | | | | Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
| * arm: kirkwood: ib62x0: drop CONFIG_CMD_ENV defineLuka Perkov2015-11-17-1/+0
| | | | | | | | | | | | The CONFIG_CMD_ENV is enabled by default so we can safely remove it. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
| * arm: kirkwood: ib62x0: build u-boot.kwbLuka Perkov2015-11-17-0/+3
| | | | | | | | | | | | Avoid double typing in the shell and build u-boot.kwb when running "make" only. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
| * arm: kirkwood: ib62x0: drop CONFIG_MACH_TYPELuka Perkov2015-11-17-5/+0
| | | | | | | | | | | | | | Mainline kernel for this device has only support for device tree. We can safely drop this legacy code. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
| * arm: kirkwood: Move common definitions into common fileQuentin Armitage2015-11-17-107/+70
| | | | | | | | | | | | | | | | Create include/configs/mv-plug-common.h for common definitions for Sheevaplug, Guruplug and Dreamplug. This will make it easier to ensure the built u-boots stay in track with each other Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
| * arm: kirkwood: Remove duplicate definition from dreamplug.hQuentin Armitage2015-11-17-5/+0
| | | | | | | | | | | | CONFIG_DISPLAY_CPUINFO is already defined in mv-common.h Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
| * arm: kirkwood: Align configuration filesQuentin Armitage2015-11-17-2/+5
| | | | | | | | | | | | | | Cosmetic: CONFIG_OF_LIBFDT was in a different position in the config file for the Dreamplug, compared to the Sheevaplug and Guruplug. Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
| * arm: kirkwood: Use common definition for filesystemsQuentin Armitage2015-11-17-30/+20
| | | | | | | | | | | | | | include/configs/mv-common.h brings in the required filesystems if CONFIG_SYS_MVFS is defined, so use it for Sheevaplug and Guruplug. Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
| * arm: kirkwood: Move configuration of some commands to _defconfig filesQuentin Armitage2015-11-17-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | For Marvell plugs, move the configuration of DHCP, NAND/SF, PING and USB commands, and HUSH_PARSER into the _defconfig file, rather than the include/configs/*plug.h files. This avoids compiler warnings of duplicate definitions if the option is selected in the .config, but also defined in the include/configs/*plug.h file. Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
| * arm: kirkwood: Remove duplicate definition of CONFIG_CMD_FATQuentin Armitage2015-11-17-1/+0
| | | | | | | | | | | | include/configs/guruplug.h defined CONFIG_CMD_FAT twice. Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
| * arm: kirkwood: standardise the configurationQuentin Armitage2015-11-17-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | The Marvell plugs are very similar systems, and so it makes sense for their u-boots to have the same commands/configuration. Add EXT4 and MII to Dreamplug, DATE to Guruplug and Sheevaplug. Add CONFIG_SYS_ALT_MEMTEST to Sheevaplug. There are still command differences around NAND, SPI/NOR. Also default to building u-boot.kwb for Sheevaplug and Guruplug. Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
* | board: axs10x switch serial port and Ethernet to driver modelAlexey Brodkin2015-11-18-25/+6
|/ | | | | | | | | | | | | | | | With this change Synopsys DesignWare SDP board is switched to driver model for both serial port (serial_dw) and Ethernet (Designware GMAC). This simplifies include/configs/axs101.h and allows for reuse of Linux's Device Tree description. For simplicity Linux's .dts files are not blindly copied but only very few extracts of them are really used (those that are supported in U-Boot at the moment). Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Reviewed-by: Simon Glass <sjg@chromium.org> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2015-11-16-130/+139
|\
| * splash_source: add support for filesystem formatted sataNikita Kiryanov2015-11-16-0/+1
| | | | | | | | | | | | | | | | | | Add support for loading splashimage from filesystem formatted sata storage. Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
| * splash_source: add support for filesystem formatted usbNikita Kiryanov2015-11-16-0/+1
| | | | | | | | | | | | | | | | | | Add support for loading splash image from USB drive formatted with a filesystem. Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
| * splash_source: add support for filesystem formatted mmcNikita Kiryanov2015-11-16-0/+8
| | | | | | | | | | | | | | | | | | Add support for loading splash image from an SD card formatted with a filesystem. Update boards to maintain original behavior where needed. Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
| * imx6: fix warnings due to switch to distro environmentStefano Babic2015-11-13-2/+2
| | | | | | | | | | | | | | | | | | | | wandboard and mx6cuboxi have warnings because BOOT_DELAY is defined twice. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Vagrant Cascadian <vagrant@debian.org> CC: Otavio Salvador <otavio@ossystems.com.br> CC: Fabio Estevam <fabio.estevam@freescale.com>
| * imx: mx7dsabresd: support lcdifPeng Fan2015-11-12-0/+17
| | | | | | | | | | | | | | | | | | | | | | Support LCDIF for mx7dsabresd board: 1. Add pinmux settings 2. Add VIDEO related macro definition and videomode env settings. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Adrian Alonso <aalonso@freescale.com>
| * imx: mx6ul_14x14_evk: support lcdif displayPeng Fan2015-11-12-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | Support lcdif display: 1. Add pinmux and pad settings for LCDIF 2. Introduce setup_lcd to do the settings for LCDIF 3. Enable VIDEO related macros in board header files 4. Add a new env videomode which is needed by mxsfb.c. The settings for videomode in this patch is for TFT43AB. 5. Tested on mx6ul 14x14/9x9 evk. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de>
| * arm: novena: Fix kernel_addr_r env variableMarek Vasut2015-11-12-1/+1
| | | | | | | | | | | | | | | | | | The kernel_addr_r should be set to the same value as CONFIG_LOADADDR, get rid of the duplication. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Sean Cross <xobs@kosagi.com> Cc: Stefano Babic <sbabic@denx.de>
| * imx: mx7: default enable non-secure modePeng Fan2015-11-12-0/+11
| | | | | | | | | | | | | | | | | | Support PSCI and switch to non-secure mode when booting linux. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Signed-off-by: Frank Li <Frank.Li@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com>
| * arm: imx: Switch mx6cuboxi to use config_distro_bootcmd.h.Vagrant Cascadian2015-11-12-64/+24
| | | | | | | | | | | | | | | | | | | | This allows for more flexible and standardized boot across multiple platforms. Remove redundant legacy boot environment. Cc: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
| * arm: imx: Switch Wandboard to use config_distro_bootcmd.h.Vagrant Cascadian2015-11-12-63/+19
| | | | | | | | | | | | | | | | | | This allows for more flexible and standardized boot across multiple platforms. Remove redundant legacy boot environment. Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
| * mx7dsabresd: enable DFU supportTzu-Jung Lee2015-11-12-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the target board: => dfu 0 mmc 0 On the host PC: $ dfu-util -l Found DFU: [0525:a4a5] devnum=0, cfg=1, intf=0, alt=0, name="image" Found DFU: [0525:a4a5] devnum=0, cfg=1, intf=0, alt=1, name="u-boot" Found DFU: [0525:a4a5] devnum=0, cfg=1, intf=0, alt=2, name="bootimg" Found DFU: [0525:a4a5] devnum=0, cfg=1, intf=0, alt=3, name="rootfs" Update with a full SD image $ dfu-util -a image -D core-image-minimal-imx7dsabresd.sdcard Update u-boot only $ dfu-util -a u-boot -D u-boot.imx Signed-off-by: Tzu-Jung Lee <roylee17@currantlabs.com> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
| * Merge git://git.denx.de/u-bootStefano Babic2015-11-12-138/+3397
| |\
| * | mx7dsabresd: add secure boot supportAdrian Alonso2015-10-30-0/+4
| | | | | | | | | | | | | | | | | | Add secure boot support for mx7dsabresd target board Signed-off-by: Adrian Alonso <aalonso@freescale.com>
| * | imx: hab: rework unified rom section for mx7Adrian Alonso2015-10-30-1/+0
| | | | | | | | | | | | | | | | | | | | | Rework unified section macro select via Kconfig option instead of macro definition in mx7_common header file. Signed-off-by: Adrian Alonso <aalonso@freescale.com>
| * | imx: mx6sabresd: add i.MX6DQP Sabresd supportPeng Fan2015-10-30-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add i.MX6DQP-Sabresd board support: 1. set fdt_file according to board_rev which is set at runtime. 2. Add mx6dqp_ddr_ioregs and calibration value for this board. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com>
| * | imx: mx6sabresd discard PHYS_SDRAM_SIZEPeng Fan2015-10-30-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This macro is not needed, since gd->ram_size is assigned value using function imx_ddr_size(). Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
| * | imx35, flea3: add FIT image supportHeiko Schocher2015-10-30-0/+4
| | | | | | | | | | | | | | | | | | add FIT image support for the flea3 board. Signed-off-by: Heiko Schocher <hs@denx.de>
| * | ts4800: add CONFIG_OF_LIBFDTDamien Riegel2015-10-30-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Linux only boots IMX.51-based boards with device tree, so this board would benefit from supporting it. Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com> Cc: Stefano Babic <sbabic@denx.de>
* | | Merge branch 'series1_v2' of git://git.denx.de/u-boot-sparcTom Rini2015-11-13-409/+720
|\ \ \
| * | | sparc: leon3: Moved GRLIB core header files to common include/grlib directoryDaniel Hellstrom2015-11-13-137/+202
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
| * | | sparc: leon3: Added memory controller initialization using new AMBA PnP ↵Daniel Hellstrom2015-11-13-41/+67
| | | | | | | | | | | | | | | | | | | | | | | | routines. Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
| * | | sparc: Kconfig: Move the CMD_AMBAPP command to KconfigFrancois Retief2015-11-13-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an initr function in the board_r.c file for the AMBA Plug&Play command. Add a Kconfig entry for the ambapp command and remove all CONFIG_CMD_AMBAPP defines from the board configuration headers. Add a Kconfig entry to display the AMBA Plug&Play information on startup. This option is off by default. Remove relevent define from board configuration headers. Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>
| * | | sparc: leon3: Reimplemented AMBA Plug&Play scanning routines.Daniel Hellstrom2015-11-13-190/+414
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
| * | | sparc: Update GRSIM board with memory settings for TSIM evalFrancois Retief2015-11-13-12/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the GRSIM board with the memory settings for the evaluation version of TSIM. This free version of TSIM is used for testing. Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>
| * | | sparc: Update LEON serial drivers to use readl/writel macrosFrancois Retief2015-11-13-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the LEON2/3 serial driver to make use of the readl and writel macros as well as the WATCHDOG_RESET() macro. Add readl/writel and friends to the asm/io.h file. Introduce the gd->arch.uart variable to store register address. Lastly, remove baudrate scaler macro variables from board config. It is now calculated in the serial driver using the global data variable. Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>
* | | | Merge branch 'master' of git://git.denx.de/u-boot-x86Tom Rini2015-11-13-33/+1
|\ \ \ \
| * | | | x86: Remove CONFIG_SYS_EARLY_PCI_INITBin Meng2015-11-13-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_SYS_EARLY_PCI_INIT is not needed any more since with driver model, PCI enumeration is automatically triggered. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
| * | | | x86: crownbay: Remove unused PCI region address macrosBin Meng2015-11-13-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are leftover when converted to use driver model pci. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
| * | | | x86: qemu: Convert to use driver model pciBin Meng2015-11-13-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move to driver model for pci on QEMU. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>