summaryrefslogtreecommitdiffstats
path: root/include/configs
Commit message (Collapse)AuthorAgeFilesLines
...
| * | tegra: enable LCD on PAZ00Marc Dietrich2013-01-161-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | This adds LCD panel descriptions to the device tree of PAZ00 and enables LCD support in the configuration. Signed-off-by: Marc Dietrich <marvin24@gmx.de> Signed-off-by: Tom Warren <twarren@nvidia.com>
| * | tegra: Enable LCD on TECThierry Reding2013-01-161-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | The TEC ships with a 7" LCD panel that provides a resolution of 800x480 pixels. Add a corresponding panel description to the device tree and enable LCD support in the configuration. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Tom Warren <twarren@nvidia.com>
| * | tegra: Enable LCD on Medcom-WideThierry Reding2013-01-161-0/+14
| |/ | | | | | | | | | | | | | | | | The Medcom-Wide has a 15" LCD panel with a resolution of 1366x768 pixels. Add a corresponding panel description to the device tree and enable LCD support in the configuration. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Tom Warren <twarren@nvidia.com>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-microblazeTom Rini2013-02-041-4/+0
|\ \
| * | microblaze: Remove FSL support from generic boardMichal Simek2013-02-041-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | This code was targetting one specific Microblaze platform configuration which is obsolete and fsl bus isn't used in this way. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | | configs:Remove unused macro CONFIG_DISCOVER_PHYAshok2013-02-042-2/+0
|/ / | | | | | | | | | | | | Remove unused macro CONFIG_DISCOVER_PHY from configs. Signed-off-by: Ashok Kumar Reddy <ashokkourla2000@gmail.com> Acked-by: Stefano Babic <sbabic@denx.de>
* | corenet: Disable video on P2020DSAndy Fleming2013-01-301-1/+1
| | | | | | | | | | | | | | | | The P2020DS build had grown too large, and video support isn't enabled in almost any other Freescale board. Disabling it allows us to keep building, and provides options for reenabling it later. Signed-off-by: Andy Fleming <afleming@freescale.com>
* | powerpc/85xx: Add BSC9132QDS supportPrabhakar Kushwaha2013-01-301-0/+667
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BSC9132QDS is a Freescale reference design board for BSC9132 SoC. BSC9132 SOC is an integrated device that targets the evolving Microcell, Picocell, and Enterprise-Femto base station market subsegments. It combines Power Architecture e500v2 and DSP StarCore SC3850 core technologies with MAPLE-B2F baseband acceleration processing elements. BSC9132QDS Overview -------------------- 2Gbyte DDR3 (on board DDR), Dual Ranki 32Mbyte 16bit NOR flash 128Mbyte 2K page size NAND Flash 256 Kbit M24256 I2C EEPROM 128 Mbit SPI Flash memory SD slot USB-ULPI eTSEC1: Connected to SGMII PHY eTSEC2: Connected to SGMII PHY PCIe CPRI SerDes I2C RTC DUART interface: supports one UARTs up to 115200 bps for console display Apart from the above it also consists various peripherals to support DSP functionalities. This patch adds support for mainly Power side functionalities and peripherals Signed-off-by: Naveen Burmi <NaveenBurmi@freescale.com> Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com> Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
* | powerpc/p2041: set RCW and PBI files for .pbl build or P2041RDBValentin Longchamp2013-01-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | In order to be able to build a u-boot.pbl image, both the CONFIG_PBLPBI_CONFIG and CONFIG_PBLRCW_CONFIG variables have to be defined. This patch sets these two files for the P2041RDB board. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
* | powerpc/b4860qds: Added Support for B4860QDSYork Sun2013-01-301-0/+820
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | B4860QDS is a high-performance computing evaluation, development and test platform supporting the B4860 QorIQ Power Architecture processor. B4860QDS Overview ------------------ - DDRC1: Ten separate DDR3 parts of 16-bit to support 72-bit (ECC) at 1866MT/s, ECC, 4 GB of memory in two ranks of 2 GB. - DDRC2: Five separate DDR3 parts of 16-bit to support 72-bit (ECC) at 1866MT/s, ECC, 2 GB of memory. Single rank. - SerDes 1 multiplexing: Two Vitesse (transmit and receive path) cross-point 16x16 switch VSC3316 - SerDes 2 multiplexing: Two Vitesse (transmit and receive path) cross-point 8x8 switch VSC3308 - USB 2.0 ULPI PHY USB3315 by SMSC supports USB port in host mode. - B4860 UART port is available over USB-to-UART translator USB2SER or over RS232 flat cable. - A Vitesse dual SGMII phy VSC8662 links the B4860 SGMII lines to 2xRJ-45 copper connectors for Stand-alone mode and to the 1000Base-X over AMC MicroTCA connector ports 0 and 2 for AMC mode. - The B4860 configuration may be loaded from nine bits coded reset configuration reset source. The RCW source is set by appropriate DIP-switches: - 16-bit NOR Flash / PROMJet - QIXIS 8-bit NOR Flash Emulator - 8-bit NAND Flash - 24-bit SPI Flash - Long address I2C EEPROM - Available debug interfaces are: - On-board eCWTAP controller with ETH and USB I/F - JTAG/COP 16-pin header for any external TAP controller - External JTAG source over AMC to support B2B configuration - 70-pin Aurora debug connector - QIXIS (FPGA) logic: - 2 KB internal memory space including - IDT840NT4 clock synthesizer provides B4860 essential clocks : SYSCLK, DDRCLK1, 2 and RTCCLK. - Two 8T49N222A SerDes ref clock devices support two SerDes port clocks - total four refclk, including CPRI clock scheme Signed-off-by: York Sun <yorksun@freescale.com> Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> Signed-off-by: Shaveta Leekha <shaveta@freescale.com> Signed-off-by: Priyanka Jain <Priyanka.Jain@freescale.com> Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com> Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> Signed-off-by: Sandeep Singh <Sandeep@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
* | powerpc/mpc8544ds: Add USB controller support for MPC8544DSHongtao Jia2013-01-301-0/+12
| | | | | | | | | | | | | | | | | | USB controller in uboot is a required feature for MPC8544DS. Without this support there is no 'usb' command in uboot. Signed-off-by: Jia Hongtao <B38951@freescale.com> Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
* | powerpc/mpc8572ds: Enable bank interleaving to cs0+cs1 for dual-rank DIMMsHongtao Jia2013-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The controller interleaving only takes the usable memory mapped to cs0. In the case of bank interleaving not enabled, only half of dual-rank DIMM will be used. For single-rank DIMM bank interleaving will be auto disabled. Signed-off-by: Jia Hongtao <B38951@freescale.com> Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
* | powerpc/t4240qds: Update IFC timing for NOR flashYork Sun2013-01-301-5/+5
| | | | | | | | | | | | | | | | Relax parameters to give address latching more time to setup. Tighten parameters to make it overall faster. Signed-off-by: York Sun <yorksun@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
* | boards/T4240qds:Fix IFC AMASK init as per FPGA register spacePrabhakar Kushwaha2013-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | T4240QDS's QIXIS FPGA has 4k register space size and IFC controller's Address Mask Registers is initialised 64K size. So Fix the Address Mask Register initilisation as 4K Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-i2cTom Rini2013-01-2918-35/+0
|\ \
| * | Remove unused CONFIG_SYS_I2C_BUS[_SELECT]Michael Jones2013-01-2918-35/+0
| |/ | | | | | | | | | | | | | | "CONFIG_SYS_I2C_BUS" and "CONFIG_SYS_I2C_BUS_SELECT" don't appear anywhere outside of config files. Signed-off-by: Michael Jones <michael.jones@matrix-vision.de> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
* | Merge remote-tracking branch 'mpc83xx/next'Kim Phillips2013-01-161-13/+30
|\ \ | |/ |/|
| * powerpc/mpc83xx: convert MPC8313ERDB to new-SPLScott Wood2012-12-191-13/+30
| | | | | | | | | | | | | | This converts MPC8313ERDB NAND boot to use the new SPL infrastructure. Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD2013-01-148-49/+192
|\ \
| * | mx6qsabresd: Fix booting the kernel from SDHC3Fabio Estevam2013-01-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit de7d02aeb (mx6qsabresd: add usdhc2 and usdhc4 support) SDHC3 device node is no longer 0, which breaks loading a uImage from SDHC3. Fix it by adapting the default environment to use CONFIG_SYS_MMC_ENV_DEV as the correct mmc node for loading the kernel from. While at it, go back to using SDHC3 as the default mmc, since we have Yocto images that generate an SD card containing U-boot,kernel and rootfs, so it is more convenient to keep using SDHC3 as it was originally. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * | mx6qsabre{auto, sd}: Add support to dynamically choose between fdt use or notOtavio Salvador2013-01-133-3/+40
| | | | | | | | | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
| * | mx6qsabrelite: Add support to dynamically choose between fdt use or notOtavio Salvador2013-01-131-2/+37
| | | | | | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | mx53loco: Add support to dynamically choose between fdt use or notOtavio Salvador2013-01-131-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CONFIG_SYS_CBSIZE has been change to 512 to avoid runtime errors as: ,---[ Runtime error ] | Hit any key to stop autoboot: 0 | MX53LOCO U-Boot > pri netboot | netboot=echo Booting from net ...; run netargs; if test ... | prefetch abort | pc : [<20747368>] lr : [<20747365>] | sp : af566e20 ip : 00000000 fp : 00000000 | r10: 00000002 r9 : af6dfc28 r8 : af566f58 | r7 : af6dfc10 r6 : 00000001 r5 : 00000002 r4 : 74206669 | r3 : 00000000 r2 : 00000060 r1 : 00000020 r0 : 0000018e | Flags: nZCv IRQs off FIQs off Mode SVC_32 | Resetting CPU ... | | resetting ... `--- Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | mx28evk: Add support to dynamically choose between fdt use or notOtavio Salvador2013-01-131-3/+38
| | | | | | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | mx28evk: We shouldn't hardcode a rootfs filesystem typeOtavio Salvador2013-01-131-4/+2
| | | | | | | | | | | | | | | | | | | | | For a generic environment, we shouldn't have a fixed rootfs filesystem so we drop it from env. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | mx6qsabrelite: Use tabs to environment settingOtavio Salvador2013-01-131-33/+33
| | | | | | | | | | | | | | | | | | | | | This rework the environment to use tabs for environment setting as done in other boards. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | mx31/mx35/mx51/mx53/mx6: add watchdogTroy Kisky2013-01-132-0/+2
| | | | | | | | | | | | | | | | | | | | | Use a common watchdog driver for all these cpus. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Acked-by: Stefano Babic <sbabic@denx.de>
* | | Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'Albert ARIBAUD2013-01-143-280/+364
|\ \ \
| * | | EXYNOS5: Enable console multiplexing in u-bootAjay Kumar2013-01-111-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We enable console multiplexing and use both serial and LCD for stdout/stderr. Initially, u-boot output console is observed via serial port. If you also have a DP panel connected onto your SMDK5250 board, you can switch to LCD console by typing "setenv stdout lcd". You can always switch back to serial using "setenv stdout serial". You can switch error console(stderr) as well, using similar commands. Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| * | | EXYNOS5: Make all display related code dependent on CONFIG_LCDAjay Kumar2013-01-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | u-boot compilation fails for smdk5250 when we deselect CONFIG_LCD from the main config file. Following error was observed: drivers/video/libvideo.o: In function `exynos_lcd_init': /home/ajay/u-boot-samsung/drivers/video/exynos_fb.c:68: undefined reference to `lcd_set_flush_dcache' This is because exynos video drivers have dependency on CONFIG_LCD. Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| * | | EXYNOS5: Add support for FIMD and DPAjay Kumar2013-01-101-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add panel_info structure required by LCD driver and DP panel platdata for SMDK5250. Add GPIO configuration for LCD. Enable FIMD and DP support on SMDK5250. DP Panel size: 2560x1600. We use 16BPP resolution to get LCD console. Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com> Acked-by: Simon Glass <sjg@chomium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| * | | spl:falcon:trats Update Trats default board configuration file to support ↵Łukasz Majewski2013-01-031-10/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FALCON MODE Support for a new command (defined at envs) - spl_export generates the ATAGS image necessary for fast boot. Afterwards, it is stored at ext4 partition. Generated image format: CRC [4B] SIZE [4B] PAYLOAD(ATAGS/DT) [SIZE] Remarks: - CRC is calculated only for PAYLOAD - SIZE is the size of PAYLOAD It is important to adjust ${splsize} when large image is generated. It is defined as hex, since ext4 related commands expect it. The ${spladdr} environment variable corresponds to CONFIG_SYS_SPL_ARGS_ADDR Additionally definitions for DFU have been refactored and support for EFI has been added as well. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| * | | SMDK5250: config: Add configuration file for SMDK5250 boardHatim RV2012-12-261-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the configuration file for exynos5250 based SMDK5250 board. Signed-off-by: Hatim Ali <hatim.rv@samsung.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| * | | exynos5: config: Rename the smdk5250.h to exynos5250-dt.hHatim RV2012-12-261-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a common configuration file for all exynos5250 based boards. Going forward we will be using DT based driver discovery for all the boards based on Exynos5. The different boards added will have there own config.h files which internally will include this file and specify their specific DT files. Signed-off-by: Hatim Ali <hatim.rv@samsung.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
* | | | arm: at91sam9x5: add dataflash boot supportBo Shen2013-01-121-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dataflash boot support on at91sam9x5ek board Signed-off-by: Bo Shen <voice.shen@atmel.com> Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>
* | | | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2013-01-116-6/+228
|\ \ \ \
| * | | | OMAP3: igep00x0: add CONFIG_SYS_NS16550_BROKEN_TEMTJavier Martinez Canillas2013-01-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IGEP board PC16550D (ns16550) UART doesn't set the Transmitter Empty (TEMT) Bit in SPL. This makes U-Boot to hang while waiting for TEMT. Add the CONFIG_SYS_NS16550_BROKEN_TEMT config option to avoid this issue. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
| * | | | OMAP3: igep00x0: add CONFIG_SPL_BOARD_INIT for CONFIG_SPL_NAND_SUPPORTJavier Martinez Canillas2013-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When booting an IGEPv2 board from NAND with SPL, U-Boot hangs trying to read the OMAP General Purpose Memory Controller (GPMC). The reason is that the GPMC initialization function is called inside spl_board_init() and this function is only executed when CONFIG_SPL_BOARD_INIT is defined. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Acked-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
| * | | | Merge 'u-boot-atmel/master' into 'u-boot-arm/master'Albert ARIBAUD2013-01-091-1/+28
| |\ \ \ \
| | * | | | at91sam9x5ek: add USB configurationRichard Genoud2012-12-091-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Acked-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| | * | | | at91sam9x5ek: regroup FAT/DOS featuresRichard Genoud2012-12-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Acked-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | | | | Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'Albert ARIBAUD2013-01-094-5/+196
| |\ \ \ \ \
| | * | | | | mv-common.h: increase malloc arena to 4MiBAndreas Bießmann2013-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix the following error: ---8<--- UBIFS error (pid 0): ubifs_mount: Error reading superblock on volume 'ubi:root' errno=-12! --->8--- Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> Cc: prafulla@marvell.com Cc: dimax.main@gmail.com Tested-by: Alex Xol <dimax.main@gmail.com>
| | * | | | | lsxl: unset ncip for rescue modeMichael Walle2013-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using the serverip we get from the DHCP server, implicitly use the broadcast address, which is automatically set when no ncip environment variable is set. That way it isn't necessary to use a special DHCP configuration to set the netconsole peer. Signed-off-by: Michael Walle <michael@walle.cc> Cc: Prafulla Wadaskar <prafulla@marvell.com>
| | * | | | | ARM: lacie_kw: add support for WIRELESS_SPACEAlbert ARIBAUD2013-01-091-0/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
| | * | | | | km/common: drop unneeded std* environment variablesHolger Brunck2013-01-091-3/+0
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These variables are only used if CONFIG_SYS_CONSOLE_IS_IN_ENV is set. This isn't the case, so we can drop them safely. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Prafulla Wadaskar <prafulla@marvell.com>
* | | | | | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2013-01-091-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | arm: move C runtime setup code in crt0.SAlbert ARIBAUD2013-01-081-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all the C runtime setup code from every start.S in arch/arm into arch/arm/lib/crt0.S. This covers the code sequence from setting up the initial stack to calling into board_init_r(). Also, rewrite the C runtime setup and make functions board_init_*() and relocate_code() behave according to normal C semantics (no jumping across the C stack any more, etc). Some SPL targets had to be touched because they use start.S explicitly or for some reason; the relevant maintainers and custodians are cc:ed. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
* | | | | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2013-01-0821-41/+115
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD2013-01-088-14/+20
| |\ \ \ \
OpenPOWER on IntegriCloud