summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mmc: support the correct card version for eMMCJaehoon Chung2013-04-173-9/+32
| | | | | | | | | | | eMMC vesrion is supported up to v4.5. But bootloader isn't saw the exact eMMC version. After applied this patch, if use the mmcinfo command, then can see the exactly mmc version. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Rommel Custodio <sessyargc@gmail.com>
* printenv: Correct out-of-memory condition check.Maxime Larocque2013-04-171-1/+2
| | | | | | | | | | | In common/cmd_nvedit.c, en env_print(), the wrong type is used for len. hexport_r() returns -1 on error (like OOM), which is converted to 0xffffffff when put in an unsigned. Said value is obviously bigger then 0, and as a result an uninitialized string is then displayed. Other usages of hexport_r() in the code correctly uses ssize_t to keep its return value. Signed-off-by: Maxime Larocque <maxmtl2002@yahoo.ca>
* Merge branch 'master' of git://git.denx.de/u-boot-x86Tom Rini2013-04-164-7/+9
|\
| * x86: config: Init PCI before SPISimon Glass2013-04-151-0/+1
| | | | | | | | | | | | | | | | | | Since the ICH SPI controller uses PCI, we must ensure that PCI is available before it is inited. This fixes the current "ICH SPI: Cannot find device" message on boot. Signed-off-by: Simon Glass <sjg@chromium.org>
| * x86: Allow setup code to manage its own global dataSimon Glass2013-04-152-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Currently x86 has its own means of managing the global data and board data (bd_t), and this code resides in start.S. With generic board, we need to ensure that we leave this alone - i.e. don't clear it as we do on other archs. This fixes a problem where the memory init data is cleared which causes the video driver to operate very slowly. Signed-off-by: Simon Glass <sjg@chromium.org>
| * x86: Fix DRAM bank size init with generic boardSimon Glass2013-04-152-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | The intention of the memory init code is that it should work the same with CONFIG_SYS_GENERIC_BOARD and without. This is tricky because dram_init() is called prior to relocation with generic board (matching other archs) and after relocation without generic board. Adjust the init sequence so that dram_init() is not called in the generic board case, which seems like the easiest fix for now. Also ensure that relocation addresses are still calculated. Signed-off-by: Simon Glass <sjg@chromium.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2013-04-161-3/+7
|\ \ | |/ |/|
| * ARMv7: start.S: stay in HYP mode if u-boot is entered in itAndre Przywara2013-04-151-3/+7
| | | | | | | | | | | | | | | | | | | | The KVM and Xen hypervisors for the Cortex-A15 virtualization implementation need to be entered in HYP mode. Should the primary board firmware already enter HYP mode (Calxeda firmware does that), we should not deliberately drop back to SVC mode. Since U-boot does not use the MMU, running in HYP mode is just fine. Signed-off-by: Andre Przywara <andre.przywara@linaro.org>
* | Prepare v2013.04-rc3Tom Rini2013-04-151-1/+1
| | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2013-04-15233-5369/+4058
|\ \ | |/
| * cosmetic: fix CONFIG_SPL_BSS_MAX_SIZE typo in READMEAlbert ARIBAUD2013-04-141-2/+2
| | | | | | | | Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
| * smdk5250, snow: convert to CONFIG_SPL_MAX_FOOTPRINTAlbert ARIBAUD2013-04-142-2/+2
| | | | | | | | | | | | | | | | This target wants to check full SPL size, BSS included. Remove CONFIG_SPL_MAX_SIZE definition and instead define CONFIG_SPL_MAX_FOOTPRINT. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
| * da850evm, da850_am18xxevm: convert to CONFIG_SPL_MAX_FOOTPRINTAlbert ARIBAUD2013-04-142-2/+2
| | | | | | | | | | | | | | | | This target wants to check full SPL size, BSS included. Remove CONFIG_SPL_MAX_SIZE definition and instead define CONFIG_SPL_MAX_FOOTPRINT. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
| * cam_enc_4xx: convert to CONFIG_SPL_MAX_FOOTPRINTAlbert ARIBAUD2013-04-142-2/+2
| | | | | | | | | | | | | | | | This target wants to check full SPL size, BSS included. Remove CONFIG_SPL_MAX_SIZE definition and instead define CONFIG_SPL_MAX_FOOTPRINT. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
| * ARM: fix CONFIG_SPL_MAX_SIZE semanticsAlbert ARIBAUD2013-04-144-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove SPL-related ASSERT() in arch/arm/cpu/u-boot.lds as this file is never used for SPL builds. Rewrite the ASSERT() in arch/arm/cpu/u-boot-spl.lds to separately test image (text,data,rodata...) size, BSS size, and full footprint each against its own max, and make Tegra boards check full footprint. Also, output section mmutable is not used in SPL builds. Remove it. Finally, update README regarding the (now homogeneous) semantics of CONFIG_SPL_[BSS_]MAX_SIZE and add the new CONFIG_SPL_MAX_FOOTPRINT macro. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net> Reported-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
| * Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD2013-04-142-6/+6
| |\
| | * fsl_esdhc: Fix DMA transfer completion waiting loopAndrew Gabbasov2013-04-142-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework the waiting for transfer completion loop condition to continue waiting until both Transfer Complete and DMA End interrupts occur. Checking of DLA bit in Present State register looks not needed in addition to interrupts status checking, so it can be removed from the condition. Also, DMA Error condition is added to the list of data errors, checked in the loop. Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
| | * fsl_esdhc: flush cache after IO completionEric Nelson2013-04-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The cache should invalidate the read buffer for the SD card interface after the transfer complete, not command-complete. Tested-by: Andrew Gabbasov <Andrew_Gabbasov@mentor.com> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| * | Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD2013-04-144-9/+12
| |\ \ | | |/
| | * spi: mxc_spi: Set master mode for all channelsFabio Estevam2013-04-133-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The glitch in the SPI clock line, which commit 3cea335c34 (spi: mxc_spi: Fix spi clock glitch durant reset) solved, is back now and itwas re-introduced by commit d36b39bf0d (spi: mxc_spi: Fix ECSPI reset handling). Actually the glitch is happening due to always toggling between slave mode and master mode by configuring the CHANNEL_MODE bits in this reset function. Since the spi driver only supports master mode, set the mode for all channels always to master mode in order to have a stable, "glitch-free" SPI clock line. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| | * mx6qsabre{sd, auto}: Fix environment as 'mmc rescan' takes no argumentsOtavio Salvador2013-04-131-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
| * | ARM: Fix __bss_start and __bss_end in linker scriptsAlbert ARIBAUD2013-04-137-28/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3ebd1cbc introduced compiler-generated __bss_start and __bss_end__ and commit c23561e7 rewrote all __bss_end__ as __bss_end. Their merge caused silent and harmless but potentially bug-inducing clashes between compiler- and linker- generated __bss_end symbols. Make __bss_end and __bss_start compiler-only, and create __bss_base and __bss_limit for linker-only use. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net> Reported-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
| * | BUGFIX: arm: data abort in get_bad_stack_swiTetsuyuki Kobayashi2013-04-134-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When swi instruction is executed, it is expected to get message "software interrupt" in console and dump registers and reboot, as do_software_interrupt() in arch/arm/lib/interrupts.c. But, actually it causes data abort accessing wrong address in get_bad_stack_swi macro in arch/arm/cpu/v7/start.S. This patch fixes this problem. The same mistake in arch/arm/cpu/{arm1136,arm1176,pxa}/start.S. Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
| * | Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'Albert ARIBAUD2013-04-133-10/+10
| |\ \
| | * | omap5_common.h: Switch to ext4Tom Rini2013-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ext3 should not be used on SD cards, so use ext4 instead. Cc: Sricharan R <r.sricharan@ti.com> Signed-off-by: Tom Rini <trini@ti.com>
| | * | omap3: Display MHz instead of mHz on the consoleman.huber@arcor.de2013-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The processor is hopefully running with M(ega)Hz and not with m(illi)Hz. Signed-off-by: Manfred Huber <man.huber@arcor.de>
| | * | am335x: Really correct DDR timings on new BeagleBone partTom Rini2013-04-121-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous timings were done on the internal-only A1 board which has different DDR part than all later revs. The timings need a slight adjustment to be correct in all cases with later revs. Signed-off-by: Tom Rini <trini@ti.com>
| * | | integrator: enable device treeLinus Walleij2013-04-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the device tree library on the Integrator platforms so we can pass a device tree when booting. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| * | | VCMA9: Enable CONFIG_CMD_NAND_YAFFSTom Rini2013-04-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As this board has NAND and supports YAFFS2, add CONFIG_MD_NAND_YAFFS Cc: David Müller <d.mueller@elsoft.ch> Signed-off-by: Tom Rini <trini@ti.com> Acked-by: David Müller <d.mueller@elsoft.ch>
| * | | Merge branch 'u-boot/master' into 'u-boot-arm/master'Albert ARIBAUD2013-04-12270-2059/+7061
| |\ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: drivers/video/exynos_fb.c
| * | | arm/km: add support for kmsuv31 boardHolger Brunck2013-04-122-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This board is from a u-boot point of view a mixture between kmnusa and a standard km_kirkwood board. We have our u-boot environment in the spi NOR flash, but we have a direct connection between the kirkwood and the piggy. A FPGA is connected via the PCIe interface. So we only have to select the specific features in the board setup. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Prafulla Wadaskar <prafulla@marvell.com> Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
| * | | arm/km: use CONFIG_NAND_ECC_BCHHolger Brunck2013-04-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch from 1-bit ecc to 4-bit ecc. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Prafulla Wadaskar <prafulla@marvell.com> Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
| * | | arm/km: rename BOARD_LATE_INIT to CONFIG_BOARD_LATE_INITHolger Brunck2013-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 9660e442 cosmetic: s/BOARD_LATE_INIT/CONFIG_BOARD_LATE_INIT removes BOARD_LATE_INIT and uses CONFIG_BOARD_LATE_INIT instead. Therefore we have to use this define. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Prafulla Wadaskar <prafulla@marvell.com> Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
| * | | kirkwood_nand: allow usage of NAND_ECC_SOFT_BCHGerlando Falauto2013-04-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CONFIG_NAND_ECC_BCH is set use 4-bit error correction code instead of the 1-bit error correction code on the NAND device. Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Prafulla Wadaskar <prafulla@marvell.com> Acked-by: Prafulla Wadaskar <prafulla@marvell.com> Acked-by: Scott Wood <scottwood@freescale.com>
| * | | Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'Albert ARIBAUD2013-04-1210-43/+80
| |\ \ \
| | * | | omap5912-osk: Fix get_timer() and CONFIG_SYS_HZJon Hunter2013-04-102-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function get_timer() should return time in ms and CONFIG_SYS_HZ should be set to 1000 by default. Fix both of these items. Signed-off-by: Jon Hunter <jon-hunter@ti.com>
| | * | | omap5912-osk: Increase flash partition for u-bootJon Hunter2013-04-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current u-boot binary needs more than 128KB of flash space and so move the u-boot environment from an offset of 128KB to 256KB in flash to ensure the enviroment does not overlap with u-boot. Signed-off-by: Jon Hunter <jon-hunter@ti.com>
| | * | | omap5912-osk: Fix device initialisationJon Hunter2013-04-103-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current u-boot, the device pin multiplexing and clock initialisation needs to be early during the boot process and before board_init() is called. U-boot is currently crashing on this board because this is not being done early enough. Therefore, add a s_init() function for the omap5912-osk board to do this. Also fix the stack pointer so that it is pointing to the end of the internal RAM and not the beginning as this was also causing the device to crash. Signed-off-by: Jon Hunter <jon-hunter@ti.com>
| | * | | omap5912-osk: Fix booting from NOR flashJon Hunter2013-04-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The omap5912-osk board is using a RAM based address as the linker location for code. This is causing several problems when attempting to run the latest u-boot code base on this board from flash. Update the default linker location for code to be in NOR flash at address 0x00000000. The omap5912-osk board only has 32MB of RAM and so fix the comment in the omap5912-osk config.mk file as well. Signed-off-by: Jon Hunter <jon-hunter@ti.com>
| | * | | omap5912-osk: Fix DRAM initialisationJon Hunter2013-04-101-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The size of the DRAM for the omap5912-osk board is getting setup in the dram_init() function. However, for the current u-boot release this is too late and needs to be done in dram_init_banksize(). Therefore, add a dram_init_banksize() function for the omap5912-osk board and setup the DRAM size there. Signed-off-by: Jon Hunter <jon-hunter@ti.com>
| | * | | omap5_uevm: Correct to 2MiB aligned partitions on eMMCTom Rini2013-04-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has a 2MiB erase block size eMMC, so make sure we align on that for best possible performance. Signed-off-by: Tom Rini <trini@ti.com>
| | * | | OMAP4: Fix bug in omap4460_volts structLubomir Popov2013-04-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The omap4460_volts struct was incorrectly referencing tps62361 instead of twl6030 as PMIC for the core and mm voltages (the tps is used for mpu supply only). This shall lead to bad OPP settings while booting kernel. Fixing it. Fix some comments as well. Signed-off-by: Lubomir Popov <lpopov@mm-sol.com>
| | * | | am335x: Update timings for the beaglebone againTom Rini2013-04-102-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After further testing we can run DDR at 400MHz so update the timings again. Tested-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Tom Rini <trini@ti.com>
| | * | | am335x/ti814x: Correct MMC_BOOT_DEVICES_START/ENDTom Rini2013-04-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given that on TI814x we have MMC1/2 swapped, we also need to swap them in MMC_BOOT_DEVICES_START/END Reported-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Tom Rini <trini@ti.com>
| * | | | mx31pdk: Remove watchdog supportFabio Estevam2013-04-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conversion of mx31pdk to SPL NAND fixed the boot issue, but we start seeing resets in loop, which prevents us from reaching the U-boot prompt. Until the proper fix can be identified, disable watchdog, so that mx31pdk can be functional again. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Stefano Babic <sbabic@denx.de>
| * | | | arm: Make all linker scripts compatible with per-symbol sectionsBenoît Thébaudeau2013-04-1212-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let all ARM linker scripts handle properly -ffunction-sections and -fdata-sections. This will be useful for future changes in order to create symbol-specific sections in common .S files. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
| * | | | arm1176: Remove unused MMU setup from start.SBenoît Thébaudeau2013-04-121-90/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the removal of the smdk6400 board, the MMU setup code in arm1176/start.S becomes unused, so remove it. It will still be possible to restore it later from the Git history if necessary, in which case it should be moved out of the relocate_code() function. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
| * | | | arm: Remove deprecated and now unused NAND SPLBenoît Thébaudeau2013-04-123-24/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
| * | | | arm: Remove support for unused s3c64xxBenoît Thébaudeau2013-04-1223-2253/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the removal of the smdk6400 board, the s3c64xx SoC becomes unused, so remove associated code. It will still be possible to restore it later from the Git history if necessary. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
| * | | | Revert "mkconfig: start deprecating Makefile config targets"Benoît Thébaudeau2013-04-122-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1285a2808a254f3d1a809c1a541f0c0f746e03d7 since the migration of boards from Makefile to boards.cfg is now complete. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
OpenPOWER on IntegriCloud