summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
...
* | Merge branch 'master' of git://git.denx.de/u-boot-nand-flashWolfgang Denk2011-05-18-5/+2
|\ \ | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-nand-flash: nand_spl: nand_boot.c: Remove last CONFIG_SYS_NAND_READ_DELAY occurance
| * | nand_spl: nand_boot.c: Remove last CONFIG_SYS_NAND_READ_DELAY occuranceStefan Roese2011-05-16-5/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | Remove the last CONFIG_SYS_NAND_READ_DELAY occurance from nand_boot.c. I missed this one in patch a9c847cb [nand_spl: nand_boot.c: Remove CONFIG_SYS_NAND_READ_DELAY]. This fixes a compile breakage on kilauea_nand for example. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Scott Wood <scottwood@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
* | nios2: Make STANDALONE_LOAD_ADDR configurable per boardThomas Chou2011-05-16-1/+1
|/ | | | | | | | | | | Follow commit 8ae86b76c648d8bef97241c78e2fddb1c4f164d3 which changed the variable name. Fix this error, nios2-elf-ld: invalid hex number `-o' Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Scott McNutt <smcnutt@psyent.com>
* Merge branch 'master' of git://git.denx.de/u-boot-nand-flashWolfgang Denk2011-05-15-26/+17
|\
| * nand_spl: nand_boot.c: Remove CONFIG_SYS_NAND_READ_DELAYStefan Roese2011-05-13-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are multiple reasons why this define should be removed: First it saves some space and therefore fixes a problem we have on the canyonlands_nand and glacier_nand targets right now. Second, the define was hackish and would most likely not work on all board using nand_boot.c. Boards not providing a real dev_ready() function should implement a board specific function instead. I checked and it seems, that all boards using nand_boot.c right now already implement a board specific dev_ready() function. So this patch should not break any boards and will result in smaller NAND_SPL images. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Scott Wood <scottwood@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Sughosh Ganu <urwithsughosh@gmail.com> Cc: Sudhakar Rajashekhara <sudhakar.raj@ti.com> Tested-by: Sughosh Ganu <urwithsughosh@gmail.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * nand_spl: nand_boot.c: Init nand_chip.options to 0Stefan Roese2011-05-13-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Patch 65a9db7b [nand_spl: Fix large page nand_command()] broke nand booting on canyonlands. "options" has to be initialized to 0. If not, boards might have the NAND_BUSWIDTH_16 bit set, resulting in wrong offset calculation. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Scott Wood <scottwood@freescale.com> Cc: Alex Waterman <awaterman@dawning.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * Decreases code size of the nand_splAlex Waterman2011-05-13-8/+10
| | | | | | | | | | | | | | | | | | | | The canyonland boards nand_spl size is just under the maximum 4KByte size. This patch decreases the size of the nand_spl to make a previous commit - commit 65a9db7be0868be91ba81b9b5bf821de82e6d9b0 - fit in the nand_spl. Signed-off-by: Alex Waterman <awaterman@dawning.com> Acked-by: Stefan Roese <sr@denx.de> Signed-off-by: Scott Wood <scottwood@freescale.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2011-05-15-13/+22
|\ \ | |/ |/|
| * powerpc/mpc8xxx: reword max tCKmin messageYork Sun2011-05-13-3/+3
| | | | | | | | | | | | | | | | Reword "The DIMM max tCKmin is ..." to "The DDR clock is faster than the slowest DIMM(s) can support". Fixed interger type in printf as well. Signed-off-by: York Sun <yorksun@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: fix compatible property for the L2 cache nodeTimur Tabi2011-05-13-10/+19
| | | | | | | | | | | | | | | | | | The compatible property for the L2 cache node (on 85xx systems that don't have a CPC) was using a value for the property length that did not match the actual length of the property. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | Revert "Fix building tools alone with host compiler"Wolfgang Denk2011-05-13-3/+3
|/ | | | | | | | | | | | | | | | This reverts commit bbc6353c740064c8e0741b772376a1a67a1c3f01. It breaks building on many systems: ... .../common/env_embedded.c:28:20: fatal error: config.h: No such file or directory compilation terminated. .../common/image.c:27:20: fatal error: common.h: No such file or directory compilation terminated. .../lib/crc32.c:12:20: fatal error: common.h: No such file or directory compilation terminated. .../lib/md5.c:28:22: fatal error: compiler.h: No such file or directory compilation terminated. .../lib/sha1.c:33:20: fatal error: common.h: No such file or directory compilation terminated.
* kwbimage: Fix check variable of checksumNobuhiro Iwamatsu2011-05-12-1/+1
| | | | | | | calc_hdrcsum two times are checked. checksumi of exthdr is not checked. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> CC: Prafulla Wadaskar <prafulla@marvell.com>
* examples: add smc911x_eeprom to clean targetMike Frysinger2011-05-12-1/+1
| | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* ftpmu010.h: fix some missing declaration in headerMacpaul Lin2011-05-12-0/+3
| | | | | | Fix some missing declaration in header. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* ftsmc020: add missing definitionsMacpaul Lin2011-05-12-0/+5
| | | | | | Add missing definitions in header file according to datasheet. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* ftsmc020: un-nest the register structure in headerMacpaul Lin2011-05-12-6/+8
| | | | | | Un-nestted the register structure in ftsmc020.h Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* ftsmc020: fix relocationMacpaul Lin2011-05-12-4/+3
| | | | | | Avoid relocation problem by fix global declaration. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* ftide020: add faraday ide ahb controllerMacpaul Lin2011-05-12-0/+651
| | | | | | | | | | | | | | Faraday's ftide020_s is an IDE-AHB controller for SoC design. This patch add the u-boot driver (PIO) of ftide020 ATA (IDE) driver. IDE commands include read, info, and other functions has been implemented. Because this IDE controller support AHB interface only which is differ from other most IDE controller supports PCI interface. Some registers access is required during CMD/DATA I/O. Hence a configuration "CONFIG_IDE_AHB" is required to be defined according to the feature in cmd_ide.c. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* README.arm-relocation: get relocated address in gdbBen Gardiner2011-05-12-0/+8
| | | | | | | | | | | | | | | When your emulator is connected at reset (or is used to load u-boot) it is possible to get the relocation address from the gd->relocaddr since gd is always in r8 (on ARM) it is addressable before the gdb has remapped symbols. Document this alternate method in-line with the original method written by Heiko Schocher. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> CC: Heiko Schocher <hs@denx.de> CC: Wolfgang Denk <wd@denx.de> Acked-by: Heiko Schocher <hs@denx.de>
* README.arm-relocation: get relocated address from bdinfoBen Gardiner2011-05-12-31/+22
| | | | | | | | | | | | | The bdinfo command prints the relocaddr on ARM as it does on PPC. Update the debugging instructions for arm relocation to reflect this fact rather than requiring that the user rebuild the u-boot image using -DDEBUG. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> CC: Wolfgang Denk <wd@denx.de> Acked-by: Heiko Schocher <hs@denx.de>
* cosmetic: cmd_bdinfo.c: clean up by using checkpatch.plMacpaul Lin2011-05-12-147/+149
| | | | | | | cmd_bdinfo.c: clean up with 2.6.38 checkpatch.pl Signed-off-by: Macpaul Lin <macpaul@andestech.com> Acked-by: Detlev Zundel <dzu@denx.de>
* mp2usb: finish the removalEric Bénard2011-05-12-1/+1
| | | | | | | - remove from boards.cfg - add to doc/README.scrapyard Signed-off-by: Eric Bénard <eric@eukrea.com>
* README: Clarify difference of CONFIG_WATCHDOG and CONFIG_HW_WATCHDOGDetlev Zundel2011-05-12-5/+12
| | | | | | | | | | | | | | | | | Now that we have the documentation, the code should be changed to reflect it ;) Asd far as I can see, these are the places where HW_WATCHDOG is used instead of WATCHDOG: arch/blackfin/cpu/blackfin/watchdog.c arch/m68k/cpu/mcf547x_8x/cpu.c The relevant maintainers are on CC. Signed-off-by: Detlev Zundel <dzu@denx.de> Cc: Mike Frysinger <vapier@gentoo.org> Cc: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
* ftsdmc021: add register definitions of ftsdmc021Macpaul Lin2011-05-12-0/+151
| | | | | | Support registers definitions of ftsdmc021 SDRAM controller. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* ftahbc020s: Faraday FTAHBC020s AHB Bus ControllerMacpaul Lin2011-05-12-0/+59
| | | | | | | | ftahbc020s.h provides basic definitions of this controller to help a SoC which use this AHB Controller could do scalable software settings in lowlevel_init.S. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* Fix a few gcc warnings.Joakim Tjernlund2011-05-12-8/+8
| | | | | | | | | | | | | | | | | | | | | Noticed while building all of mpc8xx. Also constify usage string in timer.c Warnings fixed are: timer.c: In function 'timer': timer.c:189: warning: format not a string literal and no format arguments timer.c:258: warning: format not a string literal and no format arguments atm.c: In function 'atmUnload': atm.c:99: warning: array subscript is above array bounds atm.c: In function 'atmLoad': atm.c:65: warning: array subscript is above array bounds codec.c: In function 'codsp_write_pop_int': codec.c:678: warning: array subscript is above array bounds codec.c: In function 'codsp_write_cop_short': codec.c:585: warning: array subscript is above array bounds codec.c: In function 'codsp_write_sop_int': codec.c:512: warning: array subscript is above array bounds Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
* Remove remnants of obsolete CONFIG_SYS_GBL_DATA_SIZE commentsMichael Jones2011-05-12-63/+0
| | | | | | | commit 25ddd1fb0a2281b182529afbc8fda5de2dc16d96 left remnants of many comments about CONFIG_SYS_GBL_DATA_SIZE. Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
* hwmon: Extend lm63.c to support LM64Dirk Eibach2011-05-12-4/+24
| | | | | | | | | This patch adds support for the National LM64 temperature sensor with integrated fan control to lm63.c. Main difference between LM63 and LM64 is 16°C offset in sensor readings. Signed-off-by: Dirk Eibach <eibach@gdsys.de>
* Fix building tools alone with host compilerFrançois Revol2011-05-12-3/+3
| | | | | | | | - don't include config.h when building with host cc, - HOSTCFLAGS was defined with the wrong name, so wasn't used, - make sure make finds sources outside of tools/. Signed-off-by: François Revol <revol@free.fr>
* net: xilinx emaclite: Fix return valuesMichal Simek2011-05-12-7/+7
| | | | | | Fix return values for initialize/init/recv/send functions Signed-off-by: Michal Simek <monstr@monstr.eu>
* Fix variable flavor in examples/standalone/MakefileChe-liang Chiou2011-05-12-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GNU Makefile have two flavors of variables, recursively expanded that is defined by using '=', and simply expanded that is defined by using ':='. The bug is caused by using recursively expanded flavor for BIN and SREC. As you can see below, they are prepended by $(obj) twice. We can reproduce this bug with a simplified version of this Makefile: $ cat >Makefile <<\EOF obj := /path/to/obj/ ELF := hello_world BIN_rec = $(addsuffix .bin,$(ELF)) # recursively expanded BIN_sim := $(addsuffix .bin,$(ELF)) # simply expanded ELF := $(addprefix $(obj),$(ELF)) BIN_rec := $(addprefix $(obj),$(BIN_rec)) BIN_sim := $(addprefix $(obj),$(BIN_sim)) show: @echo BIN_rec=$(BIN_rec) @echo BIN_sim=$(BIN_sim) .PHONY: show EOF $ make show BIN_rec=/path/to/obj//path/to/obj/hello_world.bin BIN_sim=/path/to/obj/hello_world.bin Signed-off-by: Che-Liang Chiou <clchiou@chromium.org>
* net/net.c: cosmetic: do not use assignment in if conditionLuca Ceresoli2011-05-12-1/+2
| | | | | | | | | This removes the following checkpatch issue: - ERROR: do not use assignment in if condition Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Cc: Ben Warren <biggerbadderben@gmail.com>
* net/net.c: cosmetic: fix indentationLuca Ceresoli2011-05-12-42/+41
| | | | | | | | | | | This removes the following checkpatch issues: - ERROR: switch and case should be at the same indent - WARNING: suspect code indent for conditional statements - WARNING: labels should not be indented Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Cc: Ben Warren <biggerbadderben@gmail.com>
* net/net.c: cosmetic: parentheses not required for returnLuca Ceresoli2011-05-12-15/+15
| | | | | | | | | This removes the following checkpatch issue: - ERROR: return is not a function, parentheses are not required Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Cc: Ben Warren <biggerbadderben@gmail.com>
* net/net.c: cosmetic: fix pointer syntax issuesLuca Ceresoli2011-05-12-15/+15
| | | | | | | | | | This removes the following checkpatch issues: - ERROR: "foo * bar" should be "foo *bar" - ERROR: "(foo*)" should be "(foo *)" Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Cc: Ben Warren <biggerbadderben@gmail.com>
* net/net.c: cosmetic: fix brace issuesLuca Ceresoli2011-05-12-25/+13
| | | | | | | | | | This removes the following checkpatch issues: - WARNING: braces {} are not necessary for single statement blocks - WARNING: braces {} are not necessary for any arm of this statement Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Cc: Ben Warren <biggerbadderben@gmail.com>
* net/net.c: cosmetic: fix whitespace issuesLuca Ceresoli2011-05-12-93/+93
| | | | | | | | | | | | | | | | | | | | | This removes the following checkpatch issues: - ERROR: space prohibited after that open parenthesis '(' - ERROR: space prohibited before that close parenthesis ')' - ERROR: space prohibited after that open square bracket '[' - ERROR: space prohibited after that '&' (ctx:WxW) - ERROR: spaces required around that '=' (ctx:VxW) - ERROR: space required before the open parenthesis '(' - ERROR: space required after that ',' (ctx:VxV) - ERROR: need consistent spacing around '+' (ctx:WxV) - WARNING: unnecessary whitespace before a quoted newline - WARNING: please, no spaces at the start of a line - WARNING: space prohibited between function name and open parenthesis '(' Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Cc: Ben Warren <biggerbadderben@gmail.com> Cc: Mike Frysinger <vapier@gentoo.org>
* net/net.c: cosmetic: variable initializationsLuca Ceresoli2011-05-12-22/+18
| | | | | | | | | | | | This removes the following checkpatch errors: - ERROR: do not initialise globals to 0 or NULL - ERROR: spaces required around that '=' (ctx:VxV) - ERROR: that open brace { should be on the previous line Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Cc: Ben Warren <biggerbadderben@gmail.com> Cc: Mike Frysinger <vapier@gentoo.org>
* net/net.c: cosmetic: fix lines over 80 charactersLuca Ceresoli2011-05-12-77/+155
| | | | | | | | | | | | | | | | | | | | | This removes the following checkpatch warning: - WARNING: line over 80 characters There are three such warnings left. The first is hard to fix with cosmetic-only changes without compromising code readability, so I'm leaving it as it is for now: WARNING: line over 80 characters #1537: FILE: net.c:1537: + [4 tabs] memcpy(((Ethernet_t *)NetArpWaitTxPacket)->et_dest, ... The other two cannot be fixed without splitting string literals, so it is preferred to keep them longer than 80 characters. Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Cc: Ben Warren <biggerbadderben@gmail.com> Cc: Mike Frysinger <vapier@gentoo.org>
* lib, vsprintf: introduce strict_strtoulHeiko Schocher2011-05-12-0/+54
| | | | | | | | | | | | | | | as checkpatch proposes to use strict_strtoul instead of simple_strtoul, introduce it. Ported this function from Linux 2.6.38 commit ID: 521cb40b0c44418a4fd36dc633f575813d59a43d Signed-off-by: Heiko Schocher <hs@denx.de> cc: Wolfgang Denk <wd@denx.de> cc: Detlev Zundel <dzu@denx.de> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
* Fix incorrect use of getenv() before relocationWolfgang Denk2011-05-12-259/+323
| | | | | | | | | | | | | | | | | | | A large number of boards incorrectly used getenv() in their board init code running before relocation. In some cases this caused U-Boot to hang when certain environment variables grew too long. Fix the code to use getenv_r(). Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: The LEOX team <team@leox.org> Cc: Michael Schwingen <michael@schwingen.org> Cc: Georg Schardt <schardt@team-ctech.de> Cc: Werner Pfister <Pfister_Werner@intercontrol.de> Cc: Dirk Eibach <eibach@gdsys.de> Cc: Peter De Schrijver <p2@mind.be> Cc: John Zhan <zhanz@sinovee.com> Cc: Rishi Bhattacharya <rishi@ti.com> Cc: Peter Tyser <ptyser@xes-inc.com>
* cmd_nvedit.c: make error message more helpfulWolfgang Denk2011-05-12-1/+2
| | | | | | | | | | | | | | | | | When calling getenv_f() with a too small buffer, it would print an error message like this: env_buf too small [32] This is not really helpful as it does not give any indication which of the calls might have failed. Change this into: env_buf [32 bytes] too small for value of "hwconfig" so we know at least which variable caused the overflow; this usually allows to quickly find the related code as well. Signed-off-by: Wolfgang Denk <wd@denx.de>
* NET: pass source IP address to packet handlersLuca Ceresoli2011-05-12-28/+44
| | | | | | | | | | This is needed for the upcoming TFTP server implementation. This also simplifies PingHandler() and fixes rxhand_f documentation. Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Acked-by: Detlev Zundel <dzu@denx.de>
* README: remove spurious lineLuca Ceresoli2011-05-12-1/+0
| | | | | | Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Acked-by: Detlev Zundel <dzu@denx.de>
* MPC8260: Fix compile problems with "hymod" boardWolfgang Denk2011-05-12-2/+3
| | | | | | | | | Commit 9d8fbd1 "powerpc, 8xx: Fixup all 8xx u-boot.lds scripts" broke building of the MPC8260 based "hymod" board. Fix this. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Murray Jensen <Murray.Jensen@csiro.au> Cc: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
* zlib: fix DEBUG buildMike Frysinger2011-05-12-1/+2
| | | | | | | | The previous commit imported a little too much from upstream. We need to disable stdio.h when using U-Boot. Reported-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2011-05-12-0/+114
|\
| * PPC405EX CHIP_21 erratumSteven A. Falco2011-05-12-0/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | APM errata CHIP_21 for the 405EX/EXr (from the rev 1.09 document dated 4/27/11) states that rev D processors may wake up with the wrong feature set. This patch implements the APM-proposed workaround. To enable this patch for your board, add the appropriate define for your CPU to your board header file. See kilauea.h for more information. The following variants are supported: #define CONFIG_SYS_4xx_CHIP_21_405EX_NO_SECURITY #define CONFIG_SYS_4xx_CHIP_21_405EX_SECURITY #define CONFIG_SYS_4xx_CHIP_21_405EXr_NO_SECURITY #define CONFIG_SYS_4xx_CHIP_21_405EXr_SECURITY Please note that if you select the wrong define, your board will not boot, and JTAG will be required to recover. Tested on custom boards using: CONFIG_SYS_4xx_CHIP_21_405EX_NO_SECURITY <sfalco@harris.com> CONFIG_SYS_4xx_CHIP_21_405EX_SECURITY <eibach@gdsys.de> Signed-off-by: Steve Falco <sfalco@harris.com> Acked-by: Dirk Eibach <eibach@gdsys.de> Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2011-05-12-37/+115
|\ \
| * | Enable multiple fs options for Marvell SoC family on OpenRD boardsClint Adams2011-05-11-0/+1
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Clint Adams <clint@debian.org> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Prafulla Wadaskar <prafulla@marvell.com> Cc: Julian Pidancet <julian.pidancet@citrix.com>
generated by cgit v1.1 at 2024-11-10 05:00:33 +0000