summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* ColdFire: Fix missing _IO_BASE which caused compile errorTsiChung Liew2009-08-26-0/+4
| | | | | | | | | The compile error was caused by a recent patch. Affected platforms - M5253DEMO.h, M5253EVBE.h, and M54455EVB.h. Adding the _IO_BASE automatically defined to 0 in asm-m68k/io.h if it isn't set in platform configuration file. Signed-off-by: TsiChung Liew <tsicliew@gmail.com>
* Merge branch 'next' of git://git.denx.de/u-boot-net into nextWolfgang Denk2009-08-25-59/+83
|\
| * Convert CS8900 Ethernet driver to CONFIG_NET_MULTI APIBen Warren2009-08-25-59/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All in-tree boards that use this controller have CONFIG_NET_MULTI added Also: - changed CONFIG_DRIVER_CS8900 to CONFIG_CS8900 - changed CS8900_BASE to CONFIG_CS8900_BASE - changed CS8900_BUS?? to CONFIG_CS8900_BUS?? - cleaned up line lengths - modified VCMA9 command function that accesses the device - removed MAC address initialization from lib_arm/board.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com> Tested-by: Wolfgang Denk <wd@denx.de> Acked-by: Wolfgang Denk <wd@denx.de>
| * arm nomadik: activate defrag choose 4k transfer block sizeAlessandro Rubini2009-08-25-0/+4
| | | | | | | | | | | | | | | | This chooses 4kB data size for both TFTP and NFS, as an example about how to use support for IP fragments. Signed-off-by: Alessandro Rubini <rubini@gnudd.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | Merge branch 'master' into nextWolfgang Denk2009-08-25-10/+16
|\ \ | |/ |/|
| * Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2009-08-25-2/+2
| |\
| | * Blackfin: cm-bf527/cm-bf537: increase flash sectorsHarald Krapfenbauer2009-08-23-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Newer revisions of these boards have slightly larger flashes, so increase the configured number of sectors so that U-Boot works on all revisions. Signed-off-by: Harald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | include/s3c24x0.h: fix S3C24X0_SPI_CHANNEL declarationWolfgang Denk2009-08-25-8/+14
| |/ | | | | | | | | | | | | The SPI controller on the S3C24X0 has 8 bit registers, not 32 bit. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Switch from per-driver to common definition of bin2bcd and bcd2binAlbin Tonnerre2009-08-25-0/+5
| | | | | | | | | | Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com> Acked-by: Stefan Roese <sr@denx.de>
* | Replace BCD2BIN and BIN2BCD macros with inline functionsAlbin Tonnerre2009-08-25-19/+12
| | | | | | | | | | | | | | | | | | | | In the process, also remove backward-compatiblity macros BIN_TO_BCD and BCD_TO_BIN and update the sole board using them to use the new bin2bcd and bcd2bin instead Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com> Acked-by: Stefan Roese <sr@denx.de> Acked-by: Detlev Zundel <dzu@denx.de>
* | Add support for the galaxy5200Eric Millbrandt2009-08-25-0/+428
| | | | | | | | | | | | | | | | | | Add support for the DEKA Research and Development galaxy5200 board The galaxy5200 is an Freescale mpc5200 based embedded industrial control board. Signed-off-by: Eric Millbrandt <emillbrandt@dekaresearch.com>
* | unify {CONFIG_,}ENV_IS_EMBEDDEDMike Frysinger2009-08-25-19/+28
|/ | | | | | | | | | Some boards have fallen out of sync by defining CONFIG_ENV_IS_EMBEDDED manually. While it is useful to have this available to the build system, let's do it automatically rather than forcing people to opt into it. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* start a linker script helper fileMike Frysinger2009-08-23-0/+25
| | | | | | | | | | | | | | | Start a common header file for common linker script code (such as workarounds for older linkers) rather than doing this in the build system. As fallout, we no longer execute the linker every time config.mk is included by a build file (which can easily be 70+ times), but rather only execute it once. This also fixes a bug in the major version checking by creating a macro to easily compare versions and keep people from making the same common mistake (forgetting to check major and minor together). Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* include/mmc.h: Fix typo in IS_SD() macroAlbin Tonnerre2009-08-23-1/+1
| | | | Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
* Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-08-22-36/+40
|\
| * mpc83xx: accommodate larger kernel sizes by defaultKim Phillips2009-08-21-20/+20
| | | | | | | | | | | | | | linux mpc83xx_defconfig kernels are getting bigger, accommodate for their growth by adjusting default load and fdt addresses. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * mpc83xx: mpc8377erdb - change DDR settings to those from latest bspKim Phillips2009-08-21-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using Linus' 83xx_defconfig, the mpc8377rdb would hang at boot at either: NET: Registered protocol family 16 or the io scheduler cfq registered message. Fixing up these DDR settings appears to fix the problem. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * mpc83xx: tqm8349 - remove pci & flash window conflictKim Phillips2009-08-21-1/+1
| | | | | | | | | | | | | | | | | | | | | | commit 9993e196da707a0a1cd4584f1fcef12382c1c144 "mpc83xx: convert all remaining boards over to 83XX_GENERIC_PCI" remapped pci windows on tqm834x to make it more consistent with the other 83xx boards. During that time however, the author failed to realize that FLASH_BASE was occupying the same range as what PCI1_MEM_BASE was being assigned. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Tested-by: Wolfgang Denk <wd@denx.de>
| * mpc83xx: add missing CSCONFIG_ODT_WR_CFG for 832x CPUsHeiko Schocher2009-08-21-0/+3
| | | | | | | | | | Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * mpc83xx: mpc8349 - delete unused SYS_MID_FLASH_JUMPPaul Gortmaker2009-08-21-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced with the MPC8349EMDS board, and then copied to a couple other boards by nature of being the reference implementation. u-boot$git grep CONFIG_SYS_MID_FLASH_JUMP include/configs/MPC8349EMDS.h:#define CONFIG_SYS_MID_FLASH_JUMP 0x7F000000 include/configs/sbc8349.h:#define CONFIG_SYS_MID_FLASH_JUMP 0x7F000000 include/configs/vme8349.h:#define CONFIG_SYS_MID_FLASH_JUMP 0x7F000000 u-boot$ It currently isn't used, so delete it before it spreads further. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * mpc83xx: sbc8349 - make enabling PCI more user friendlyPaul Gortmaker2009-08-21-9/+13
| | | | | | | | | | | | | | | | | | | | Prior to this commit, to enable PCI, you had to go manually edit the board config header, which isn't really user friendly. This adds the typical PCI make targets to the toplevel Makefile in accordance with what is being done with other boards. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | arm: rd6281a: Fixed NAND specific warningPrafulla Wadaskar2009-08-21-0/+1
|/ | | | | | | It is recommended to define the macro CONFIG_SYS_64BIT_VSPRINTF for NAND specific warning removal, same is done in this patch Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
* Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2009-08-18-0/+4
|\
| * ppc4xx: Fix "chip_config" command for AMCC ArchesStefan Roese2009-08-18-0/+4
| | | | | | | | | | | | | | | | | | | | This patch fixes the "chip_config" command for I2C bootstrap EEPROM configuration. First it changes the I2C bootstrap EEPROM address to 0x54 as this is used on Arches (instead of 0x52 on Canyonlands/ Glacier). Additionally, the NAND bootstrap settings are removed for Arches since Arches doesn't support NAND-booting. Signed-off-by: Stefan Roese <sr@denx.de>
* | Update the mtd driver name in bootargs for at91-based boardsAlbin Tonnerre2009-08-18-18/+18
| | | | | | | | | | | | | | | | The name of the atmel nand driver in the kernel changed from at91_nand to atmel_nand back in June 2008, but the at91-based boards config files still refer to at91_nand. This patch updates them with the new name Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
* | omap3: Fixed a problem with hweccBen Goska2009-08-18-2/+2
| | | | | | | | | | | | | | | | In commit 187af954cf7958c24efcf0fd62289bbdb4f1f24e there was a typo that offset all the ecc registers by 4 bytes, fixed that. Signed-off-by: Ben Goska <goskab@onid.oregonstate.edu> Acked-by: Dirk Behme <dirk.behme@googlemail.com>
* | Monahans: avoid floating point calculationsWolfgang Denk2009-08-17-1/+1
|/ | | | | | | | | | | Current code for the Monahans CPU defined OSCR_CLK_FREQ as 3.250 (MHz) which caused floating point operations to be used. This resulted in unresolved references to some FP related libgcc functions when using U-Boot's private libgcc functions. Change the code to use fixed point math only. Signed-off-by: Wolfgang Denk <wd@denx.de>
* zlib: updated to v.1.2.3Giuseppe CONDORELLI2009-08-11-227/+491
| | | | | | | | | | | | | This patch updates zlib to the latest stable version. Only relevant zlib parts were ported to u-boot tree, as already did for the current zlib (0.95). New zlib guarantees a faster inflate performances other then others improvements as explained at www.zlib.net. It also includes Alessandro Rubini's patches to allow 0 as destination pointer and to call watchdog reset if required by architecture. Signed-off-by: Giuseppe Condorelli <giuseppe.condorelli@st.com> Reviewed-by: Angelo Castello <angelo.castello@st.com> Reviewed-by: Alessandro Rubini <rubini-list@gnudd.com>
* Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2009-08-11-0/+1
|\
| * arm: A320: driver for FTMAC100 ethernet controllerPo-Yu Chuang2009-08-10-0/+1
| | | | | | | | | | | | | | This patch adds an FTMAC100 ethernet driver for Faraday A320 evaluation board. Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | 85xx: Removed BEDBUG support from FSL 85xx boardsKumar Gala2009-08-10-4/+0
|/ | | | | | | | | For some reason the MPC8544 enabled BEDBUG if PCI was enabled and that got copied int the MPC8536, MPC8572 and P2020 DS boards. The BEDBUG support has never been made to work completely on e500/85xx so we just disable it to save space and match the other FSL 85xx boards. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* OMAP3: Fix missing GPMC_CONFIG_CS0_BASEDirk Behme2009-08-10-0/+1
| | | | | | | | | | Applying two indepenent OMAP3 patches resulted in missing GPMC_CONFIG_CS0_BASE. Patch "omap3: embedd gpmc_cs into gpmc config struct" removes GPMC_CONFIG_CS0_BASE, independent patch "omap3: bug fix for NOR boot support" introduces it's usage. Re-introduce GPMC_CONFIG_CS0_BASE. Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
* mxc-mmc: sdhc host driver for MX2 and MX3 proccessorIlya Yanok2009-08-09-0/+25
| | | | | | | | | | This is a port of Linux driver for SDHC host controller hardware found on Freescale's MX2 and MX3 processors. Uses new generic MMC framework (CONFIG_GENERIC_MMC) and it looks like there are some problems with a framework (at least on LE cpus). Some of these problems are addressed in the following patches. Signed-off-by: Ilya Yanok <yanok@emcraft.com>
* kirkwood/gpio.h: remove duplicate definitionAlessandro Rubini2009-08-09-2/+0
| | | | Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
* arm: Sheevaplug: Fixed NAND specific warningPrafulla Wadaskar2009-08-09-0/+1
| | | | | | | It is recommended to define the macro CONFIG_SYS_64BIT_VSPRINTF for NAND specific warning removal, same is done in this patch Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
* Dual-license IBM code contributionsJosh Boyer2009-08-09-0/+12
| | | | | | | | | | | | | It was brought to our attention that U-Boot contains code derived from the IBM OpenBIOS source code originally provided with some of the older PowerPC 4xx development boards. As a result, the original license of this code has been carried in the various files for a number of years in the U-Boot project. IBM is dual-licensing the IBM code contributions already present in U-Boot under either the terms of the GNU General Public License version 2, or the original code license already present. Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
* digsy_mtc: Update default environmentDetlev Zundel2009-08-09-20/+100
| | | | Signed-off-by: Detlev Zundel <dzu@denx.de>
* export SPI functions to standalone appsMike Frysinger2009-08-09-5/+12
| | | | | | While we're here, fix the broken #ifdef handling in _exports.h. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2009-08-08-1/+23
|\
| * Add Intel E1000 PCIE card supportRoy Zang2009-08-08-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on Intel PRO/1000 Network Driver 7.3.20-k2 Add Intel E1000 PCIE card support. The following cards are added: INTEL_82571EB_COPPER INTEL_82571EB_FIBER, INTEL_82571EB_SERDES INTEL_82571EB_QUAD_COPPER INTEL_82571PT_QUAD_COPPER INTEL_82571EB_QUAD_FIBER INTEL_82571EB_QUAD_COPPER_LOWPROFILE INTEL_82571EB_SERDES_DUAL INTEL_82571EB_SERDES_QUAD INTEL_82572EI_COPPER INTEL_82572EI_FIBER INTEL_82572EI_SERDES INTEL_82572EI INTEL_82573E INTEL_82573E_IAMT INTEL_82573L INTEL_82546GB_QUAD_COPPER_KSP3 INTEL_80003ES2LAN_COPPER_DPT INTEL_80003ES2LAN_SERDES_DPT INTEL_80003ES2LAN_COPPER_SPT INTEL_80003ES2LAN_SERDES_SPT 82571EB_COPPER dual ports, 82572EI single port, 82572EI_COPPER single port PCIE cards and 82545EM_COPPER, 82541GI_LF pci cards are tested on both P2020 board and MPC8544DS board. Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * net: sync env ethaddr to device enetaddr in eth_init()Mike Frysinger2009-08-07-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In the previous enetaddr refactoring, the assumption with commit 56b555a644 was that the eth layer would handle the env -> device enetaddr syncing. This was not the case as eth_initialize() is called only once and the sync occurs there. So make sure the eth_init() function does the env -> device sync with every network init. Reported-by: Andrzej Wolski <awolski@poczta.fm> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | omap3: use only fixed-size types inside ctrl_structsDirk Behme2009-08-08-194/+218
| | | | | | | | | | | | | | | | | | | | replace variable types in ctrl_structs for omap3 by those with fixed size (u8, u16, u32). Additional ifndef-protection is needed by examples which do not compile when including asm/types.h Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
* | omap3: remove typedefs for configuration structsDirk Behme2009-08-08-37/+37
|/ | | | | Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
* omap3: embedd gpmc_cs into gpmc config structMatthias Ludwig2009-08-07-29/+18
| | | | | | | | | Embedd chip select configuration into struct for gpmc config instead of having it completely separated as suggested by Wolfgang Denk on http://lists.denx.de/pipermail/u-boot/2009-May/052247.html Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de>
* Merge branch 'next' of git://git.denx.de/u-boot-coldfireWolfgang Denk2009-08-04-195/+989
|\
| * ColdFire: Update bootargsTsiChung Liew2009-07-14-1/+4
| | | | | | | | | | | | | | Add a bootargs for M53017EVB and update bootargs for M54451EVB Signed-off-by: TsiChung Liew <tsicliew@gmail.com>
| * ColdFire: Add DSPI support for MCF5227x and MCF5445xTsiChung Liew2009-07-14-173/+142
| | | | | | | | | | | | | | | | Remove individual CPU specific DSPI driver. Add required feature for the common DSPI driver in cpu_init and in platform configuration file. Signed-off-by: TsiChung Liew <tsicliew@gmail.com>
| * ColdFire: Fix M53017EVB flash sizeTsiChung Liew2009-07-14-1/+1
| | | | | | | | | | | | Increase the flash size from 8MB to 16MB Signed-off-by: TsiChung Liew <tsicliew@gmail.com>
| * ColdFire: Add M5208EVB and MCF520x CPU supportTsiChung Liew2009-07-14-0/+822
| | | | | | | | Signed-off-by: TsiChung Liew <tsicliew@gmail.com>
| * ColdFire: Update for M54451EVBTsiChung Liew2009-07-14-22/+17
| | | | | | | | | | | | | | | | Update serial boot DRAM's Internal RAM, vector table and DRAM in start.S, serial flash's read status command over SPI and NOR flash. Signed-off-by: TsiChung Liew <tsicliew@gmail.com>