summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | arm: socfpga: spl: update peripheral pll for dev kitDinh Nguyen2015-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | "commit 0d13a0051b2c arm: socfpga: Sync Cyclone V DK PLL configuration" mistakenly changed CONFIG_HPS_MAINPLLGRP_VCO_NUMER to 39, the correct value should be 79. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
| * | arm: socfpga: spl: add board_init_f to SPLDinh Nguyen2015-04-211-0/+29
| | | | | | | | | | | | | | | | | | | | | Remap SDRAM to 0x0, and clear OCRAM's ECC in board_init_f(). Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Reviewed-by: Marek Vasut <marex@denx.de>
| * | arm: socfpga: spl: Add s_init stubDinh Nguyen2015-04-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a stub s_init function in the board file. The reason why the stub function is needed is that most of the work is now being done in board_init_f(), there is no need for the SPL to do anything s_init(). However, since lowlevel_init() is still branching to s_init(), we need stub function for now, until lowlevel_init() morphs into s_init(). Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
| * | arm: socfpga: fix uart0 pin mux configurationDinh Nguyen2015-04-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | commit "07d30b6c3129 arm: socfpga: Sync Cyclone V DK pinmux configuration" incorrectly set the muxing for UART0 on the Cyclone V DK. This fixes it up so UART0 is working again. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
| * | arm: socfpga: spl: Add SDRAM checkDinh Nguyen2015-04-211-0/+6
| | | | | | | | | | | | Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
| * | arm: socfpga: spl: Adjust the SYS_INIT_RAM_SIZE to have room for the spl mallocDinh Nguyen2015-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | We need to adjust the SYS_INIT_RAM_SIZE to have room for the SPL_MALLOC_SIZE. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
| * | arm: socfpga: spl: add CONFIG_SPL_STACK to socfpga_common.hDinh Nguyen2015-04-211-0/+5
| | | | | | | | | | | | Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
| * | arm: socfpga: spl: Use common lowlevel_initDinh Nguyen2015-04-213-47/+1
| | | | | | | | | | | | | | | | | | | | | For SoCFGPA, use the common ARMv7 lowlevel_init. Thus, we can delete the SoCFPGA lowlevel_init.S file. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
| * | arm: socfpga: spl: printout sdram sizeDinh Nguyen2015-04-211-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Reviewed-by: Marek Vasut <marex@denx.de>
| * | arm: socfpga: spl: add sdram init and calibrationDinh Nguyen2015-04-211-0/+13
| | | | | | | | | | | | | | | | | | Add a call to checkboard along with sdram intilialization and calibration. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
| * | arm: socfpga: spl: allow bootrom to enable IOs after warm resetDinh Nguyen2015-04-213-0/+13
| | | | | | | | | | | | | | | Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Acked-by: Marek Vasut <marex@denx.de>
| * | arm: socfpga: spl: Add call to timer_initDinh Nguyen2015-04-211-0/+2
| | | | | | | | | | | | Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
| * | arm: socfpga: spl: enable sdram, timer and uartDinh Nguyen2015-04-211-0/+4
| | | | | | | | | | | | | | | | | | | | | Add the calls in the spl_board_init to enable SDRAM, timer, and UART. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Acked-by: Marek Vasut <marex@denx.de>
| * | arm: socfpga: add functions to bring sdram, timer, and uart out of resetDinh Nguyen2015-04-212-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | These functions will be needed for use by the SPL for enabling the console and sdram initialization. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Pavel Machek <pavel@denx.de>
| * | arm: socfpga: spl: Add CONFIG_SPL_MAX_SIZE to be 64KBDinh Nguyen2015-04-211-0/+1
| | | | | | | | | | | | | | | | | | The Cyclone5 SoCFPGA has 64KB of OCRAM for SPL use. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-dmTom Rini2015-04-283-4/+8
|\ \ \
| * | | dm: core: Correct bug introduced in uclass_first/next_device()Simon Glass2015-04-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions now rely on uclass_find_first/next_device() and assume that they will either return failure (-ve error code) or a device. In fact, coming to the end of a list is not considered failure and they return 0 in that case. The logic to deal with this was replaced in commit acb9ca2a with just using uclass_get_device_tail(). Add back the missing logic. This bug was caught by unit tests but since they were broken for other reasons at the time, this was not noticed. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | serial: ns16550: Remove hard-coded baud_divisor settingAxel Lin2015-04-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally added by commit dd0b0122bacc "serial: ns16550: Add an option to specify the debug UART register shift". Remove it. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Simon Glass <sjg@chromium.org>
| * | | dm: core: drop device removal error path correctlyMasahiro Yamada2015-04-281-3/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | Trivial bug fix for commit 5a87c4174d18 (dm: core: Drop device removal error path when not supported). Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Simon Glass <sjg@chromium.org>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2015-04-2826-213/+1480
|\ \ \ | |/ / |/| |
| * | mx6cuboxi: Load the correct 'fdtfile' variableFabio Estevam2015-04-272-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of hardcoding the 'fdtfile' variable, let's detect the SoC and board variant on the fly and change the dtb name. Based on the scheme done on am335x board. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Tested-By: Vagrant Cascadian <vagrant@debian.org> Reviewed-by: Tom Rini <trini@konsulko.com>
| * | mx6cuboxi: Use more standard namings for fdt variablesFabio Estevam2015-04-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | README file suggests to use 'fdtfile' for the dtb file name and 'fdt_addr_r' for the dtb address in RAM, so do as suggested. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Tom Rini <trini@konsulko.com>
| * | mx6cuboxi: Differentiate Cubox-i and HummingboardFabio Estevam2015-04-271-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce is_hummingboard() function that reads GPIOs that can distinguish between Cubox-i and Hummingboard. Print the board name accordingly. Based on a patch from Rabeeh Khoury. Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Tom Rini <trini@konsulko.com>
| * | mx6cuboxi: Introduce multi-SoC supportFabio Estevam2015-04-271-9/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cubox-i and Hummingboard support several MX6 SoCs: mx6solo, mx6dual-lite, mx6dual and mx6quad. Add support for the different SoC/memory sizes combinations. DDR initialization values were extracted from Solid-run internal U-boot. Tested on a CuBox-i4Pro, HummingBoard-i2eX and HummingBoard-i1. Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Tom Rini <trini@konsulko.com>
| * | mx6cuboxi: Prepare for multi SoC supportFabio Estevam2015-04-272-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cubox-i and Hummingboard support several MX6 SoCs: mx6solo, mx6dual-lite, mx6dual and mx6quad. Use IOMUX_PADS() macro in order to prepare for the multi-SoC support. Also pass 'MX6QDL' in the defconfig to indicate it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Tom Rini <trini@konsulko.com>
| * | mx6cuboxi: Fix the defconfig nameFabio Estevam2015-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | The correct name of the defconfig file is 'mx6cuboxi_defconfig'. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Tom Rini <trini@konsulko.com>
| * | mx6sabresd: Remove uneeded ifdefFabio Estevam2015-04-221-4/+0
| | | | | | | | | | | | | | | | | | RTT_NOM_120OHM is not defined, so remove its ifdef. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * | mx6sabresd: Fix SPL memory descriptionFabio Estevam2015-04-221-4/+5
| | | | | | | | | | | | | | | | | | | | | mx6sabresd has four MT41K128M16JT-125 chips. Each memory has 16-bit bus and 2GiB, so fix the width and density fields accordingly. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * | nitrogen6x: allow gzipped bitmap displayEric Nelson2015-04-221-0/+3
| | | | | | | | | | | | Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * | iMX: Fix compilation error when enabling SECURE_BOOTgaurav rana2015-04-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move the compilation of file fsl_validate.c in MACRO CONFIG_CMD_ESBC_VALIDATE. This file should be compiled only when the above MACRO is defined This caused a break in compilation of iMX platforms when compiling for SECURE_BOOT Signed-off-by: Gaurav Rana <gaurav.rana@freescale.com>
| * | arm: mx6: tqma6: Extract baseboard configs into separate config fileStefan Roese2015-04-222-41/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch extracts all baseboard specific defines into a separate config file. This makes it easier to add other baseboards that use the TQMa6 SoM. This patch will be used by the upcoming WRU-IV board support which also uses the TQMa6 SoM. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Markus Niebel <Markus.Niebel@tq-group.com> Cc: Stefano Babic <sbabic@denx.de> Acked-By: Markus Niebel <Markus.Niebel@tq-group.com>
| * | power: pfuze100: fix LDO_EN bit valueTim Harvey2015-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The LDO_EN is bit 4, not value 4. This is only used on the Ventana boards so we will change it in the header as the other values there are in terms of values and not bit numbers. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: Update missing memory/calib handlingPushpal Sidhu2015-04-221-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit combines catching missing memory and calibration data into one if() block. It further prints pertinent information in determining why the failure occurred. Signed-off-by: Pushpal Sidhu <psidhu@gateworks.com> Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: Add new memory configurationPushpal Sidhu2015-04-221-8/+52
| | | | | | | | | | | | | | | | | | | | | Add memory configuration for an IMX6SDL + 1GB density DRAM. Signed-off-by: Pushpal Sidhu <psidhu@gateworks.com> Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: set HDMI video in to yuv422bt656 for GW551x-ATim Harvey2015-04-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The initial revision of the GW551x does not connect enough signals between the HDMI receiver and the IMX6 CSI for 16bit capture mode necessary for yuv422smp capture. Future revisions will, but for the initial rev force it to yuv422bt656 mode which requires an 8bit video data bus. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: use hdmiinfmt env var to override HDMI capture formatTim Harvey2015-04-221-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | The HDMI receiver used on the GW54xx and GW551x has a 16bit video data bus interconnect between it and the IMX6 CSI. This can be used in two different modes, each having advantages and disadvantages. Allow the hdmiinfmt env var to specify which format is desired (yuv422smp or yuv422bt656). Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: add DT fixup for GW522x to change PCIE_RST# GPIOPushpal Sidhu2015-04-221-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | The GW522x is functionally the same as a GW52xx except for PCIE_RST# GPIO. Add a DT fixup to change this gpio upon bootup. Signed-off-by: Pushpal Sidhu <psidhu@gateworks.com> Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: add 'gsc wd' command for enabling and disabling GSC watchdogTim Harvey2015-04-223-23/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds information about the Gateworks System Controller to the gsc command such as the firmware version, firmware CRC and status of the GSC watchdog (if its enabled and if its tripped). Additionally the 'gsc wd' command can be used to enable or disable the watchdog with the following usage: gsc wd enable [30|60] gsc wd disable Note that the GSC registers are battery-backed by the GSC coincell so once eanbled, they remain enabled across power-cycles or until either the GSC firmware has been updated or FLASH has been re-programmed by the Gateworks JTAG adapter. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: added device-tree display configuration for LVDS displaysTim Harvey2015-04-221-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Configure kernel device-tree for display from env var. This is useful to specify the display present when the device-tree supports multiple non-detectable display configurations. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: add support for DLC-700JMGT4 and DLC-800FIGT3 LCD displaysTim Harvey2015-04-221-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | Add LVDS support for two LVDS LCD displays: DLC-700JMGT4 - 7" 1024x600 DLC-800FIGT3 - 8" 1024x768 Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: add DT fixup for GW54xx compatibility with older kernelsTim Harvey2015-04-221-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Certain older kernels in use by some customers erroneously define a uart3 for GW54xx with a pinmux that conflicts with NAND. This will remove that node to avoid such conflicts. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: remove 128x16 calibration (share with 128x32)Tim Harvey2015-04-221-24/+3
| | | | | | | | | | | | | | | | | | | | | The calibration data for dual 2Gb density chips can be used for a single 2Gb density chip. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: updated 16bit DDR calibrationTim Harvey2015-04-221-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | Updated 16bit DDR calibration using values obtained from running the i.MX6 DDR Stress Test tool over a set of boards over full operationg temperature. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: added DT fixup for GW551x-A video inputTim Harvey2015-04-221-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GW551x-A revision does not have the CSI0_DATA_EN pin connected, therefore we need to make sure that signal is not muxed to the CSI_DATA_EN signal internally and do so by steering it to the unused GPIO5_IO20. We do this so that the kernel device-tree can properly define the signal for RevB and beyond boards that do have this hooked up properly and require it. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: gsc: add new hwmon railsTim Harvey2015-04-222-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new voltage rail added in various -C revision PCB's. Additionally make VDD_CORE, VDD_SOC, and VDD_IO2 common as all Ventana boards have those. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: add mem_mb dynamic env varTim Harvey2015-04-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Certain OS bootscripts need to know how much memory a board has to adjust kernel parameters (namely Android). This allows those boards to determine mem size in MB. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: remove GSC hwmon voltage rail min/max testTim Harvey2015-04-221-31/+22
| | | | | | | | | | | | | | | | | | | | | | | | The min/max of each depends not only on board but on CPU. Simplify by removing this rarely needed and difficult to maintain feature and just display the rails and their values. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: update boot scripts to support ubifs boot volTim Harvey2015-04-221-17/+27
| | | | | | | | | | | | | | | | | | | | | Added support in default boot scripts to find kernel/dtbs on a boot volume separate from rootfs volume. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: only pinmux FEC enet signals for boards using itTim Harvey2015-04-221-3/+3
| | | | | | | | | | | | Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| * | imx: ventana: add wdis config for GW5520Tim Harvey2015-04-221-0/+1
| | | | | | | | | | | | Signed-off-by: Tim Harvey <tharvey@gateworks.com>
OpenPOWER on IntegriCloud