summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* powerpc, 8xx: Fixup all 8xx u-boot.lds scriptsJoakim Tjernlund2011-04-20-113/+170
| | | | | | | 8xx was left behind when fixing up powerpc linking scripts to support -fpic. Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
* MAINTAINERS: fix email address caseFabio Estevam2011-04-13-1/+1
| | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
* Fix bad padding of bootp request packetSimon Glass2011-04-13-1/+1
| | | | | | This seems to pad to one byte longer than required Signed-off-by: Simon Glass <sjg@chromium.org>
* Merge branch 'sf' of git://git.denx.de/u-boot-blackfinWolfgang Denk2011-04-13-116/+148
|\
| * sf: sst: add support for SST25VF064CJames Kosin2011-04-13-0/+4
| | | | | | | | | | Signed-off-by: James Kosin <jkosin@intcomgrp.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * cmd_sf: use cmd_usage() in more placesMike Frysinger2011-04-12-30/+29
| | | | | | | | | | | | | | Requires a little reworking of the code flow with sub-functions, but not a big deal. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * cmd_sf: drop device status message when probingMike Frysinger2011-04-12-3/+0
| | | | | | | | | | | | | | The common spi flash layer displays useful info when probing, so no need for us to duplicate that. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * sf: use print_size() for sector_size outputMike Frysinger2011-04-12-2/+2
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * cmd_sf: add handler for +len arg for erase commandRichard Retanubun2011-04-12-4/+47
| | | | | | | | | | | | | | | | | | This patch adds [+]len handler for the erase command that will automatically round up the requested erase length to the flash's sector_size. Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * sf: localize erase funcsMike Frysinger2011-04-12-9/+9
| | | | | | | | | | | | | | No need for these to be exported as they are only accessed indirectly via function pointers. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * sf: sst: setup read funcMike Frysinger2011-04-12-0/+1
| | | | | | | | | | | | The previous unification patch missed setting up the sst read func. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * sf: add struct spi_flash.sector_size parameterRichard Retanubun2011-04-12-64/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a new member to struct spi_flash (u16 sector_size) and updates the spi flash drivers to start populating it. This parameter can be used by spi flash commands that need to round up units of operation to the flash's sector_size. Having this number in one place also allows duplicated code to be further collapsed into one common location (such as erase parameter and the detected message). Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * sf: atmel: undo unification of status pollingMike Frysinger2011-04-11-2/+29
| | | | | | | | | | | | | | | | The AT45 flashes are completely different (at the command set and status register level) from all other SPI flashes, so we can't unify their logic with common code. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * sf: punt unused spi_flash_region structMike Frysinger2011-04-11-5/+0
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-x86Wolfgang Denk2011-04-13-353/+261
|\ \
| * \ Merge branch 'master' of git://git.denx.de/u-boot-x86Graeme Russ2011-04-13-0/+2
| |\ \
| | * | eNET: Fix undefined reference to `monitor_flash_len'Graeme Russ2011-04-08-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit cfbe861506e2dc3250ac99dc45bb3d1ac60f4857 removed the definition of monitor_flash_len from the eNET which was not picked up due to extensive use of the SRAM configuration target for testing Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | x86: Update MAINTAINERS and delete README filesGraeme Russ2011-04-13-105/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The README files are totally out-of-date to the point where they do more harm than good Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | sc520: Move reset to stand-alone fileGraeme Russ2011-04-13-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial linking allows weak functions to be overridden in files containing only one function. Moving the sc520 override of reset_cpu gets rid of an ugly #ifdef Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | x86: Rename i386 to x86Graeme Russ2011-04-13-28/+27
| | | | | | | | | | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | x86: Code cleanupGraeme Russ2011-04-13-179/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the copyright notices in the x86 files consistent and update them with proper attributions for recent updates Also fix a few comment style/accuracy and whitespace/blank line issues Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | eNET: Remove config.mkGraeme Russ2011-04-13-26/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By including <config.h> in the ld script, CONFIG_SYS_MONITOR_LEN (defined in the boards config file) can be used in lieu of FLASH_SIZE (defined in the board specific config.mk) As this is the last remaining entry in the board specific config.mk, this file can now be removed Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | eNET: Fix saveenv crashGraeme Russ2011-04-13-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_ENV_SIZE = CONFIG_ENV_SECT_SIZE = 128kB but CONFIG_SYS_STACK_SIZE is only 32kB resulting in saveenv causing a stack overflow and crashing U-Boot. Resolve by reducing CONFIG_ENV_SIZE to 4kB Also fix up CONFIG_SYS_MALLOC_LEN to correctly use environment sector size and add some comments to the memory organisation configuration Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | | | cfi_flash: Fix CONFIG_SYS_FLASH_AUTOPROTECT_LIST usagePeter Tyser2011-04-13-6/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6ee1416e8184b4d9ebe6087d396a60bcecf3551c (mtd, cfi: introduce void flash_protect_default(void)) introduced a bug which resulted in boards that define CONFIG_SYS_FLASH_AUTOPROTECT_LIST not compiling with the the following errors and warning: ptyser@petert u-boot $ make -s xpedite520x Configuring for xpedite520x board... cfi_flash.c: In function 'flash_protect_default': cfi_flash.c:2118: error: 'i' undeclared (first use in this function) cfi_flash.c:2118: error: (Each undeclared identifier is reported only once cfi_flash.c:2118: error: for each function it appears in.) cfi_flash.c:2118: error: 'apl' undeclared (first use in this function) cfi_flash.c:2118: error: invalid application of 'sizeof' to incomplete type 'struct apl_s' cfi_flash.c: In function 'flash_init': cfi_flash.c:2137: warning: unused variable 'apl' Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Reported-by: Kumar Gala <galak@kernel.crashing.org> Cc: Heiko Schocher <hs@denx.de>
* | | disk/part.c: fix potential stack overflow bugLei Wen2011-04-12-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If the param pass to get_dev is not the one defined in the block_drvr, it could make uboot becomes unstable, for it would continue run after search complete the block_drvr table. Signed-off-by: Lei Wen <leiwen@marvell.com>
* | | Add support for dataflash to U-boot environment settings tool.Remy Bohmer2011-04-12-28/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The sector size for SPI-dataflash (like AT45 flashes) are not always a power-of-2. So, the sector calculations are rewritten such that it works for either power-of-2 as any size sectors. * Make the flash sector size optional in case it is the same value as the environment size. Signed-off-by: Remy Bohmer <linux@bohmer.net>
* | | mkimage: add "-V" option to print version informationWolfgang Denk2011-04-12-2/+12
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | ftwdt010_wdt: move header to include/faraday and enhanceMacpaul Lin2011-04-12-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Move header to include/faraday 2. Fix include path in ftwdt010_wdt.c 3. Fix function prototype and declaration to - ftwdt010_wdt_settimeout - ftwdt010_wdt_reset - ftwdt010_wdt_disable 4. Add "#if definde (CONFIG_HW_WATCHDOG)" let user have flexibilty to choose which better to his product. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* | | common/cmd_bdinfo.c: fix do_bdinfo() for AVR32Andreas Bießmann2011-04-12-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes following warning message: ---8<--- cmd_bdinfo.c:458: warning: initialization from incompatible pointer type --->8--- There was a prototype change in 54841ab50c20d6fa6c9cc3eb826989da3a22d934 for argv[] pointer type to const. This change was not made for AVR32 cause this code came in later by a merge. Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
* | | cmd_nvedit: use explicit typecast for printfAndreas Bießmann2011-04-12-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes warnings in MAKEALL for avr32: ---8<--- cmd_nvedit.c: In function 'do_env_export': cmd_nvedit.c:663: warning: format '%zX' expects type 'size_t', but argument 3 has type 'ssize_t' --->8--- Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
* | | Make STANDALONE_LOAD_ADDR configurable per boardWolfgang Denk2011-04-12-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename STANDALONE_LOAD_ADDR into CONFIG_STANDALONE_LOAD_ADDR and allow that the architecture-specific default value gets overwritten by defining the value in the board header file. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> Cc: Daniel Hellstrom <daniel@gaisler.com> Cc: Tsi Chung Liew <tsi-chung.liew@freescale.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | | Drop config.h include in tools/imximage.hLoïc Minier2011-04-12-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "make tools-all" should allow building tools such as mkimage and the new imximage without any config, but imximage.c currently fails to build with: imximage.h:27:20: error: config.h: No such file or directory config.h is not needed in imximage.h nor in imximage.c, and imximage.h is only included from imximage.c, so drop this include to fix the build. Signed-off-by: Loïc Minier <loic.minier@linaro.org>
* | | Fix misc spelling errors found by lintianLoïc Minier2011-04-12-10/+10
| | | | | | | | | | | | Signed-off-by: Loïc Minier <loic.minier@linaro.org>
* | | Fix gunzip to work for any gziped uImage sizeCatalin Radu2011-04-12-6/+10
| | | | | | | | | | | | Signed-off-by: Catalin Radu <Catalin@VirtualMetrix.com>
* | | Fix min/max macros in include/common.hAaron Williams2011-04-12-2/+4
| |/ |/| | | | | | | | | | | | | | | | | There is a bug in the min and max macros in common.h which occurs if Y is a larger type than X. For example, if Y is a 64-bit value and X is a 32-bit value then Y will be truncated to 32-bits. This fix matches what is done in the Linux kernel but without the additional type checking present in the kernel version. Signed-off-by: Aaron Williams <aaron.williams@caviumnetworks.com>
* | ftwdt010_wdt: support faraday ftwdt010 watchdogMacpaul Lin2011-04-11-0/+206
| | | | | | | | | | | | | | | | Faraday ftwdt010 watchdog is an architecture independant watchdog. It is usually used in SoC chip design. Signed-off-by: Macpaul Lin <macpaul@andestech.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* | mp2usb: remove board supportEric Bénard2011-04-11-945/+0
| | | | | | | | | | | | | | this board was cancelled long time ago so remove it as it won't be maintained anymore Signed-off-by: Eric Bénard <eric@eukrea.com>
* | ppc, mgcoge: add DIP switch detectionAndreas Huber2011-04-11-0/+23
| | | | | | | | | | | | | | | | | | This reads the DIP switch on mgcoge. The DIP switch is connected to the BFTICU (0x40000089) FPGA. If the DIP switch is set the environment variable 'actual_bank' is set to 0 and starts the SW in bank0. Signed-off-by: Andreas Huber <andreas.huber@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
* | arm, keymile: remove unneeded codeHolger Brunck2011-04-11-7/+0
| | | | | | | | | | | | | | | | On first HW versions the BOCO FPGA was behind a MUX device. These HW versions are not supported anymore. And therefore this code can be removed, it is already unused. Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
* | Net: Add Intel E1000 82574L PCIe card supportRoy Zang2011-04-11-8/+32
| | | | | | | | | | | | | | | | | | Add Intel E1000 82574L PCIe card support. Test on MPC8544DS and MPC8572 board. Add the missing contact information for future support. Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> Acked-by: Kumar Gala <galak@kernel.crashing.org>
* | PowerPC: Add support for -msingle-pic-baseJoakim Tjernlund2011-04-11-12/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | -msingle-pic-base is a new gcc option for ppc and it reduces the size of my u-boot with 6-8 KB. While at it, add -fno-jump-tables too to save a few more bytes. -msingle-pic-base will be in gcc 4.6, however backported patches are available at http://bugs.gentoo.org/show_bug.cgi?id=347281 Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
* | PowerPC: Move -fPIC flag to common placeJoakim Tjernlund2011-04-11-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The -fPIC flag belongs with -mrelocatable, move it there. Also change -fPIC to -fpic as this produces smaller binaries. However, currently -mrelocatable promotes -fpic to -fPIC, a fix for this is in upcoming gcc 4.6 or you can apply this small patch to gcc: diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h index 8da8410..e4b8280 100644 --- a/gcc/config/rs6000/sysv4.h +++ b/gcc/config/rs6000/sysv4.h @@ -227,7 +227,8 @@ do { \ } \ \ else if (TARGET_RELOCATABLE) \ - flag_pic = 2; \ + if (!flag_pic) \ + flag_pic = 2; \ } while (0) #ifndef RS6000_BI_ARCH -- Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
* | ea20: fix undefined PHY_* errorsBen Gardiner2011-04-11-3/+3
| | | | | | | | | | | | | | | | | | | | | | This patch fixes ea20 after 8ef583a0351590a91394499eb5ca2ab8a703d959 where the u-boot custom PHY_ macros were replaced with those of linux/mii.h MII_ definitions except in the RMII support for davinci_emac. Probably also due to the merge path of changes in 2010.12. Signed-off-by: Ben Gardiner<bengardiner@nanometrics.ca> CC: Mike Frysinger <vapier@gentoo.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | ea20: fix libea20.o not foundBen Gardiner2011-04-11-1/+1
| | | | | | | | | | | | | | | | | | | | This patch fixes ea20 after commit 6d8962e814c15807dd6ac5757904be2a02d187b8 where $(obj)lib$(BOARD).a was changed to $(obj)lib$(BOARD).o in almost all the Makefiles except ea20, probably due to merge path of the changes in 2010.12. Signed-off-by: Ben Gardiner<bengardiner@nanometrics.ca> CC: Sebastien Carlier <sebastien.carlier@gmail.com> Acked-by : Stefano Babic <sbabic@denx.de>
* | bootm: replace blob_start with image_startLei Wen2011-04-11-1/+1
| | | | | | | | | | | | | | | | | | | | | | For uImage always has a 64 bytes header, we couldn't expect to do the xip from the header but should xip from the image start. The latter logic in that section is also move the image from image_start to the load address, so sync this logic to the xip operation. Signed-off-by: Lei Wen <leiwen@marvell.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | sf: unify read functionsMike Frysinger2011-04-11-157/+22
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | sf: unify erase functionsMike Frysinger2011-04-11-335/+83
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | sf: unify status polling for ready bitMike Frysinger2011-04-11-283/+81
| | | | | | | | | | | | | | | | All of the spi flash drivers implement the status register polling for detecting the device ready state, so unify them all in a new helper function -- spi_flash_wait_ready. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | sf: unify read/write helpersMike Frysinger2011-04-11-48/+19
| | | | | | | | | | | | | | These functions largely do the same exact thing, so unify them all into one basic function. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2011-04-10-159/+394
|\ \