summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD2013-11-07-53/+819
|\
| * wandboard: README: Include the quad versionFabio Estevam2013-11-04-2/+2
| | | | | | | | | | | | | | | | Wandboard quad was not ported into U-boot at the time of writing the README. Add it to the list of Wandboard variants. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * Revert "configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards"Stefano Babic2013-11-04-10/+10
| | | | | | | | | | | | | | | | | | This reverts commit 178b8e15ade96c7bd59b9704b91ca51d27c391cd. Patch was merged too fast, without checking that another patch is fixing the reported issue globally - reverted. Signed-off--by: Stefano Babic <sbabic@denx.de>
| * configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boardsFabio Estevam2013-10-31-10/+10
| | | | | | | | | | | | | | | | | | There is no real benefit in adding the board name into U-boot's prompt. Use the simple "=> " prompt across FSL boards. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
| * i.MX6: nitrogen6x: fix erase size in 6x_upgrade.txtEric Nelson2013-10-31-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 6x_upgrade script is used to upgrade U-Boot in SPI-NOR on Nitrogen6x/SABRE Lite boards using U-Boot's 'sf' command. U-Boot is placed at offset 0x400 in flash, and the script currently only erases 0x50000 bytes. Since the current head is 319k, any additional features enabled in the configuration will exceed the space erased and cause errors re-programming the device. This patch increases the erase size to the full size of the region allocated for the U-Boot binary. Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> Acked-by: Stefano Babic <sbabic@denx.de>
| * ARM: mxs: Configure 2 Gbit DDR2 RAM for BG0900Christoph G. Baumann2013-10-31-0/+13
| | | | | | | | | | | | | | | | | | | | | | The BG0900 module has 2Gbit DRAM module on it, adjust the DataBahn DRAM controller registers so the DRAM module will be correctly recognised. Signed-off-by: Christoph G. Baumann <c.baumann@ppc-ag.de> Cc: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com>
| * ARM: mxs: Enable DCDC converter for battery bootMarek Vasut2013-10-31-0/+2
| | | | | | | | | | | | | | | | | | | | In case the board detected sufficient voltage for battery boot, make sure the DCDC converter is ON and the board is not running only from linregs, otherwise an instability will be observed. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com>
| * mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pinOtavio Salvador2013-10-31-1/+1
| | | | | | | | | | | | | | | | This removes the PAD_CTL_DSE_120ohm as done for i.MX6Q's IPU1_DI0_PIN4 pin definition and makes it aligned with 3.0.35-4.1.0 and 3.12 mainline kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * mx5: lowlevel_init: Remove unused macroFabio Estevam2013-10-31-6/+0
| | | | | | | | | | | | | | setup_wdog macro is not used anywhere, so just remove it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Stefano Babic <sbabic@denx.de>
| * ARM: mx5: Enable L2 cacheFabio Estevam2013-10-31-0/+6
| | | | | | | | | | | | Enable L2 cache for improving the system performance. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * imx_watchdog: do not soft-reset while watchdog initAnatolij Gustschin2013-10-31-1/+2
| | | | | | | | | | | | | | | | Currently the driver clears WCR_SRS bit when enabling the watchdog and this causes a software reset. Do not clear WCR_SRS. Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * ARM: mxs: Setup stack in JTAG modeMarek Vasut2013-10-17-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the MX23/MX28 is switched into JTAG mode via the BootMode select switches, the BootROM bypasses the CPU core registers initialization. This in turn means that the Stack Pointer (SP) register is not set as it is in every other mode of operation, but instead is only zeroed out. To prevent U-Boot SPL from crashing in this obscure JTAG mode, configure the SP to point at the CONFIG_SYS_INIT_SP_ADDR if the SP is zeroed out. Note that in case the SP is already configured, we must preserve that exact SP value and must not modify it. This is important since in every other mode but the JTAG mode, the SPL returns into the BootROM and BootROM in turn loads U-Boot itself. If the SP were to be corrupted, the BootROM won't be able to continue it's operation after returned from SPL and the system would crash. Finally, add the JTAG mode switch identifier, so it's not recognised as Unknown mode. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Otavio Salvador <otavio@ossystems.com.br>
| * ARM: mxs: Add PPC-AG BG0900 boardMarek Vasut2013-10-17-0/+355
| | | | | | | | | | | | | | | | This board supports FEC Ethernet, SPI NOR and NAND flash. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Christoph Baumann <c.baumann@ppc-ag.de>
| * udoo: Add initial support for mx6q udoo boardFabio Estevam2013-10-17-0/+343
| | | | | | | | | | | | | | | | | | | | | | Add basic support for mx6q udoo board. For further information about Udoo board: http://www.udoo.org/ Tested booting a mainline device tree kernel and a Yocto rootfs from mmc. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * ARM: mxs: tools: Use mkimage for BootStream generationMarek Vasut2013-10-17-17/+41
| | | | | | | | | | | | | | | | | | | | | | Now that mkimage can generate an BootStream for i.MX23 and i.MX28, use the mkimage as a default tool to generate the BootStreams instead of the elftosb tool. This cuts out another obscure dependency. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Stefano Babic <sbabic@denx.de>
| * mx6: compute PLL PFD frequencies rather than using definesPierre Aubert2013-10-17-25/+42
| | | | | | | | | | Signed-off-by: Pierre Aubert <p.aubert@staubli.com> CC: Stefano Babic <sbabic@denx.de>
* | Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'Albert ARIBAUD2013-11-05-12/+97
|\ \
| * | at91: add defines for reset typeRoger Meier2013-11-04-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Meier <r.meier@siemens.com> Acked-by: Bo Shen <voice.shen@atmel.com> Reviewed-by: Heiko Schocher <hs@denx.de> Cc: Andreas Bießmann <andreas.devel@googlemail.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | ARM: ATMEL: eb_cpux9k2: fix TEXT_BASE for ramboot targetJens Scharsig (BuS Elektronik)2013-11-04-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Since more functions are enabled, the eb_cpux9k2_ram target does not boot. This patch changed the TEXT_BASE, that the code fits between TEXT_BASE and ram end. Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | arm: atmel: get rid of too many ifdefferyBo Shen2013-11-04-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of too many ifdeffery in usb ohci driver Add following two configuration for USB clock selecting - CONFIG_USB_ATMEL_CLK_SEL_PLLB: using PLLB as usb ohci input clock - CONFIG_USB_ATMEL_CLK_SEL_UPLL: using UPLL as usb ohci input clock Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | arm: atmel: at91sam9n12ek: add usb host supportBo Shen2013-11-04-2/+34
| | | | | | | | | | | | | | | | | | | | | Add usb host support for at91sam9n12ek board. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | net: macb: get DMA bus width from design config registerBo Shen2013-11-04-1/+30
| | | | | | | | | | | | | | | | | | | | | Get DMA bus width from design config register Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
* | | TI:omap5: Add rdaddr, use consistent loadaddr valuesTom Rini2013-11-01-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | rdaddr was missing which is a common location for loading ramdisks to. loadaddr was higher than it needs to be, so use the same value other TI platforms use. Signed-off-by: Tom Rini <trini@ti.com>
* | | ARM: OMAP5: DDR3: Change io settingsSRICHARAN R2013-11-01-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change from 0x64656465 to 0x64646464 is to remove the weak pull enabled on DQS, nDQS lines. This pulls the differential signals in the same direction which is not intended. So disabling the weak pulls improves signal integrity. On the uEVM there are 4 DDR3 devices. The VREF for 2 of the devices is powered by the OMAP's VREF_CA_OUT pins. The VREF on the other 2 devices is powered by the OMAP's VREF_DQ_OUT pins. So the net effect here is that only half of the DDR3 devices were being supplied a VREF! This was clearly a mistake. The second change improves the robustness of the interface and was specifically seen to cure corruption observed at high temperatures on some boards. With the above two changes better memory stability was observed with extended temperature ranges around 100C. Signed-off-by: Sricharan R <r.sricharan@ti.com>
* | | cm_t35: update lcd predefinesNikita Kiryanov2013-11-01-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Current predefines do not fit cm-t3730 very well (some of them produce artifacts in the image). Update LCD predefines to accommodate both cm-t35 and cm-t3730 modules. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | | cm_t35: turn on GPIO commandsNikita Kiryanov2013-11-01-0/+1
| | | | | | | | | | | | | | | | | | | | | Turn on GPIO commands for cm-t35 and cm-t3730. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | | cm_t35: reduce default bootdelay to 3 secondsNikita Kiryanov2013-11-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Current default bootdelay of 10 seconds is too long. Reduce default bootdelay to 3 seconds. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | | dra7xx_evm: Enabled UART-boot mode and add dra7xx_evm_uart3 buildMinal Shah2013-11-01-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UART booting is supported on this SoC, but via UART3 rather than UART1. Because of this we must change the board to use UART3 for all console access (only one UART is exposed on this board and a slight HW mod is required to switch UARTs). Signed-off-by: Minal Shah <minal.shah@ti.com> [trini: Make apply to mainline, reword commit] Signed-off-by: Tom Rini <trini@ti.com>
* | | TI:armv7: Change CONFIG_SYS_SPL_ARGS_ADDR to a higher addressTom Rini2013-11-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With changes to increase the size of the device tree (required to move more data out of the kernel and into DT), loading the args at the old address leads to us overwriting things later on. To correct this, load the args file to where we load the device tree anyhow. This is also safe for non-DT booting as in either case we use r2 to pass in the location of things. Signed-off-by: Tom Rini <trini@ti.com>
* | | am335x: Enable CONFIG_OMAP_WATCHDOG supportTom Rini2013-11-01-0/+17
| | | | | | | | | | | | | | | | | | | | | There is a board-specific portion for calling watchdog enable itself, in main U-Boot. Signed-off-by: Tom Rini <trini@ti.com>
* | | cm-t35: move the display code to common placeIgor Grinberg2013-11-01-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Compulab OMAP3 boards use the same display initialization code. Move the display initialization code to live under board/compulab/common directory. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
* | | cm-t35: move the eeprom code to common placeIgor Grinberg2013-11-01-33/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compulab boards use the same eeprom code, so move the eeprom related code to live under board/compulab/common directory. Also make several adjustments to eeprom functions namespace, so it will be generic for compulab boards. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
* | | tricorder: support 256MiB SDRAM on revision > DAndreas Bießmann2013-11-01-8/+39
| | | | | | | | | | | | Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
* | | tricorder: read kernel directly from NANDAndreas Bießmann2013-11-01-1/+2
| | | | | | | | | | | | Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
* | | tricorder: switch to alternative memtestThomas Weber2013-11-01-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Increase the tested memory region for mtest and define CONFIG_SYS_MEMTEST_SCRATCH for CONFIG_SYS_ALT_MEMTEST Signed-off-by: Thomas Weber <thomas.weber@corscience.de> Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
* | | tricorder: Make u-boot fasterThomas Weber2013-11-01-1/+4
| | | | | | | | | | | | | | | | | | | | | Silent u-boot and no bootdelay Signed-off-by: Thomas Weber <thomas.weber@corscience.de> Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
* | | tricorder: add led supportAndreas Bießmann2013-11-01-6/+100
| | | | | | | | | | | | Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
* | | tricorder: panic() on unknown boardAndreas Bießmann2013-11-01-0/+84
| | | | | | | | | | | | | | | | | | Also hang() the board on panic(). Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
* | | tricorder: add tricordereeprom commandAndreas Bießmann2013-11-01-1/+300
| | | | | | | | | | | | | | | | | | | | | The new tricordereeprom command can read and write the eeprom for hardware detection on tricorder devices. Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
* | | tricorder: add mtdparts to environmentAndreas Bießmann2013-11-01-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Before we always ran 'mtdparts default' which also set the mtdparts and mtdids environment. But if we changed that values by intention we will overwrite them with our default values. This is obviously bad! Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
* | | tricorder: add cmdline historyAndreas Bießmann2013-11-01-15/+57
| | | | | | | | | | | | Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
* | | tricorder: add configuration for a flashcard u-bootAndreas Bießmann2013-11-01-0/+1
| | | | | | | | | | | | | | | | | | | | | The 'flashcard' u-boot configuration has a readonly environment and boots a bare kernel/initrd to program the device from an clean environment. Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
* | | tricorder: use generic provided loadaddrAndreas Bießmann2013-11-01-1/+4
| | | | | | | | | | | | Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
* | | tricorder: update flash partitioningAndreas Bießmann2013-11-01-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | The new flash layout respects posible bad blocks in sectors reserved for e.g. SPL, u-boot, kernel, env a.s.o. Additionally this patch prepares for U-Boot Falcon mode for boot time saving. Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
* | | tricorder: remove lcdmode from bootargsThomas Weber2013-11-01-4/+1
| | | | | | | | | | | | | | | Signed-off-by: Thomas Weber <thomas.weber@corscience.de> Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
* | | arm, da85x: update for the ipam390 boardHeiko Schocher2013-11-01-34/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - switch to correct ecc layout used by the RBL enable CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC - update default environment - change A2CR to correct value for UART boot mode - adapt cs3cfg timings for nand - change LED bootmode signalization Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@ti.com>
* | | nand, davinci: add special UBL ecc positionHeiko Schocher2013-11-01-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable the RBL/UBL ECC layout through CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC define see for more info: http://processors.wiki.ti.com/index.php/DM365_Nand_ECC_layout Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@ti.com> Cc: Scott Wood <scottwood@freescale.com>
* | | ARM: OMAP4: Convert to ti_armv7_common.hLokesh Vutla2013-11-01-165/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update omap4_common.h to use ti_armv7_common.h Testing: * Boot tested on OMAP4430 ES2.1 OMAP4460 ES1.1 SDP, OMAP4 PANDA/PANDA ES * Verified ./MAKEALL -s omap Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
* | | OMAP3: igep00x0: rename config file to omap3_igep00x0.hJavier Martinez Canillas2013-11-01-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seems to be a naming convention for the configuration files for boards using the same SoC family. This makes easier to do changes that affect different boards based on the same SoC. Since the IGEPv2 board and the IGEP COM Module use a TI OMAP35xx/DM37xx processor, is better to rename its board config to use this naming scheme. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Acked-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
* | | ARM: IGEP0033: rename config file to am335x_igep0033.hJavier Martinez Canillas2013-11-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seems to be a naming convention for the configuration files for boards using the same SoC family. This makes easier to do changes that affect different boards based on the same SoC. Since the IGEP COM AQUILA use a TI AM335x processor is better to rename its board config to use this naming scheme. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Acked-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>