summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix LMB type issuesAndy Fleming2008-07-103-5/+6
| | | | | | | The LMB code now uses phys_addr_t and phys_size_t. Also, there were a couple of casting problems in the bootm code that called the LMB functions. Signed-off-by: Andy Fleming <afleming@freescale.com>
* Fix compiler warningsKumar Gala2008-07-101-2/+2
| | | | | | | | | | gcc-4.3.x generates the following: bootm.c: In function 'do_bootm_linux': bootm.c:208: warning: cast from pointer to integer of different size bootm.c:215: warning: cast from pointer to integer of different size Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* Remove code duplication for setting the default environmentHarald Welte2008-07-103-29/+22
| | | | | | | | | | | common/env_common.c (default_env): new function that resets the environment to the default value common/env_common.c (env_relocate): use default_env instead of own copy common/env_nand.c (env_relocate_spec): use default_env instead of own copy include/environment.h: added default_env prototype Signed-off-by: Werner Almesberger <werner@openmoko.org> Signed-off-by: Harald Welte <laforge@openmoko.org>
* mmc: Move atmel_mci driver into drivers/mmcHaavard Skinnemoen2008-07-104-1/+2
| | | | | | | This makes it easier to use the driver on other platforms. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Acked-by: Jean-Chritophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* avr32: Use CONFIG_ATMEL_MCI to select the atmel_mci driverHaavard Skinnemoen2008-07-106-1/+6
| | | | | | | | | After we move the atmel_mci driver into drivers/mmc, we can't select it with CONFIG_MMC anymore. Introduce a new symbol specifically for this driver so that there's no ambiguity. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Acked-by: Jean-Chritophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Create drivers/mmc subdirectoryHaavard Skinnemoen2008-07-102-0/+46
| | | | | | | | In order to consolidate more of the various MMC drivers around the tree, we must first have a common place to put them. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Acked-by: Jean-Chritophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Change env_get_char from a global function ptr to a functionJoakim Tjernlund2008-07-092-8/+15
| | | | | | This avoids an early global data reference. Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
* Some copy-n-paste fixes in printf usageMatvejchikov Ilya2008-07-094-9/+9
| | | | Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com>
* FDT memory and pci node fixes for MPC8260ADSMatvejchikov Ilya2008-07-093-0/+46
| | | | Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com>
* Fix printf errors.Andrew Klossner2008-07-096-19/+24
| | | | | | | | | | | | The compiler will help find mismatches between printf formats and arguments if you let it. This patch adds the necessary attributes to declarations in include/common.h, then begins to correct the resulting compiler warnings. Some of these were bugs, e.g., "$d" instead of "%d" and incorrect arguments. Others were just annoying, like int-long mismatches on a system where both are 32 bits. It's worth fixing the annoying errors to catch the real ones. Signed-off-by: Andrew Klossner <andrew@cesa.opbu.xerox.com>
* Merge branch 'master' of git://www.denx.de/git/u-boot-mipsWolfgang Denk2008-07-091-0/+11
|\
| * mips: When booting Linux images, add 'ethaddr' and 'eth1addr' to the environmentJason McMullan2008-07-081-0/+11
| | | | | | | | | | | | | | | | Add 'ethaddr' and 'eth1addr' to the Linux kernel environment if they are set in the U-Boot environment. Signed-off-by: Jason McMullan <mcmullan@netapp.com> Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flashWolfgang Denk2008-07-091-1/+1
|\ \
| * | jedec_flash: Fix AM29DL800BB device IDStefan Roese2008-07-081-1/+1
| |/ | | | | | | | | | | | | | | As pointed out by Jerry Hicks, this patch corrects the device ID of the Spansion AM29DL800BB NOR device. Verified against latest Spansion datasheet (rev C4 from Dezember 2006). Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-netWolfgang Denk2008-07-0915-221/+1224
|\ \
| * | Remove duplicate code in cpu/arm926ejs/davinci/lxt972.c.Hugo Villeneuve2008-07-061-27/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate code in cpu/arm926ejs/davinci/lxt972.c. Remove duplicate code in a if/else block in cpu/arm926ejs/davinci/lxt972.c. Fixed style issues. Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | Remove duplicate definitions in include/lxt971a.h.Hugo Villeneuve2008-07-067-168/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate definitions in include/lxt971a.h. Remove duplicate registers and bits definitions in include/lxt971a.h for standard MII registers, and use values in include/miiphy.h instead. Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | net: sh: Renesas SH7763 Ethernet device supportNobuhiro Iwamatsu2008-07-063-0/+1050
| | | | | | | | | | | | | | | | | | | | | | | | | | | Renesas SH7763 has 2 channel Ethernet device. This is 10/100/1000 Base support. But this patch check 10/100 Base only. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | net: ne2000: Move dev_addr variable from grobal to local.Nobuhiro Iwamatsu2008-07-061-2/+1
| | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | net: ne2000: Fix compile error of NE2000Nobuhiro Iwamatsu2008-07-061-7/+4
| | | | | | | | | | | | | | | | | | | | | If enable DEBUG, can not compile ne2000 driver. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | Add mechanisms for CPU and board-specific Ethernet initializationBen Warren2008-07-064-17/+92
| | | | | | | | | | | | | | | | | | | | | | | | This patch is the first step in cleaning up net/eth.c, by moving Ethernet initialization to CPU or board-specific code. Initial implementation is only on the Freescale TSEC controller, but others will be added soon. Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-shWolfgang Denk2008-07-0924-121/+86
|\ \ \
| * | | sh: Fix compile error sh7763rdp boardNobuhiro Iwamatsu2008-07-081-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | Disable SH ether driver. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | sh: Fix SH-boards compile errorNobuhiro Iwamatsu2008-07-0814-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Cleanup out-or-tree building for some boards (.depend) (commit:c8a3b109f07f02342d097b30908965f7261d9f15) because filse ware changed, some SH-boards have compile error. I revised this problem. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | sh: Update Renesas R2DPlus boardNobuhiro Iwamatsu2008-07-071-33/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New NOR Flash board support and remove old type flash board config. And Remove network setting from config file. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | sh: Update Renesas R7780MP boardNobuhiro Iwamatsu2008-07-071-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | New NOR Flash board support and remove network setting from config file. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | sh: Update Renesas Migo-R boardNobuhiro Iwamatsu2008-07-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove network setting from config file. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | sh: Update Hitachi MS7722SE boardNobuhiro Iwamatsu2008-07-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove network setting from config file. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | sh: Cleanup source code of SH7763RDPNobuhiro Iwamatsu2008-07-071-8/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | sh: Cleanup source code of R2DPlusNobuhiro Iwamatsu2008-07-071-13/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | sh: Cleanup source code of R7780MPNobuhiro Iwamatsu2008-07-071-12/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | sh: Cleanup source code of MS7722SENobuhiro Iwamatsu2008-07-071-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | sh: Cleanup source code of MS7720SENobuhiro Iwamatsu2008-07-071-1/+0
| | |/ | |/| | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | | Allow print_size to print in GBBecky Bruce2008-07-091-13/+21
|/ / | | | | | | Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
* | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-07-075-20/+30
|\ \
| * \ Merge branch 'master' of git://www.denx.de/git/u-boot-at91Wolfgang Denk2008-07-075-20/+30
| |\ \
| | * | [AT91SAM9] Fix NAND FLASH timingsPatrice Vilchez2008-07-054-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix NAND FLASH timings for at91sam9x evaluation kits. New timings are based on application note "NAND Flash Support on AT91SAM9 Microcontrollers" available at http://atmel.com/dyn/resources/prod_documents/doc6255.pdf Signed-off-by: Patrice Vilchez <patice.vilchez@atmel.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Stelian Pop <stelian@popies.net>
| | * | Fix boot from NOR due to incorrect reset delay.Stelian Pop2008-07-053-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AT91 RSTC registers are battery-backuped, so their values are not reset across power cycles. One of those registers, the AT91_RSTC_MR register, is being modified by U-Boot, in the ethernet initialisation routine, to generate a 500ms user reset. Unfortunately, this value is not being restored afterwards, causing subsequent resets to also last for 500ms. This long reset sequence causes problems (at least) in the boot sequence from NOR: by the time the CPU tries to load a program from the NOR flash, the latter is still in reset and not yet available. Additionaly, this patch fixes a bug in the original code which caused the reset delay to last for 2s instead of 500ms. Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | | SH: fix out of tree buildingWolfgang Denk2008-07-071-11/+14
| | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-07-075-22/+129
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of git://www.denx.de/git/u-boot-avr32Wolfgang Denk2008-07-075-22/+129
| |\ \ \
| | * | | avr32: Enable SPI flash support on ATNGW100Haavard Skinnemoen2008-06-202-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ATNGW100 has 8MB DataFlash on board. Give users access to it through the new SPI flash framework. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| | * | | avr32: Fix SPI portmux initializationHaavard Skinnemoen2008-06-201-22/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new GPIO manipulation functions to set up the chip select lines, and make sure both busses use GPIO for chip select control. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| | * | | avr32: Add GPIO manipulation functionsPeter Ma2008-06-202-0/+64
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Adds GPIO manipulation functions for AVR32 AP7 platform. Signed-off-by: Peter Ma <pma@mediamatech.com> [haavard.skinnemoen@atmel.com: coding style fixup, slight simplification] Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
* | | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-07-073-1/+12
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xxWolfgang Denk2008-07-075-4/+16
| |\ \ \
| | * | | update mvBL-M7 board configAndre Schwarz2008-07-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update mvBL-M7 config file to use UBOOT_VERSION. Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * | | fix non-working mvBL-M7Andre Schwarz2008-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing #define CONFIG_HIGH_BATS in mvBL-M7 board config file. Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * | | fix system config overwrite @ MPC834x and MPC8313Andre Schwarz2008-06-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During 83xx setup the "System I/O configuration register high" gets overwritten with user defined value if CFG_SICRH is defined. Regarding to the MPC834x manual (Table 5-28 reve.1) bits 28+29 of SICRH must keep their reset value regardless of configuration. On my board (using RGMII) those bits are set after reset - yet it's unclear where they come from. The patch keeps both bits on MPC834x and MPC8313. Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * | | mpc83xx: move CPU_TYPE_ENTRY over to processor.hKim Phillips2008-06-252-1/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to avoid this: cpu.c:47:1: warning: "CPU_TYPE_ENTRY" redefined In file included from cpu.c:33: /home/kim/git/u-boot/include/asm/processor.h:982:1: warning: this is the location of the previous definition Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
OpenPOWER on IntegriCloud