summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2009-07-20-8/+51
|\
| * Blackfin: bf537-{minotaur,srv1}: do not hardcode CONFIG_ETHADDRMike Frysinger2009-07-18-6/+4
| | | | | | | | | | | | | | MAC addresses should not be hardcoded in boards to avoid random link level conflicts. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf533-stamp: back down SCLK a bitMike Frysinger2009-07-18-1/+1
| | | | | | | | | | | | | | | | | | While the 1.0 and 1.2 spin of the bf533-stamp boards can handle the higher SCLK speeds just fine, the 1.1 spin cannot due to the bugs introduced with the shortened SDRAM traces. So lower the SCLK speed down to a value that all three can handle. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: split cpu COBJS into multilinesMike Frysinger2009-07-18-1/+7
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: add os log functionsMike Frysinger2009-07-18-1/+40
| | | | | | | | | | | | | | | | Part of the mini Blackfin ABI with operating systems is that they can use 0x4f0-0x4f8 to pass log buffers to/from bootloaders. So add support to U-Boot for reading the log buffer. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-mpc83xxWolfgang Denk2009-07-20-1266/+342
|\ \
| * | mpc83xx: convert all remaining boards over to 83XX_GENERIC_PCIKim Phillips2009-07-18-1266/+342
| |/ | | | | | | Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | mmc: set bus width to 1 and clock to minimum early during initializationIlya Yanok2009-07-19-0/+3
| | | | | | | | | | | | | | We need to switch back to 1-bit before initialization or SD 2.0 cards will fail to send SCR if we've switched to 4-bit already. Signed-off-by: Ilya Yanok <yanok@emcraft.com>
* | config.mk: Remove unused HPATHShinya Kuribayashi2009-07-19-1/+1
| | | | | | | | | | | | This variable is not unused anywhere. Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
* | digsy mtc: Enable command line history.Grzegorz Bernacki2009-07-19-0/+1
| | | | | | | | Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
* | compiler.h: unify system ifdef cruft hereMike Frysinger2009-07-19-149/+150
| | | | | | | | | | | | | | | | | | | | | | Shove a lot of the HOSTCC and related #ifdef checking crap into the new compiler.h header so that we can keep all other headers nice and clean. Also introduce custom uswap functions so we don't have to rely on the non standard implementations that a host may (or may not in the case of OS X) provide. This allows mkimage to finally build cleanly on an OS X system. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | common: fix 'dummy' is used uninitialized in this function warningKim Phillips2009-07-19-1/+1
| | | | | | | | | | | | | | | | | | fix this gcc 4.4 warning: xyzModem.c: In function 'xyzModem_stream_open': xyzModem.c:564: warning: 'dummy' is used uninitialized in this function Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | push CROSS_COMPILE out to $(ARCH)_config.mkMike Frysinger2009-07-19-42/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | Each arch should handle setting a proper default CROSS_COMPILE value in their own config.mk file rather than having to maintain a large ugly list in the Makefile. By using conditional assignment, we don't have to worry about the variable already being set (env/cmdline/etc...). The common config.mk file takes care of exporting CROSS_COMPILE already, and while a few variables (toolchain ones) utilize CROSS_COMPILE before including the arch config.mk, they do so with deferred assignment. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | malloc.h: protect it against multiple includeJean-Christophe PLAGNIOL-VILLARD2009-07-19-1/+4
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | Fix boards broken after removal of legacy NAND and DoC supportWolfgang Denk2009-07-19-4/+7
| | | | | | | | | | | | | | | | Commit 2419169f removed support for legacy NAND and disk on chip but missed to update the code for a few boards. This patch fixes the resulting build issues. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | cmd_flash.c: fix fix compile error for boards with DataFlashWolfgang Denk2009-07-19-1/+3
| | | | | | | | | | | | | | | | | | | | | | Commit 5669ed45 ("cmd_flash.c: fix warning: unused variable 'addr_first'/'addr_last'") changed the #ifdef logic areound the declaration of these variables and missed a combination of settings of HAS_DATAFLASH with SYS_NO_FLASH; this patch fixes this. Also spotted by Alessandro Rubini <rubini@gnudd.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* | pcm030: fix out-of-tree buildingWolfgang Denk2009-07-19-0/+1
| | | | | | | | | | | | | | Commit 0a87dd90 that was supposed to fix out-of-tree building for the pcm030 board was unfortunately incomplete. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Canyonlands SATA harddisk driverKazuaki Ichinohe2009-07-19-0/+2602
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a SATA harddisk driver for the canyonlands. This patch is kernel driver's porting. This patch corresponded to not cmd_scsi but cmd_sata. This patch divided an unused member with ifndef __U_BOOT__ in the structure. [environment variable, boot script] setenv bootargs root=/dev/sda7 rw setenv bootargs ${bootargs} console=ttyS0,115200 ext2load sata 0:2 0x400000 /canyonlands/uImage ext2load sata 0:2 0x800000 /canyonlands/canyonlands.dtb fdt addr 0x800000 0x4000 bootm 0x400000 - 0x800000 If you drive SATA-2 disk on Canyonlands, you must change parts from PI2PCIE212 to PI2PCIE2212 on U25. We confirmed to boot by using following disks: 1.Vendor: Fujitsu Type: MHW2040BS 2.Vendor: Fujitsu Type: MHW2060BK 3.Vendor: HAGIWARA SYS-COM:HFD25S-032GT 4.Vendor: WesternDigital Type: WD3200BJKT (CONFIG_LBA48 required) 5.Vendor: WesternDigital Type: WD3200BEVT (CONFIG_LBA48 required) 6.Vendor: Hitachi Type: HTS543232L9A300 (CONFIG_LBA48 required) 7.Vendor: Seagate Type: ST31000333AS (CONFIG_LBA48 required) 8.Vendor: Transcend Type: TS32GSSD25S-M 9.Vendor: MTRON Type: MSD-SATA1525-016 Signed-off-by: Kazuaki Ichinohe <kazuichi at fsi.co.jp>
* | Add support for the Tundra TSI148 VME-bridgeReinhard Arlt2009-07-19-0/+707
|/ | | | | | | | | | From: Reinhard Arlt <reinhard.arlt@esd-electronics.com> This patch adds support for the Tundra TSI148 VME-bridge. It's used on the upcoming esd VME8349 board. Signed-off-by: Reinhard Arlt <reinhard.arlt@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
* PATI board: fix compiler warningsWolfgang Denk2009-07-19-6/+10
| | | | | | | | | | | | Fix these: pati.c: In function 'checkboard': pati.c:358: warning: pointer targets in passing argument 2 of 'getenv_r' differ in signedness ../common/flash.c: In function 'write_word': ../common/flash.c:824: warning: dereferencing type-punned pointer will break strict-aliasing rules cmd_pati.c: In function 'do_pati': cmd_pati.c:279: warning: 'value' may be used uninitialized in this function Signed-off-by: Wolfgang Denk <wd@denx.de>
* mpl: printing current stdio devices cleanupJean-Christophe PLAGNIOL-VILLARD2009-07-19-34/+6
| | | | | | | | | | | | Currently the mpl boards duplicate the code to print the current devices from common/console.c; use stdio_print_current_devices() instead Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Edited commit message. Signed-off-by: Wolfgang Denk <wd@denx.de>
* console: unify printing current devicesJean-Christophe PLAGNIOL-VILLARD2009-07-19-46/+30
| | | | | | Create stdio_print_current_devices() for this purpose Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Merge branch 'master' of git://git.denx.de/u-boot-nand-flashWolfgang Denk2009-07-19-5650/+33
|\
| * Remove legacy NAND and disk on chip references from boards.Scott Wood2009-07-17-1053/+0
| | | | | | | | Signed-off-by: Scott Wood <scottwood@freescale.com>
| * Remove legacy NAND and disk on chip code.Scott Wood2009-07-16-4561/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Legacy NAND had been scheduled for removal. Any boards that use this were already not building in the previous release due to an #error. The disk on chip code in common/cmd_doc.c relies on legacy NAND, and it has also been removed. There is newer disk on chip code in drivers/mtd/nand; someone with access to hardware and sufficient time and motivation can try to get that working, but for now disk on chip is not supported. Signed-off-by: Scott Wood <scottwood@freescale.com>
| * nand: Change NAND_MAX_OOBSIZE to 218 as needed for some 4k page devicesStefan Roese2009-07-16-1/+1
| | | | | | | | | | | | | | | | | | This is needed for the MPC512x NAND driver (fsl_nfc_nand.c) which already defines such a 4k plus 218 bytes ECC layout. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Scott Wood <scottwood@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * nand: ndfc: Remove unnecessary #ifdef'sStefan Roese2009-07-16-6/+0
| | | | | | | | | | | | | | | | | | Now that the 4xx NAND driver ndfc is moved to the common NAND driver directory we don't need this #ifdef's anymore. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Scott Wood <scottwood@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * nand/ppc4xx: Move PPC4xx NAND driver to common NAND driver directoryStefan Roese2009-07-16-6/+6
| | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de> Cc: Scott Wood <scottwood@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * nand: fixed failed reads on corrected ECC errors in nand_util.cValeriy Glushkov2009-07-16-5/+5
| | | | | | | | | | | | Signed-off-by: Valeriy Glushkov <gvv@lstec.com> Signed-off-by: Paulraj, Sandeep <s-paulraj@ti.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * Typo fix: use CONFIG_SOC_DM644X, not CONFIG_SOC_DM646.David Brownell2009-07-16-1/+1
| | | | | | | | | | Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * MTD: OneNAND: Increase the environment size to 4KiBKyungmin Park2009-07-16-17/+18
| | | | | | | | | | | | | | Also use mtd operation instead of onenand functions Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
* | cmd_flash.c: fix warning: unused variable 'addr_first'/'addr_last'Wolfgang Denk2009-07-18-3/+3
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | OMAP3 Fix compiler warning for v7_flush_dcache_allTom Rix2009-07-18-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On build of omap3 targets in MAKEALL, the *.ERR files have cpu.c: In function 'cleanup_before_linux': cpu.c:64: warning: implicit declaration of function 'v7_flush_dcache_all' cpu.c:64: warning: implicit declaration of function 'get_device_type The functions v7_flush_dcache_all and get_device_type are declared in include/asm-arm/arch-omap3/sys_proto.h, so use this file to declare the functions. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
* | ARM: make split_by_variant.sh output more usefulWolfgang Denk2009-07-18-2/+2
| | | | | | | | | | | | | | | | | | The board/armltd/integrator/split_by_variant.sh script used to print "Configuring for integrator*p board..." no matter which board name was being compiled. This made it difficult to match MAKEALL output to board names. This patch fixes this. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | NAND: Part 2: Fix warning Please define CONFIG_SYS_64BIT_VSPRINTF...Wolfgang Denk2009-07-18-1/+46
| | | | | | | | | | | | | | | | | | | | | | Commit 8d2effea added a warning for configurations that use NAND without defining the (then necessary) CONFIG_SYS_64BIT_VSPRINTF but failed to fix the affected boards. This patch covers the non-PPC boards that were missed in the previous patch (commit 170c1972). Signed-off-by: Wolfgang Denk <wd@denx.de>
* | at91cap9adk: fix #ifdef/#endif pairingWolfgang Denk2009-07-18-1/+1
| | | | | | | | | | | | The #ifdef/#endif pairing in this file was obviously messed up. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | pcm030: fix out-of-tree buildingWolfgang Denk2009-07-18-1/+1
| | | | | | | | | | | | | | Commit c9969947, which added support for the pcm030 board (aka phyCORE-MPC5200B-tiny), broke out-of-tree building. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | MPC837XERDB: fix warning: "CONFIG_SYS_MONITOR_LEN" redefinedWolfgang Denk2009-07-18-1/+0
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | 8xxx: fix warning: implicit declaration of function 'uec_standard_init'Wolfgang Denk2009-07-18-0/+1
| | | | | | | | | | | | | | | | Commit 8e55258f created function uec_standard_init() to initialize all UEC interfaces for 83xx and 85xx but failed to provide a prototype for it. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | MIP405T: fix compile problemWolfgang Denk2009-07-18-1/+1
| | | | | | | | | | | | | | The "stdio/device: rework function naming convention" patch (commit 52cb4d4f) broke the MIP405T board; this patch fixes it. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | NAND: Fix warning Please define CONFIG_SYS_64BIT_VSPRINTF...Wolfgang Denk2009-07-18-2/+34
| | | | | | | | | | | | | | | | Commit 8d2effea added a warning for configurations that use NAND without defining the (then necessary) CONFIG_SYS_64BIT_VSPRINTF but failed to fix the affected boards. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | CPCI750: fix compile problemWolfgang Denk2009-07-18-1/+1
| | | | | | | | | | | | | | Commit bc0d3296 removed ppc_error_no.h from Marvell boards but forgot to update board/esd/cpci750/mv_eth.h Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-07-18-3/+3
|\ \
| * \ Merge branch 'master' of git://git.denx.de/u-boot-i2cWolfgang Denk2009-07-18-3/+3
| |\ \
| | * | cmd_i2c: bugfix: add missing braceAlessandro Rubini2009-07-18-3/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sub-command parser missed a brace, so "return 0;" is always taken and no error message is diplayed if you say "i2c scan" instead of "i2c probe", for example. Proper brace is added. Also, a misleading and unneeded else is removed. Signed-off-by: Alessandro Rubini <rubini@gnudd.com.it>
* | | stdio/device: rework function naming conventionJean-Christophe PLAGNIOL-VILLARD2009-07-18-234/+198
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far the console API uses the following naming convention: ======Extract====== typedef struct device_t; int device_register (device_t * dev); int devices_init (void); int device_deregister(char *devname); struct list_head* device_get_list(void); device_t* device_get_by_name(char* name); device_t* device_clone(device_t *dev); ======= which is too generic and confusing. Instead of using device_XX and device_t we change this into stdio_XX and stdio_dev This will also allow to add later a generic device mechanism in order to have support for multiple devices and driver instances. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Edited commit message. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | ppc: Fix compile error for boards with CONFIG_DDR_ECCPeter Tyser2009-07-17-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | A bug was introduced by commit e94e460c6e8741f42dab6d8dd4b596ba5d9d79ae which affected non-MPC83xx/85xx/86xx ppc boards which had CONFIG_DDR_ECC defined and resulted in errors such as: Configuring for canyonlands board... fsl_dma.c:50:2: error: #error "Freescale DMA engine not supported on your processor" make[1]: *** No rule to make target `.depend', needed by `libdma.a'. Stop. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* | include/config_cmd_default.h cleanupPrafulla Wadaskar2009-07-17-3/+3
| | | | | | | | | | | | | | arranged configurations in alphabetical order CONFIG_CMD_FLASH moved under ifndef CONFIG_SYS_NO_FLASH Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2009-07-17-131/+304
|\ \
| * | Added support for splash screen positioningMatthias Weisser2009-07-17-3/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support splash image positioning by adding an additional variable "splashpos" to the environment. Please see README for details. Signed-off-by: Matthias Weisser <matthias.weisser@graf-syteco.de> Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Anatolij Gustschin <agust@denx.de>