summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* at91cap9adk: fix #ifdef/#endif pairing (2nd try)Wolfgang Denk2009-07-27-1/+0
| | | | | | | Commit 7024aa14 was supposed to fix the #ifdef/#endif pairing in include/configs/at91cap9adk.h, but did not cate all problems. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Fix include/common.h for boards with CONFIG_STATUS_LEDWolfgang Denk2009-07-27-3/+3
| | | | | | | | | The reordering of include/common.h by commit fcd3c87e495f3c48 broke boards with status LED support, resulting in error: #error Status LED configuration missing errors. Undo this reordering to avoid this issue. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Make include/common.h usable by assembler codeWolfgang Denk2009-07-27-17/+20
| | | | | | | | | | | | | | Commit 70ebf316 factored out the ROUND() macro into include/common.h, not realizing that the primary use of this macro on AT91 systems was in start.S where common.h was not included, and could not be included because it contains a lot of C code which the assembler doesn't understand. This patch wraps such code in common.h in a "#ifndef __ASSEMBLY__" construct, and then adds an include to cpu/arm926ejs/start.S thus solving the problem. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2009-07-26-86/+181
|\
| * update the EB+MCF-EV123 board supportJens Scharsig2009-07-26-79/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the support for EB+MCF-EV123 board and needs the [PATCH 1/2 V3] new video driver for bus vcxk framebuffers * remove the board framebuffer driver * use the common bus_vcxk framebuffer driver * adds bmp support * adds splashimage support * fix serveral cosmetical errors Signed-off-by: Jens Scharsig <esw@bus-elektronik.de> [agust@denx.de: fixed some style issues before applying] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * new video driver for bus vcxk framebuffersJens Scharsig2009-07-26-0/+36
| | | | | | | | | | | | | | | | | | | | This patch adds a new video driver * adds common bus_vcxk framebuffer driver Signed-off-by: Jens Scharsig <esw@bus-elektronik.de> [agust@denx.de: fixed lots of style issues before applying] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * lcd.h: define extern vidinfo_t for all casesAlessandro Rubini2009-07-26-6/+2
| | | | | | | | | | | | | | | | include/lcd.h has different vidinfo for different platforms, and several extern declaration, but one for the default case was missing. This makes them a single extern declaration for everyone. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
| * Add LCD support to MIMC200 boardMark Jackson2009-07-26-0/+16
| | | | | | | | | | | | This patch updates the MIMC200 files to enable the LCD. Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
| * Add 16bit colour support in lcd.hMark Jackson2009-07-26-1/+1
| | | | | | | | | | | | This patch adds support for LCD_COLOR16 in include/lcd.h. Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
| * Add AVR32 LCD supportMark Jackson2009-07-26-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the AVR32 LCD controller. This patch is based off the latest u-boot-video. A quick summary of what's going on:- Enable LCDC pixel clock Enable LCDC port pins Add framebuffer pointer to global_data struct Allocate framebuffer To use the new code, update your board config to include something like this:- #define CONFIG_LCD 1 #if defined(CONFIG_LCD) #define CONFIG_CMD_BMP #define CONFIG_ATMEL_LCD 1 #define LCD_BPP LCD_COLOR16 #define CONFIG_BMP_16BPP 1 #define CONFIG_FB_ADDR 0x10600000 #define CONFIG_WHITE_ON_BLACK 1 #define CONFIG_VIDEO_BMP_GZIP 1 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE 262144 #define CONFIG_ATMEL_LCD_BGR555 1 #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 #define CONFIG_SPLASH_SCREEN 1 #endif The standard U-Boot BMP and Splash-screen features should just work. Signed-off-by: Mark Jackson <mpfj@mimc.co.uk> [agust@denx.de: fixed some style issues] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * video: move extern declarations from C to headersAlessandro Rubini2009-07-25-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves some extern declaration from lcd.c to lcd.h, removing unneeded ifdef around a pair of them. Additionally, since gunzip_bmp() was declared static in cmd_bmp.c but extern in lcd.c, I removed the static. The extra "#include <lcd.h>" in cmd_bmp.c is added to ensure the header is consistent with the source. This has been compile-tested on both ARM (at91 boards) and PowerPC (HH405_config, TQM823L_LCD_config, mcc200_config), to test all use combinations. Signed-off-by: Alessandro Rubini <rubini@gnudd.it> [agust@denx.de: removed gunzip_bmp() fixes as commit c01171ea did it] Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2009-07-26-423/+1085
|\ \ | |/ |/|
| * ppc4xx: Add chip_config command to AMCC Kilauea eval boardStefan Roese2009-07-24-0/+6
| | | | | | | | | | | | | | | | This patch removes the "alterpll" command and replaces it with the now ppc4xx standard "chip_config" command to configure the I2C bootstrap EEPROM. Signed-off-by: Stefan Roese <sr@denx.de>
| * ppc4xx: Fix EEPROM configuration on KilaueaStefan Roese2009-07-24-1/+2
| | | | | | | | | | | | | | | | | | | | | | Kilauea has an AT24C02 EEPROM which has an 8 byte page. Without defining CONFIG_SYS_EEPROM_PAGE_WRITE_BITS to 3 the "eeprom" command doesn't work correctly. Additionally the page write delay (CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS) is set to a more defensive value of 10ms. Signed-off-by: Stefan Roese <sr@denx.de>
| * ppc4xx: Add 405EP based PMC405DE boardMatthias Fuchs2009-07-24-0/+378
| | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * ppc4xx: Add struct for 4xx GPIO controller registersMatthias Fuchs2009-07-24-0/+24
| | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * ppc4xx: Replace 4xx lowercase SPR referencesMatthias Fuchs2009-07-24-148/+46
| | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * Add "chip_config" command for PPC4xx bootstrap configurationStefan Roese2009-07-24-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a generic command for programming I2C bootstrap eeproms on PPC4xx. An implementation for Canyonlands board is included. The command name is intentionally chosen not to be PPC4xx specific. This way other CPU's/SoC's can implement a similar command under the same name, perhaps with a different syntax. Usage on Canyonlands: => chip_config Available configurations (I2C address 0x52): 600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100 600-nand - NAND CPU: 600 PLB: 200 OPB: 100 EBC: 100 800-nor - NOR CPU: 800 PLB: 200 OPB: 100 EBC: 100 800-nand - NAND CPU: 800 PLB: 200 OPB: 100 EBC: 100 1000-nor - NOR CPU:1000 PLB: 200 OPB: 100 EBC: 100 1000-nand - NAND CPU:1000 PLB: 200 OPB: 100 EBC: 100 1066-nor - NOR CPU:1066 PLB: 266 OPB: 88 EBC: 88 *** 1066-nand - NAND CPU:1066 PLB: 266 OPB: 88 EBC: 88 => chip_config 600-nor Using configuration: 600-nor - NOR CPU: 600 PLB: 200 OPB: 100 EBC: 100 done (dump via 'i2c md 52 0.1 10') Reset the board for the changes to take effect Other 4xx boards will be migrated to use this command soon as well. Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Dirk Eibach <eibach@gdsys.de> Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
| * xpedite1k: Move to X-ES vendor directoryPeter Tyser2009-07-24-1/+1
| | | | | | | | | | | | | | | | | | | | The XPedite1000 is an X-ES product thus it can be put in board/xes along with other X-ES boards. Along with the move, the board was renamed to XPedite1000 from XPedite1K to fit X-ES's standard naming convention. Maintainership was also transfered to Peter Tyser. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * xpedite1k: Sync checkboard() with other X-ES boardsPeter Tyser2009-07-24-0/+1
| | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * xpedite1k: Sync up board config options with other X-ES boardsPeter Tyser2009-07-24-19/+19
| | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * xpedite1k: Sync organization of board config with other X-ES boardsPeter Tyser2009-07-24-74/+85
| | | | | | | | | | | | | | This change should have no functional effect Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * xpedite1k: Sync up commands and environment with other X-ES boardsPeter Tyser2009-07-24-12/+110
| | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * xpedite1k: Disable unused ethernet port 1Peter Tyser2009-07-24-3/+1
| | | | | | | | | | | | | | | | The XPedite1000 only has 2 available ethernet ports: ppc_4xx_eth2 (EMAC2) and ppc_4xx_eth3 (EMAC3) Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * xpedite1k: Store environment in flashPeter Tyser2009-07-24-4/+9
| | | | | | | | | | | | | | | | | | Previously an I2C EEPROM was used. The EEPROM had size, reliability, and access issues which are resolved by storing the environment in flash. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * xpedite1k: Add support for optional flashesPeter Tyser2009-07-24-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | The XPedite1000 can be built with 4 total flashes: - 512KB AMD socketed - 16MB Intel soldered - 2 x 32MB AMD MirrorBit flashes Add support for the optional 2 32MB CFI-compliant AMD flashes Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * xpedite1k: Cleanup coding stylePeter Tyser2009-07-24-125/+91
| | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * xpedite1k: Remove support for reading MACs from EEPROMPeter Tyser2009-07-24-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | By default, the XPedite1000 comes installed with xMon, a proprietary bootloader. xMon stores its MAC address in an onboard EEPROM. Rather than requiring a non-standard location in the EEPROM to be reserved for MAC addresses, store the MAC addresses in U-Boot's standard environment. A U-Boot application or OS application can be used to migrate xMon MAC addresses to U-Boot's environment if necessary. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * xpedite1k: Remove CONFIG_SYS_DRAM_TEST supportPeter Tyser2009-07-24-1/+0
| | | | | | | | | | | | | | POST or command line tests provide similar functionality Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * xpedite1k: Use standard CFI flash driverPeter Tyser2009-07-24-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Using the CFI flash driver will allow write access to the 16MB Intel StrataFlash present on the XPedite1000. The 512KB socketed (non CFI-compliant flash) will no longer be writable. The mapping of the 16MB Strata flash was moved to 0xff000000 and the 512KB AMD socketed flash was moved to 0xfe000000. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * ppc4xx: Add DL-Vision 405EP board supportDirk Eibach2009-07-24-0/+225
| | | | | | | | | | | | | | Board support for the Guntermann & Drunck DL-Vision. Signed-off-by: Dirk Eibach <eibach@gdsys.de> Signed-off-by: Stefan Roese <sr@denx.de>
* | Revert "zlib: updated to v.1.2.3"Wolfgang Denk2009-07-24-488/+224
|/ | | | | | | | | | | | | | | | | This reverts commit b201171f2b4d509f3ad510b214bee70ff902e3d6. The commit caused problems for example when unpacking kernel images: Uncompressing Kernel Image ... Error: inflate() returned -2 GUNZIP: uncompress, out-of-mem or overwrite error - must RESET board to recover Conflicts: include/u-boot/zlib.h lib_generic/zlib.c Signed-off-by: Wolfgang Denk <wd@denx.de>
* Coding Style cleanup; update CHANGELOG.Wolfgang Denk2009-07-23-8/+8
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* update config for mvBC-P (MPC5200)André Schwarz2009-07-23-2/+12
| | | | | | | This patch adds I2C support for mvBC-P and defines flash layout matching the shipped product. Signed-off-by: André Schwarz <andre.schwarz@matrix-vision.de>
* Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2009-07-23-30/+46
|\
| * fec_mxc: driver for FEC ethernet controller on i.MX27Ilya Yanok2009-07-22-0/+1
| | | | | | | | | | Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * Convert SMC911X Ethernet driver to CONFIG_NET_MULTI APIBen Warren2009-07-22-28/+38
| | | | | | | | | | | | | | | | | | | | | | | | All in-tree boards that use this controller have CONFIG_NET_MULTI added Also: - changed CONFIG_DRIVER_SMC911X* to CONFIG_SMC911X* - cleaned up line lengths - modified all boards that override weak function in this driver - added Signed-off-by: Ben Warren <biggerbadderben@gmail.com> Tested-by: Mike Frysinger <vapier@gentoo.org>
| * Add DNS supportRobin Getz2009-07-22-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 04 Oct 2008 Pieter posted a dns implementation for U-Boot. http://www.mail-archive.com/u-boot-users@lists.sourceforge.net/msg10216.html > > DNS can be enabled by setting CFG_CMD_DNS. After performing a query, > the serverip environment var is updated. > > Probably there are some cosmetic issues with the patch. Unfortunatly I > do not have the time to correct these. So if anybody else likes DNS > support in U-Boot and has the time, feel free to patch it in the main tree. Here it is again - slightly modified & smaller: - update to 2009-06 (Pieter's patch was for U-Boot 1.2.0) - README.dns is added - syntax is changed (now takes a third option, the env var to store the result in) - add a random port() function in net.c - sort Makefile in ./net/Makefile - dns just returns unless a env var is given - run through checkpatch, and clean up style issues - remove packet from stack - cleaned up some comments - failure returns much faster (if server responds, don't wait for timeout) - use built in functions (memcpy) rather than byte copy. Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org> Signed-off-by: Pieter Voorthuijsen <pieter.voorthuijsen@prodrive.nl> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * net: rename NetRxPkt to NetRxPacketMike Frysinger2009-07-22-2/+2
| | | | | | | | | | | | | | | | The net code is mostly consistent in using 'Packet' rather than 'Pkt', so rename the minor detractor to follow suite. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | zlib: updated to v.1.2.3Giuseppe CONDORELLI2009-07-23-227/+491
|/ | | | | | | | | | | | | | | This patch updates zlib to the latest stable version. Only relevant zlib parts were ported to u-boot tree, as was done for the previously used version of zlib (0.95). New zlib gives faster inflate performance and other improvements, see www.zlib.net Signed-off-by: Giuseppe Condorelli <giuseppe.condorelli@st.com> Reviewed-by: Angelo Castello <angelo.castello@st.com> Edited commit message Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2009-07-23-0/+648
|\
| * arm, kirkwood: added kw_gpio_set_valid() in gpio.hHeiko Schocher2009-07-23-0/+2
| | | | | | | | Signed-off-by: Heiko Schocher <hs@denx.de>
| * Kirkwood: add Marvell Kirkwood gpio driverDieter Kiermaier2009-07-23-0/+51
| | | | | | | | | | | | Signed-off-by: Dieter Kiermaier <dk-arm-linux@gmx.de> Acked-by: Prafulla Wadaskar <prafulla@marvell.com> Tested-by: Heiko Schocher <hs@denx.de>
| * arm, kirkwood: added KW_TWSI_BASE in kirkwood.hHeiko Schocher2009-07-23-0/+1
| | | | | | | | Signed-off-by: Heiko Schocher <hs@denx.de>
| * Marvell RD6281A Board supportPrafulla Wadaskar2009-07-23-0/+198
| | | | | | | | | | | | | | | | | | | | | | | | This is Marvell's 88F6281_A0 based reference design board This patch is tested for- 1. Boot from DRAM/NAND flash/NFS 2. File transfer using tftp and loadb 3. NAND flash read/write/erase Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * at91cap9adk: fix #ifdef/#endif pairingWolfgang Denk2009-07-22-1/+1
| | | | | | | | | | | | The #ifdef/#endif pairing in this file was obviously messed up. Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Add unaligned.h for armSimon Kagstrom2009-07-19-0/+18
| | | | | | | | | | | | | | | | | | This patch adds unaligned.h for ARM (needed to build with LZO compression). The file is taken from the linux kernel, but includes u-boot headers instead. Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net> Acked-by: Stefan Roese <sr@denx.de>
| * Marvell MV88F6281GTW_GE Board supportPrafulla Wadaskar2009-07-18-0/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is Marvell's 88F6281_A0 based custom board developed for wireless access point product This patch is tested for- 1. Boot from DRAM/SPI flash/NFS 2. File transfer using tftp and loadb 3. SPI flash read/write/erase 4. Booting Linux kernel and RFS from SPI flash 5. Boot from USB supported Reviewed-by: Ronen Shitrit <rshitrit@marvell.com> Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
| * Marvell Sheevaplug Board supportPrafulla Wadaskar2009-07-18-0/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: http://plugcomputer.org/ http://openplug.org/plugwiki/index.php/Das_U-boot_plug_support This patch is tested for- 1. Boot from DRAM/NAND flash 2. File transfer using tftp 3. NAND flash read/write/erase 4. Linux kernel and RFS Boot from NAND 5. Enabled USB PHY init for kernel need 6. Boot from USB supported Note: to boot Kirkwood kernel with USB support, you should add "usb start" in the boot sequence Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-i2cWolfgang Denk2009-07-23-1/+0
|\ \