summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* sunxi: non-FEL SPL boot support for sun7iIan Campbell2014-05-25-0/+26
| | | | | | | | | | | Add support for booting from an MMC card. Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Henrik Nordström <henrik@henriknordstrom.net> Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Reviewed-by: Marek Vasut <marex@denx.de> Cc: Tom Cubie <Mr.hipboi@gmail.com> Reviewed-by: Tom Rini <trini@ti.com>
* sunxi: mmc supportIan Campbell2014-05-25-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mon, 2014-05-05 at 14:18 +0200, Stefan Roese wrote: > > + case 1: > > +#if CONFIG_MMC1_PG > Are you sure that this is correct and shouldn't be: > > +#ifdef CONFIG_MMC1_PG > > ? It's "correct" in so far as it works (the boards.cfg config stuff #defines things to 1), but I think you are right that it isn't the preferred style. But... > A quick scan through this patch series shows that this define > is not set at all. Perhaps its outdated? Or is it used to support > some other sunxi SoC? Not sure, perhaps it should be removed for > now. ...I had thought that it was to support some other board which wasn't being upstreamed right now, so eventually useful and harmless for now, but I've just checked and it isn't actually used by any of the boards in u-boot-sunxi.git. So rather than fix it to use #ifdef lets drop it. Rather than resend the entire series, here is v5.1 of this patch. > Other than this please add my: > > Reviewed-by: Stefan Roese <sr@denx.de> Thanks! 8<--------------------------------- >From 20704e35a41664de5f516ed0e02981ac06085102 Mon Sep 17 00:00:00 2001 From: Ian Campbell <ijc@hellion.org.uk> Date: Fri, 7 Mar 2014 04:29:39 +0000 Subject: [PATCH v5.1 7/8] sunxi: mmc support This adds support for the MMC controller on the Allwinner A20 (sun7i) processor. Signed-off-by: Henrik Nordstrom <henrik@henriknordstrom.net> Signed-off-by: Luke Leighton <lkcl@lkcl.net> Signed-off-by: Oliver Schinagl <oliver@schinagl.nl> Signed-off-by: Wills Wang <wills.wang.open@gmail.com> Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by: Stefan Roese <sr@denx.de> Cc: Tom Cubie <Mr.hipboi@gmail.com> Cc: Aaron Maoye <leafy.myeh@allwinnertech.com> Cc: Pantelis Antoniou <panto@antoniou-consulting.com> Reviewed-by: Tom Rini <trini@ti.com>
* sunxi: add gmac Ethernet supportIan Campbell2014-05-25-0/+18
| | | | | | | | | | | Add support for the GMAC Ethernet controller on Allwinner A20 (sun7i) processors. Enable for the Cubietruck. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Jens Kuske <jenskuske@gmail.com> Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by: Tom Rini <trini@ti.com>
* sunxi: add sun7i cpu, board and start of day supportIan Campbell2014-05-25-0/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds generic board, start of day and basic build system support for the Allwinner A20 (sun7i) processor. This code will not been compiled until the build is hooked up in a later patch. It has been split out to keep the patches manageable. Signed-off-by: Adam Sampson <ats@offog.org> Signed-off-by: Aleksei Mamlin <mamlinav@gmail.com> Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Emilio López <emilio@elopez.com.ar> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Henrik Nordstrom <henrik@henriknordstrom.net> Signed-off-by: Jens Kuske <jenskuske@gmail.com> Signed-off-by: Luc Verhaegen <libv@skynet.be> Signed-off-by: Luke Leighton <lkcl@lkcl.net> Signed-off-by: Oliver Schinagl <oliver@schinagl.nl> Signed-off-by: Patrick Wood <patrickhwood@gmail.com> Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Wills Wang <wills.wang.open@gmail.com> Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Reviewed-by: Marek Vasut <marex@denx.de> Cc: Tom Cubie <Mr.hipboi@gmail.com> Reviewed-by: Tom Rini <trini@ti.com>
* ARM: highbank: convert to generic boardRob Herring2014-05-25-0/+1
| | | | | | Enable CONFIG_SYS_GENERIC_BOARD on highbank. Signed-off-by: Rob Herring <robh@kernel.org>
* lsxl: rework boot scriptsMichael Walle2014-05-25-9/+31
| | | | | | | | | | | | Move addresses for kernel, ramdisk and fdt blob to own variables. Add dtb blob loading to all existing boot scripts, dtb filenames were taken from vanilla kernel. Introduce new boot script bootcmd_legacy, which only loads a kernel and a ramdisk. Make this the default boot script. This should also restore the behaviour of the original bootloader. Cc: Prafulla Wadaskar <prafulla@marvell.com> Cc: Tom Rini <trini@ti.com> Signed-off-by: Michael Walle <michael@walle.cc>
* lsxl: use 64bit for LBA48 to support 4 TB drivesMichael Walle2014-05-25-0/+1
| | | | | Cc: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Michael Walle <michael@walle.cc>
* Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'Albert ARIBAUD2014-05-24-201/+317
|\
| * cm-t54: add environment partition runtime detectionDmitry Lifshitz2014-05-23-0/+1
| | | | | | | | | | | | | | Add environment partition runtime detection callback. Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
| * cm-t54: add EEPROM support and MAC address handlingDmitry Lifshitz2014-05-23-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | cm-t54 Eth MAC address is stored in onboard EEPROM. Add EEPROM support and setup stored Eth MAC address. If EEPROM does not contain a valid MAC, then generate it from the processor ID code (reference code is taken from OMAP5 uEvm board file). Modify Device Tree blob MAC address field with retrieved data. Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
| * cm-t54: add cm-t54 board supportDmitry Lifshitz2014-05-23-0/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cm-t54 board directory, config file. Enable build. Basic support includes: Serial console SD/MMC eMMC USB Ethernet Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
| * arm, am33xx: Enable CONFIG_SYS_GENERIC_BOARD for siemens boardsHeiko Schocher2014-05-23-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@ti.com> Cc: Samuel Egli <samuel.egli@siemens.com> Cc: Roger Meier <r.meier@siemens.com> Tested-by: Samuel Egli <samuel.egli@siemens.com>
| * omap4: duovero: Add Gumstix DuoVero machine.Ash Charles2014-05-23-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | This adds the Gumstix DuoVero machine [1]. This is a OMAP4430-based computer-on-module (COM aka SOM) that can be mounted on various expansion boards with different peripherals. [1] https://store.gumstix.com/index.php/category/43/ Signed-off-by: Ash Charles <ash@gumstix.com> [trini: Rename gpmc_enable_gpmc_cs_config to gpmc_enable_gpmc_net_config] Signed-off-by: Tom Rini <trini@ti.com>
| * omap3: overo: Use common configurations for OveroAsh Charles2014-05-23-194/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | Clean-up the board configuration file for the Gumstix Overo board by including common omap3 definitions from ti_omap3_common.h as suggested here [1]. [1] http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/185960 Signed-off-by: Ash Charles <ashcharles@gmail.com> Conflicts: include/configs/omap3_overo.h
| * Allow overo to boot with device treeAsh Charles2014-05-23-20/+38
| | | | | | | | | | | | | | Update the board configuration for Gumstix Overo. In particular, add support for zImage and DTB files on boot. Signed-off-by: Ash Charles <ashcharles@gmail.com>
| * arm: omap3: Fix omap3_overo SPL boot hangupAsh Charles2014-05-23-0/+6
| | | | | | | | | | | | | | | | | | | | | | Patch f33b9bd3 [arm: omap3: Enable clocks for peripherals only if they are used] breaks SPL booting on Overo. Since some gpio inputs are read to detect the board revision. But with this patch above, the clocks to the GPIO subsystems are not enabled per default any more. The GPIO banks need to be configured specifically now. Signed-off-by: Ash Charles <ashcharles@gmail.com>
| * OMAP3: overo: eliminate hard-coded partition offsetsAsh Charles2014-05-23-9/+1
| | | | | | | | | | | | | | | | | | | | The linux kernel is at nand0,3 using the current layout, but is best accessed through the partition label "linux". Since CONFIG_CMD_MTDPARTS is defined the CONFIG_JFFS2 settings are unreferenced; use "setenv partition rootfs" to set the default mtd partition for jffs2. Signed-off-by: Peter A. Bigot <pab@pabigot.com> Tested-by: Ash Charles <ash@gumstix.com>
| * OMAP3: overo: increase linux partition to 8 MiBPeter A. Bigot2014-05-23-2/+2
| | | | | | | | | | | | | | | | Linux kernel at version 3.5 is about 3.5 MiB; test kernels for 3.10 exceed 4 MiB. Prepare for future upgrades by increasing the NAND partition now. Signed-off-by: Peter A. Bigot <pab@pabigot.com> Tested-by: Ash Charles <ash@gumstix.com>
| * OMAP3: overo: add command support for mtd and ubiAsh Charles2014-05-23-3/+37
| | | | | | | | | | | | | | | | | | The NAND linux partition format default was changed from jffs2 to ubi in 254973e6df0e48f1a72b67905185c774dcd9f394 but the corresponding commands were not enabled. Signed-off-by: Peter A. Bigot <pab@pabigot.com> Tested-by: Ash Charles <ash@gumstix.com>
| * omap: overo: allow the use of a plain text env file instead boot scriptsAsh Charles2014-05-23-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapted from d70f5480 described below. commit d70f54808dfa83b574e1239c3eccbcf3317343e1 Author: Javier Martinez Canillas <javier@dowhile0.org> Date: Mon Jan 7 03:51:20 2013 +0000 omap4: allow the use of a plain text env file instead boot scripts For production systems it is better to use script images since they are protected by checksums and carry valuable information like name and timestamp. Also, you can't validate the content passed to env import. But for development, it is easier to use the env import command and plain text files instead of script-images. Since both OMAP4 supported boards (Panda and TI SDP4430) are used primarily for development, this patch allows U-Boot to load env var from a text file in case that an boot.scr script-image is not present. The variable uenvcmd (if existent) will be executed (using run) after uEnv.txt was loaded. If uenvcmd doesn't exist the default boot sequence will be started. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Acked-by: Nishanth Menon <nm@ti.com> Signed-off-by: Peter A. Bigot <pab@pabigot.com> Tested-by: Ash Charles <ash@gumstix.com>
* | 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>