summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-09-16Prepare v2013.10-rc3v2013.10-rc3Tom Rini1-1/+1
Signed-off-by: Tom Rini <trini@ti.com>
2013-09-16Merge branch 'master' of git://git.denx.de/u-boot-spiTom Rini2-10/+15
2013-09-13Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxTom Rini4-2/+34
2013-09-12Revert "standalone-examples: support custom GCC lib"Tom Rini1-13/+2
After further testing, this patch has two problems. First, examples/standalone/Makefile was already inherting PLATFORM_LIBS from the top-level Makefile so this lead to duplicating the private libgcc. Second, currently the private libgcc has a reference to 'hang' that is not being fulfilled. This reverts commit 4412db46468d5965da736d06f84d13e68a6e0b51. Signed-off-by: Tom Rini <trini@ti.com>
2013-09-12Merge and reformat boards.cfg and MAINTAINERSAlbert ARIBAUD8-2631/+1350
Put all informations about targets, including state (active or orphan) and maintainers, in boards.cfg; remove MAINTAINERS; adjust the build system accordingly. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
2013-09-12Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini20-45/+766
2013-09-11Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'Albert ARIBAUD20-45/+766
Conflicts: tools/Makefile
2013-09-11arm:goni:mmc: Add sd card detection and initialization.Przemyslaw Marczak1-2/+31
This change allow to use sd card on Goni the same like mmc 0. SD card is mmc dev 1, so it can be used like this: "fatls mmc 1:2". SD card is inited even if eMMC initialization fails. Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> CC: Minkyu Kang <mk7.kang@samsung.com> Acked-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
2013-09-11arm:mmc:goni/exynos: Fix wrong mmc base register devices offset.Przemyslaw Marczak2-2/+10
On s5pc1xx mmc devices offset is multiply of 0x100000, wrong value was 0x10000. Register offset always points to mmc 0 before this change. Add macro definition of mmc dev register offset to s5pc1xx and exynos mmc. Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> CC: Minkyu Kang <mk7.kang@samsung.com> Acked-by: Jaehoon Chung <jh80.chung at samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
2013-09-11dts: samsung: arndale: Fix include pathChander Kashyap1-1/+1
As per new convention ARCH_CPU_DTS is not defined in "dtc/Makefile". Hence Arndale comilation is failing. Fix this by adding proper include file in "board/samsung/dts/exynos5250-arndale.dts". Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
2013-09-10powerpc/mpc85xx: Add workaround for erratum A-005125York Sun3-0/+32
In a very rare condition, a system hang is possible when the e500 core initiates a guarded load to PCI / PCIe /SRIO performs a coherent write to memory. Please refer to errata document for more details. This erratum applies to the following SoCs and their variants, if any. BSC9132 BSC9131 MPC8536 MPC8544 MPC8548 MPC8569 MPC8572 P1010 P1020 P1021 P1022 P1023 P2020 C29x Signed-off-by: York Sun <yorksun@freescale.com> CC: Scott Wood <scottwood@freescale.com>
2013-09-10powerpc/p2041: fix I2C controller's offsetShaohui Xie1-2/+2
Without this patch, SPD access will fail which leads to DDR init fail. Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Tested-by: Chris Packham <judge.packham@gmail.com> Acked-by: York Sun <yorksun@freescale.com>
2013-09-09Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxTom Rini2-1/+12
2013-09-09Merge branch 'master' of git://git.denx.de/u-boot-i2cTom Rini3-2/+12
2013-09-09powerpc/mpc85xx: Fix the I2C bus speed error on p1022Tang Yuantian1-1/+2
The source clock frequency of I2C bus on p1022 is the platform(CCB) clock, not CCB/2. The wrong source clock frequency leads to wrong I2C bus speed setting. so, fixed it. Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
2013-09-09SPL: P1022DS: switch to new multibus/multiadapter supportYing Zhang2-1/+10
- Added section "u_boot_list" in arch/powerpc/cpu/mpc85xx/u-boot-spl.lds - Use the function i2c_init_all instead of i2c_init Signed-off-by: Ying Zhang <b40530@freescale.com>
2013-09-07ppc4xx: Fix GPIO handling in lwmon5 and lcd4_lwmon5 BSPStefan Roese2-1/+12
LCD4 needs a slightly different GPIO configuration than the original LWMON5 variant. GPIO49 needs to be configured to a default output value of 0 (permanent voltage supply). Additionally lcd4 also needs to enable the LSB transmitter. Signed-off-by: Stefan Roese <sr@denx.de>
2013-09-06Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini124-453/+8726
2013-09-06cam_enc_4xx: Move CONFIG_SPL_PAD_TO to a config headerMasahiro Yamada3-6/+2
For most boards which define CONFIG_SPL_PAD_TO, it is defined in config header files. Currently, there exists only one exception, cam_enc_4xx board. This patch moves CONFIG_SPL_PAD_TO definition from board/ait/cam_enc_4xx/config.mk to include/configs/cam_enc_4xx.h. With this modification, we can delete a glue code in the top level config.mk: ifneq ($(CONFIG_SPL_PAD_TO),) CPPFLAGS += -DCONFIG_SPL_PAD_TO=$(CONFIG_SPL_PAD_TO) endif Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Heiko Schocher <hs@denx.de>
2013-09-06config.mk: Delete unnecessary codeMasahiro Yamada1-16/+0
Currently no makefiles (board-specific config.mk) set the following variables: CONFIG_SPL_TEXT_BASE CONFIG_UBOOT_PAD_TO CONFIG_RESET_VECTOR_ADDRESS CONFIG_TPL_PAD_TO For all target boards using above macros they are set in header files (include/configs/*.h), so we do not need to set them as CPPFLAGS. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2013-09-06fw_env: fix writing environment for mtd devicesOliver Metz1-28/+42
Signed-off-by: Oliver Metz <oliver@freetz.org> Tested-by: Luka Perkov <luka@openwrt.org>
2013-09-06fw_env: add redundant env support for MTD_ABSENTOliver Metz1-0/+3
Signed-off-by: Oliver Metz <oliver@freetz.org> Tested-by: Luka Perkov <luka@openwrt.org>
2013-09-06mail: Fix email addressMarek Vasut1-1/+1
Fix my email address. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Tom Rini <trini@ti.com>
2013-09-06Always build u-boot.img when using CONFIG_SPL_FRAMEWORKHenrik Nordström1-0/+1
Use of uImage formatted u-boot have long been preferred, and recent changes to better support Falcon mode on MMC now enforces it on MMC. Signed-off-by: Henrik Nordstrom <henrik@henriknordstrom.net>
2013-09-06ahci: convert to use libata functions and definitionsRob Herring9-79/+31
libata already has similar functions as implemented in the ahci code. Refactor the code to use the libata variants and remove the dependency on ata.h. Convert some defines to use the version from libata.h. Also, remove some unnecessary memset's of bss data. This is a step toward hopefully merging ahci.c and dw_ahsata.c which are essentially the same driver. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Reviewed-by: Tom Rini <trini@ti.com>
2013-09-06ahci: increase spin-up timeout to 20 secRob Herring1-1/+1
Based on Linux libata code, most drives are less than 10 sec, but some need up to 20 sec. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Reviewed-by: Tom Rini <trini@ti.com>
2013-09-06ahci: handle COMINIT received during spin-upRob Herring1-0/+12
Some Intel SSDs can send a COMINIT after the initial COMRESET. This causes the link to go down and we need to re-initialize the link. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-09-06ahci: move link bring-up handling to separate functionRob Herring1-15/+25
Move the link bring-up handling to a separate weak function in order to allow platforms to override it. This is needed on highbank platform which needs special phy handling. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-09-06ahci: add defines for PORT_SCR_STAT register bitsRob Herring2-2/+8
Replace hard-coded register values with proper defines for PORT_SCR_STAT register. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-09-06ahci: fix memory leak in ata_scsiop_inquiryRob Herring1-0/+1
This fixes a memory leak when scsi inquiry fails. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Reviewed-by: Tom Rini <trini@ti.com>
2013-09-06ahci: fix unaligned accessRob Herring1-1/+1
gcc 4.7 will generate unaligned accesses to local char arrays, so make them static to avoid that. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Reviewed-by: Tom Rini <trini@ti.com>
2013-09-06ahci: use ports implemented map instead of num_portsRichard Gibbs1-0/+4
The AHCI driver was incorrectly using the Capabilities register NP (number of ports) field to determine which ports to activate. This commit changes it to correctly use the PORTS_IMPL register as a port map. Signed-off-by: Richard Gibbs <richard.gibbs@calxeda.com> Reviewed-by: Tom Rini <trini@ti.com>
2013-09-06standalone-examples: support custom GCC libJack Mitchell1-2/+13
Add support for defining the gcc lib in standalone examples as is done in the main u-boot Makefile Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
2013-09-06fs: fat: don't call disk_write with zero sector numWu, Josh1-3/+5
In the set_cluster() function, it will convert the buffer size to sector numbers. Then call disk_write() to write by sector. For remaining buffer, the size is less than a sector, call disk_write() again to write them in one sector. But if the total buffer size is less then one sector, the original code will call disk_write() with zero sector number. It is unnecessary. So this patch fix this. Now it will not call disk_write() if total buffer size is less than one sector. Signed-off-by: Josh Wu <josh.wu@atmel.com>
2013-09-06compiler_gcc: do not redefine __gnu_attributesJeroen Hofstee2-4/+12
gcc allows extensions to be non compiler specific by defining __* macros for the attributes supported by gcc. Having a different definition causes many warnings during the build (cdefs.h on FreeBSD uses __attribute((__pure__)) where u-boot uses __attribute__((pure)) for example). Do not redefine these macros to suppress these warnings. This patch ignores the checkpatch warning: WARNING: __packed is preferred over __attribute__((packed)) Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
2013-09-06git-mailrc: Update MMC custodianPantelis Antoniou1-1/+2
Update git-mailrc with my nick and replace afleming as mmc custodian. Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
2013-09-06Merge branch 'master' of git://git.denx.de/u-boot-niosTom Rini1-0/+1
2013-09-06am335x_evm.h: Add back the actual load of the kernel imageRobert P. J. Day1-1/+3
Somewhere along the line of refactoring the am335x header files, the kernel image load was lost, so put it back in. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
2013-09-06socfpga: Creating driver for Reset ManagerChin Liang See4-31/+47
Consolidating reset code into reset_manager.c. Also separating reset configuration for virtual target and real hardware Cyclone V development kit Signed-off-by: Chin Liang See <clsee@altera.com> Reviewed-by: Pavel Machek <pavel@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Pavel Machek <pavel@denx.de> Cc: Dinh Nguyen <dinguyen@altera.com> Cc: Tom Rini <trini@ti.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
2013-09-06socfpga: Adding configuration for development kitChin Liang See1-7/+21
Separating the configuration file for Virtual Target and real hardware Cyclone V development kit Signed-off-by: Chin Liang See <clsee@altera.com> Reviewed-by: Pavel Machek <pavel@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Pavel Machek <pavel@denx.de> Cc: Dinh Nguyen <dinguyen@altera.com> Cc: Tom Rini <trini@ti.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
2013-09-06nios2: fix missing comment terminator from SPDX License commitThomas Chou1-0/+1
The commit 1a4596601fd395f3afb8f82f3f840c5e00bdd57a Add GPL-2.0+ SPDX-License-Identifier to source files generated a warning due to a missing comment terminator. longlong.h:7:1: warning: "/*" within comment Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
2013-09-05arm: lds: Remove libgcc eabi exception handling tablesMichal Simek1-0/+2
Remove ARM eabi exception handling tables (for frame unwinding). AFAICT, u-boot stubs away the frame unwiding routines, so the tables will more or less just consume space. It should be OK to remove them. Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2013-09-05Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'Albert ARIBAUD2-2/+2
2013-09-05Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD33-97/+3691
Conflicts: drivers/serial/serial.c The conflict above was a trivial case of adding one init function in each branch, and manually resolved in merge.
2013-09-04ARM: atmel: sama5d3: drop unused CONFIG_NET_MULTIBo Shen1-1/+0
Drop unused CONFIG_NET_MULTI Signed-off-by: Bo Shen <voice.shen@gmail.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
2013-09-04mtd: atmel_nand: pmecc: fix bug fail to correct bit error in 1024-bytes sectorWu, Josh1-1/+2
The PMECC use BCH algorithm to correct error. In BCH algorithm, the primitive polynomial value is GF(2^13) for 512-bytes sector size. And it is GF(2^14) for 1024-bytes sector size. This patch will choose correct degree of the remainders (13 or 14) for different sector size. Tested in AT91SAM9X5-EK with MLC nand flash. More detail can be refered to section 5.4.1 of: AT91SAM ARM-based Embedded MPU Application Note <http://www.atmel.com/Images/doc11127.pdf> Signed-off-by: Josh Wu <josh.wu@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
2013-09-04Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'Albert ARIBAUD56-114/+4387
2013-09-04Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'Albert ARIBAUD19-196/+486
2013-09-03bootm: allow correct bounds-check of destinationKees Cook1-1/+1
While nothing presently examines the destination size, it should at least be correct so that future users of sys_mapmem() will not be surprised. Without this, it might be possible to overflow memory. Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
2013-09-03lzo: correctly bounds-check output bufferKees Cook1-1/+7
This checks the size of the output buffer and fails if it was going to overflow the buffer during lzo decompression. Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>