summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master'Albert ARIBAUD2014-05-23-8/+38
|\
| * arm: rmobile: lager: Enable CONFIG_SYS_GENERIC_BOARDNobuhiro Iwamatsu2014-05-21-0/+1
| | | | | | | | | | | | Add CONFIG_SYS_GENERIC_BOARD to use common/board_*.c for lager. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: koelsch: Enable CONFIG_SYS_GENERIC_BOARDNobuhiro Iwamatsu2014-05-21-0/+1
| | | | | | | | | | | | Add CONFIG_SYS_GENERIC_BOARD to use common/board_*.c for koelsch. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: armadillo800eva: Enable CONFIG_SYS_GENERIC_BOARDNobuhiro Iwamatsu2014-05-21-0/+1
| | | | | | | | | | | | Add CONFIG_SYS_GENERIC_BOARD to use common/board_*.c for armadillo800eva. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: koelsch: Add support ext4/fat write commandNobuhiro Iwamatsu2014-05-21-1/+4
| | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: lager: Add support ext4/fat write commandNobuhiro Iwamatsu2014-05-21-1/+4
| | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: lager: Add support command and filesystems of VFATNobuhiro Iwamatsu2014-05-21-0/+5
| | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: lager: Add support USB controllerNobuhiro Iwamatsu2014-05-21-0/+7
| | | | | | | | | | | | Lager board has USB ports. This add support of USB controller of rmobile. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: koelsch: Add support command and filesystems of VFATNobuhiro Iwamatsu2014-05-21-0/+6
| | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: koelsch: Add support USB controllerNobuhiro Iwamatsu2014-05-21-0/+7
| | | | | | | | | | | | Koelsch board has USB ports. This add support of USB controller of rmobile. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: lager: Enable optimization of thumbNobuhiro Iwamatsu2014-05-21-0/+1
| | | | | | | | | | | | | | This adds CONFIG_SYS_THUMB_BUILD to config, in order to enable optimization of thumb. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: lager: Remove CONFIG_USE_ARCH_MEMSET and MEMCPYNobuhiro Iwamatsu2014-05-21-2/+0
| | | | | | | | | | | | Because do not need these feature to lager board, this delete it. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: lager: Remove define of SCIF registerNobuhiro Iwamatsu2014-05-21-1/+0
| | | | | | | | | | | | The define of SCIF register was already defined in rcar-base.h. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: koelsch: Enable optimization of thumbNobuhiro Iwamatsu2014-05-21-0/+1
| | | | | | | | | | | | | | This adds CONFIG_SYS_THUMB_BUILD to config, in order to enable optimization of thumb. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: koelsch: Remove CONFIG_USE_ARCH_MEMSET and MEMCPYNobuhiro Iwamatsu2014-05-21-2/+0
| | | | | | | | | | | | Because do not need these feature to koelsch board, this delete it. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
| * arm: rmobile: koelsch: Remove define of SCIF registerNobuhiro Iwamatsu2014-05-21-1/+0
| | | | | | | | | | | | The define of SCIF register was already defined in rcar-base.h. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
* | Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'Albert ARIBAUD2014-05-23-12/+42
|\ \
| * | zynq: load u-boot-dtb.img if CONFIG_OF_SEPARATE is definedMasahiro Yamada2014-05-15-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SPL should load "u-boot-dtb.img" if both CONFIG_OF_CONTROL and CONFIG_OF_SEPARATE are defined. Otherwise, "u-boot.img" should be loaded. Since CONFIG_OF_CONTROL is always undefined for SPL_BUILD, the undef block should be moved below the conditional definition of CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | ARM: zynq: Extend maximum number of command argumentsMichal Simek2014-05-14-1/+1
| | | | | | | | | | | | | | | | | | 15 was too small for variables stored in file on MMC. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | ARM: zynq: Enable EXT4 configsSiva Durga Prasad Paladugu2014-05-14-0/+2
| | | | | | | | | | | | | | | | | | | | | Enabled the EXT4 configs. Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | ARM: zynq: Move USB/SD/MMC common FAT configsSiva Durga Prasad Paladugu2014-05-14-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | Moved the USB/SD/MMC common FAT configs separately to avoid redefinition warnings. Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | ARM: zynq: Enable the FAT write capabilitySiva Durga Prasad Paladugu2014-05-14-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Enable the FAT write capability for SD/MMC write functionality. Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | ARM: zynq: Added USB host support for zynq boardsSiva Durga Prasad Paladugu2014-05-14-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | Added configs to support USB host for zynq boards. Also added a command usbboot to boot from usb. Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | ARM: zynq: Extend kernel image size to 60MBMichal Simek2014-05-14-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend max kernel image size. Gunzip is checking this value. If kernel is larger, message below is shown. Uncompressing Kernel Image ... Error: inflate() returned -5 GUNZIP: uncompress, out-of-mem or overwrite error - must RESET board to recover Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | ARM: zynq: Call zynq board_init() in SPLMichal Simek2014-05-14-0/+1
| | | | | | | | | | | | | | | | | | Call board_init() if SPL is configured with CONFIG_SPL_BOARD_INIT. Signed-off-by: Michal Simek <monstr@monstr.eu>
* | | Merge branch 'master' of git://git.denx.de/u-boot-mmcTom Rini2014-05-23-4/+16
|\ \ \
| * | | mmc: provide a select_hwpart implementation for get_device()Stephen Warren2014-05-23-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables specifying which eMMC HW partition to target for any U-Boot command that uses the generic get_partition() function to parse its command-line arguments. Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
| * | | Add the function 'confirm_yesno' for interactivePierre Aubert2014-05-23-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User's confirmation is asked in different commands. This commit adds a function for such confirmation. Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Pierre Aubert <p.aubert@staubli.com>
| * | | eMMC: add support for operations in RPMB partitionPierre Aubert2014-05-23-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds functions for read, write and authentication key programming for the Replay Protected Memory Block partition in the eMMC. Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Pierre Aubert <p.aubert@staubli.com>
| * | | mmc: Handle switch error status bit in MMC card statusAndrew Gabbasov2014-05-23-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MMC switch command for unsupported feature (e.g. bus width) sets a switch error bit in card status. This bit should be checked, and, if it's set, no access with new controller settings should be performed. Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
| * | | Add board_mmc_init(...) function for init mmc1 onlyHannes Petermaier2014-05-23-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since B&R boards uses only MMC-Controller #1, it only wastes time if we initialize #0 first to see that there is nothing. Cc: <trini@ti.com> Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
* | | | Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblazeTom Rini2014-05-22-5/+43
|\ \ \ \
| * | | | fpga: Added support to load bit stream from SD/MMCSiva Durga Prasad Paladugu2014-05-20-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support to load a bitstream image in chunks by reading it in chunks from SD/MMC. Command format: loadfs [dev] [address] [image size] [blocksize] <interface> [<dev[:part]>] <filename> Example: fpga loadfs 0 1000000 3dbafc 4000 mmc 0 fpga.bin Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | | zynq: Enable fpga loadp and loadbp commandsMichal Simek2014-05-20-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new fpga commands for loading partial bitstreams. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | | fpga: Add support to load partial bitstreamsMichal Simek2014-05-20-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support to load partial bitstreams. The partial bitstreams can be loaded using the below commands Commands: fpga loadp <dev> <addr> <size> fpga loadbp <dev> <addr> <size> The full bit streams can be loaded using the old commands(fpga load and fpga loadb). Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | | fpga: Define bitstream type based on command selectionMichal Simek2014-05-20-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up partial, full and compressed bitstream handling. U-Boot supports full bitstream loading and partial based on detection which is not 100% correct. Extending fpga_load/fpga_loadbitstream() with one more argument which stores bitstream type. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | | fpga: Guard the LOADMK functionality with CMD_FPGA_LOADMKSiva Durga Prasad Paladugu2014-05-20-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guard the LOADMK functionality with config to provide an option to enable or disable it. Enable it for all platforms in mainline which enable CONFIG_CMD_FPGA. Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | | configs: iocom: Fix typo on CMD_FPGA commandMichal Simek2014-05-20-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Fix typo in CMD_FPGA command enabling. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | | | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2014-05-22-114/+751
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote-tracking branch 'u-boot/master'Albert ARIBAUD2014-05-20-330/+1243
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boards.cfg Conflicts were trivial once u-boot-arm/master boards.cfg was reformatted (commit 6130c146) to match u-boot/master's own reformatting (commit 1b37fa83).
| * | | Merge remote-tracking branch 'u-boot-sh/rmobile'Albert ARIBAUD2014-05-16-69/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boards.cfg Trivial conflict, maintainer change plus board addition
| | * | | arm: rmobile: lager: Remove MACH_TYPE_LAGER and CONFIG_MACH_TYPENobuhiro Iwamatsu2014-04-28-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MACH_TYPE_LAGER and CONFIG_MACH_TYPE are not already available on Lager board. This removes them. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | | arm: rmobile: lager: Update calculation of CONFIG_SH_TMU_CLK_FREQNobuhiro Iwamatsu2014-04-28-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_SH_TMU_CLK_FREQ of lager is calculated from the external clock. This defines RMOBILE_XTAL_CLK, this updates the calculation of CONFIG_SH_TMU_CLK_FREQ. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | | arm: rmobile: koelsch: Update calculation of CONFIG_SH_TMU_CLK_FREQNobuhiro Iwamatsu2014-04-28-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_SH_TMU_CLK_FREQ of koelsch is calculated from the external clock. This defines RMOBILE_XTAL_CLK, this updates the calculation of CONFIG_SH_TMU_CLK_FREQ. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | | arm: rmobile: lager: Remove NOR-Flash supportNobuhiro Iwamatsu2014-04-28-31/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lagar board has NOR-Flash. But user uses SPI-Flash ROM instead of NOR-Flash. This removed the setting of NOR-Flash. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | | arm: rmobile: koelsch: Remove NOR-Flash supportNobuhiro Iwamatsu2014-04-28-31/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Koelsch board has NOR-Flash. But user uses SPI-Flash ROM instead of NOR-Flash. This removed the setting of NOR-Flash. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | | Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD2014-05-16-2/+475
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of git://git.denx.de/u-boot-armStefano Babic2014-05-15-6782/+2133
| | |\ \ \ \
| | * | | | | wandboard: Pass video kernel arguments for HDMI and LCDOtavio Salvador2014-05-09-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This checks if the 7" WVGA produced by Future Eletronics is detected and pass the needed kernel arguments for it to work. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * | | | | wandboard: add Future Eletronics 7" WVGA LCD extension boardOtavio Salvador2014-05-09-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for the 7" WVGA produced by Future Eletronics and make it dynamically detect if it is connected or not based on the touchscreen controller. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Stefano Babic <sbabic@denx.de>