summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-cfi-flashWolfgang Denk2010-03-04-1/+2
|\
| * ] fix monitor protection for CONFIG_MONITOR_IS_IN_RAMWolfgang Wegner2010-03-04-1/+2
| | | | | | | | | | | | | | | | | | | | For platforms with flash below ram addresses, the current check to activate monitor protection is wrong/insufficient. This patch fixes CONFIG_MONITOR_IS_IN_RAM for these systems by adding a check for this configuration. Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de> Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2010-03-04-6/+18
|\ \
| * | ppc4xx: Corrected EBC register bit definitionsEugene O'Brien2010-03-02-6/+18
| |/ | | | | | | | | | | | | | | | | | | Corrected the bit field positions of the external master priority low and the external master priority high values in the EBC configuration register. These bit field positions differ between PPC405 and PPC440 processors Signed-off-by: Eugene O'Brien <eugene.obrien@advantechamt.com> Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'next' of git://git.denx.de/u-boot-coldfireWolfgang Denk2010-03-04-1/+62
|\ \
| * | allow MCF532x to use CONFIG_MONITOR_IS_IN_RAMWolfgang Wegner2010-03-04-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_MONITOR_IS_IN_RAM is broken for MCF532x. This patch fixes this by conditionally - removing the vector table at the beginning of code - not overwriting the vector base register - removing the code to re-set the PLL, which effectively disables SDRAM access Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
| * | MCF5271-only: Added a weak board_reset function to allow custom resetRichard Retanubun2010-03-04-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a board_reset function to allow boards to specify their own custom reset sequence (e.g. resetting by timing out watchdog). Tested only on MCF5271, can be expanded if needed. Based on Mike Frysinger's suggestion on: http://article.gmane.org/gmane.comp.boot-loaders.u-boot/70304 Signed-off-by: Richard Retanubun <RichardRetanubun at RuggedCom.com>
| * | MCF532x: make icache_enable use CONFIG_SYS_SDRAM_SIZEWolfgang Wegner2010-03-04-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | in cpu/mcf532x/start.S, the function icache_enable enables the cache for a fixed 32MB region starting at the SDRAM start address; this patch changes the function to cover the region defined by CONFIG_SYS_SDRAM_SIZE Signed-off-by: Wolfgang Wegner <w.wegner at astro-kom.de>
| * | add include/asm-m68k/unaligned.hWolfgang Wegner2010-03-04-0/+15
| |/ | | | | | | | | | | | | | | | | lib_generic/zlib.c needs include/asm/unaligned.h since commit cd514aeb996e2f7aefbe1f78481965d9d074aed4, which broke compilation for Coldfire/M68K. This patch adds the missing header for these architectures. Signed-off-by: Wolfgang Wegner <w.wegner at astro-kom.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-shWolfgang Denk2010-03-04-0/+283
|\ \
| * | sh: Add asm/unaligned.h and asm/unaligned-sh4a.h from Linux kernelNobuhiro Iwamatsu2010-03-03-0/+283
| |/ | | | | | | | | | | | | | | zlib.c demands asm/unaligned.h. But, SH does not have these. This commit add asm/unaligned.h and asm/unaligned-sh4a.h from Linux kernel and modifyf for u-boot. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-mpc83xxWolfgang Denk2010-03-04-79/+165
|\ \ | |/ |/|
| * mpc83xx: fix out-of-tree mpc8315 nand buildKim Phillips2010-03-02-3/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 2e95004deb6e33e33bf1b8a92a38cd2115bac4c2 "mpc83xx: Add NAND boot support for MPC8315E-RDB boards" symlinked nand_spl/board/freescale/mpc8315erdb to mpc8313erdb in order to not duplicate code. Since the main makefile builds nand_spl/board/$(BOARDDIR) (which makes sense), and the board Makefile and linker script are the only two necessary files to enable out-of-tree building, and other boards have duplicated nand makefiles (e.g. 8536ds & 8569mds), it only seems prudent to copy these two files in the name of the 8315 too. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Cc: Anton Vorontsov <avorontsov@ru.mvista.com> Cc: Wolfgang Denk <wd@denx.de>
| * mpc83xx: vme8349: fix incorrect BR0_PRELIM port size commentKim Phillips2010-03-02-2/+2
| | | | | | | | | | | | | | commit 98d92d8c9f4021629a45261ad5ec3f3595f3a27a "sbc8349: fix incorrect comment" missed this one. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * mpc83xx: remove hardcoded network addresses from config filesKim Phillips2010-02-22-69/+0
| | | | | | | | | | | | | | and avoid e.g., two identical boards from causing random networking conflicts when hooked up to the same network. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * Bug: do_reset issued via netconsole does not reset mpc83xx cpu.Michael Zaidman2010-02-18-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | The do_reset routine in the cpu/mpc83xx/cpu.c file does not reset the mpc83xx cpu when issued via netconsole. Moving the console output "resetting the board." to the beginning of the routine before disabling interrupts solved the problem. Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com> Acked-by: Detlev Zundel <dzu@denx.de> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | cmd_itest.c: fix pointer dereferencingFrans Meulenbroeks2010-02-24-2/+7
| | | | | | | | | | | | | | | | fix pointer dereferencing if the size is .b and .w an 8 or 16 bit access is done. Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> Acked-by: Detlev Zundel <dzu@denx.de>
* | tools: fix imximage warningKim Phillips2010-02-24-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fix build warning: Configuring for MPC837XEMDS board... imximage.c: In function `imximage_parse_cfg_file': imximage.c:146: warning: passing argument 2 of `getline' from incompatible pointer type /usr/include/bits/stdio.h:116: note: expected `size_t *' but argument is of type `uint32_t *' Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | mkimage: SEGFAULT with imximage on 64 bit systemsStefano Babic2010-02-24-17/+15
|/ | | | | | | | Running mkimage to generate an imximage produces a SEGFAULT on 64 bit machines due to pointer arithmetic limited to 32 bit. Signed-off-by: Stefano Babic <sbabic@denx.de> Acked-by: Kim Phillips <kim.phillips@freescale.com>
* new board (eb_cpux9k2)Jens Scharsig2010-02-12-0/+861
| | | | | | | | | | * new board (eb_cpux9k2) * support for EB+CPUx9K2 board by BuS Elektronik GmbH & Co. KG * select via make eb_cpux9k2_config * this also demonstrates, how to use boards with AT91RM9200 cpu in at91 arch tree Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
* new at91_emac network driver (NET_MULTI api)Jens Scharsig2010-02-12-3/+1
| | | | | | | | | | | * add's at91_emac (AT91RM9200) network driver (NET_MULTI api) * enable driver with CONFIG_DRIVER_AT91EMAC * generic PHY initialization * modify AT91RM9200 boards to use NET_MULTI driver * the drivers has been tested with LXT971 Phy and DM9161 Phy at MII and RMII interface Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
* prepare joining at91rm9200 into at91Jens Scharsig2010-02-12-6/+825
| | | | | | | | | | | | * prepare joining at91 and at91rm9200 * add modified copy of soc files to cpu/arm920t/at91 to make possible to compile at91rm9200 boards in at91 tree instead of at91rm9200 * add header files with c structure defs for AT91 MC, ST and TC * the new cpu files are using at91 c structure soc access * please read README.soc-at91 for details Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
* update at91sam9263ek board to new SoC accessJens Scharsig2010-02-12-128/+132
| | | | | | | * convert at91sam9263ek board to use c stucture SoC access * change gpio access to at91_gpio syntax Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
* convert common files to new SoC accessJens Scharsig2010-02-12-127/+261
| | | | | | | | * add's a warning to all files, which need update to new SoC access * convert common files in cpu/../at91 and a lot of drivers to use c stucture SoC access Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
* convert all at91 files to use at91_gpio driver syntaxJens Scharsig2010-02-12-249/+249
| | | | | | | | | * convert all files cpu/../at91 to use at91_gpio driver syntax * change AT91_PINP([A-F])(\d+) to AT91_PIO_PORT\1, \2 this makes all 160 AT91_PINPxxx defines obsolete * AT91_PINPxxx defines and gpio.h can be remove, if all boards converted to new SoC access Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
* add a new AT91 GPIO driverJens Scharsig2010-02-12-152/+258
| | | | | | | | | * add a real AT91 GPIO driver instead of header inline code * resolve the mixing of port and pins * change board config files to use new driver * add macros to gpio to realize backward compatibility Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
* add c structures for SoC accessJens Scharsig2010-02-12-3/+596
| | | | | | * add's c structures for SoC access to pheriperials head files Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
* add new CONFIG_AT91_LEGACYJens Scharsig2010-02-12-0/+83
| | | | | | | | | * add's the new temporary CONFIG_AT91_LEGACY to all board configs This will need for backward compatiblity, while change the SoC access to c structures. If CONFIG_AT91_LEGACY is defined, the deprecated SoC is used. Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
* DA830 EVM: Enable NAND support on Spectrum Digital EVMNick Thompson2010-02-12-5/+53
| | | | | | | | | | | | The EVM UI extender card has a NAND device. This change will enable saveenv to work with NAND and Linux to be booted using: mtdparts default nboot kernel bootm Signed-off-by: Nick Thompson <nick.thompson@ge.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* Davinci: Add EMIF-A macros for setting chip select parametersNick Thompson2010-02-12-1/+17
| | | | | | | The patch adds EMIF-A macros for setting chip select parameters Signed-off-by: Nick Thompson <nick.thompson@ge.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* OMAP3: Avoid re-write to PRM_CLKSRC_CTRLSanjeev Premi2010-02-12-4/+16
| | | | | | | | | | | | | | | | | | | In function get_osc_clk_speed(), do not change/ update the divider for SYS_CLK as it can has cascading effect on the other derived clocks. Sudden change in divider value can lead to inconsistent behavior in the system - often leading to crashes. The problem was found when working with OMAP3EVM using DM3730 processor card. The patch has been tested with OMAP3530 on OMAP3EVM as well Signed-off-by: Sanjeev Premi <premi@ti.com> Signed-off-by: Hiremath Vaibhav <hvaibhav@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* SPI: Fix 32 bit transfers in mxc_spi.cMagnus Lilja2010-02-12-0/+9
| | | | | | | | | | | | | | Commit f9b6a1575d9f1ca192e4cb60e547aa66f08baa3f, "i.MX31: fix SPI driver for shorter than 32 bit" broke 32 bit transfers. This patch makes single 32 bit transfer work again. Transfer lengths that are known not to work will abort and print an error message. Tested on i.MX31 Litekit and i.MX31 PDK using 32 bit transfers to the MC13783/ATLAS chip (using the 'date' command). Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
* edb93xx: enable the uart in devicecfg registerAlessandro Rubini2010-02-12-0/+6
| | | | | | | printf goes to uart1, but it will block forever waiting for busy to go off unless the uart is enabled first. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
* edb93xx: change calculation un early_udelay.hAlessandro Rubini2010-02-12-1/+1
| | | | | | | | | | | | Previous code compiled with gcc-4.2.2 makes a call to __aeabi_uidiv to divide by 20. As a side effect it was not inline any more, and so sdram_cfg used the stack as well, but this is early code that has no stack yet. The patch explicitly removes the division, so no stack is used. The calculation of the counter calls a division by 20 Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
* EP93xx: fix syscon_regs definitionAlessandro Rubini2010-02-12-1/+2
| | | | | | | | The structure was missing a reserved entry (not listed in the manual, actually), so the last registers had a wrong offset. This prevented all swlocked registers to be modified as swlock is last in the structure. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
* ARM: Add support for EP93xx SoCsMatthias Kaehlcke2010-02-12-1/+1207
| | | | | | | Add support for the Cirrus EP93xx platform Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net> Acked-by: Tom <Tom.Rix@windriver.com>
* Add support for EDB93xx boardsMatthias Kaehlcke2010-02-12-0/+954
| | | | | | | | | | | | | | | Added support for the following EDB93xx boards: EDB9301 EDB9302 EDB9302A EDB9307 EDB9307A EDB93012 EDB9315 EDB9315A Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
* NetStar: Remove debug junk leaked into eeprom utilityLadislav Michl2010-02-12-172/+2
| | | | | | | This patch removes debug junk leaked into eeprom utility. Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* NetStar: make crcit utility more readableLadislav Michl2010-02-12-4/+5
| | | | | | | This patch makes the crcit utility more readable Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* NetStar: Disable CONFIG_CMD_JFFS2Ladislav Michl2010-02-12-3/+0
| | | | | | | This patch removes "CONFIG_CMD_JFFS" from the board config Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* OMAP3 Move declaration of gpmc_cfg.Tom Rix2010-02-12-8/+4
| | | | | | | | | Every omap3 board config file declared the global variable gpmc_cfg. This changes moves the declaration to a better location in the arch dependent header file cpu.h. Signed-off-by: Tom Rix <Tom.Rix@windriver.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* Overo GPMC registersScott Ellis2010-02-12-7/+16
| | | | | | | | | Use appropriate GPMC timings for the LAN9221 controller on the Gumstix Overo expansion boards not the values in arch-omap3/mem.h which are for a different ethernet controller. Signed-off-by: Scott Ellis <scott@jumpnowtek.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* da830evm: Use table driven pin mux configurationNick Thompson2010-02-12-18/+17
| | | | | | | | Tidyup the pin muxer configuration using the Davinci table driven pinmux configuration function and data tables. Signed-off-by: Nick Thompson <nick.thompson@ge.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* TI DaVinci: Driver for the davinci SPI controllerSekhar Nori2010-02-12-0/+325
| | | | | | | | | This adds a driver for the SPI controller found on davinci based SoCs from Texas Instruments. Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* at91: Add esd gmbh OTC570 board supportDaniel Gorsulowski2010-02-12-0/+712
| | | | | | | This patch adds support for esd gmbh OTC570 board. The OTC570 is based on an Atmel AT91SAM9263 SoC. Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
* Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2010-02-08-53/+45
|\
| * net: Use 0.5 sec timeout in miiphy_reset() instead of counting loopStefan Roese2010-02-06-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a problem I've notived on a buggy PPC4xx system. This system has problems with the PHY MDIO communication and seemed to be stuck/crashed in miiphy_reset(). But degugging revealed, that the CPU didn't crash, but "only" hung in this counting loop for about 2 minutes. This patch now uses a real timeout of 0.5 seconds (as mentioned in the comment in miiphy_reset). Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * fec_mxc: add support for MX51 processorStefano Babic2010-02-06-41/+32
| | | | | | | | | | | | | | | | The patch add support for the Freescale mx51 processor to the FEC ethernet driver. Signed-off-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * NET: kirkwood-egiga smi access fixSiddarth Gore2010-02-06-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Although the datasheet mentions seperate smi registers for each port, using Port 1 smi register to access ethernet phys does not work. Hence only Port 0 smi register should be used to access all devices connected to the smi bus. This behavior is consistant with the mv643xx driver in the linux kernel. Signed-off-by: Siddarth Gore <gores@marvell.com> Acked-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | kgdb: cpu/mpc* cpu/74xx: include kgdb.h when neededMike Frysinger2010-02-08-0/+10
|/ | | | | | | | Commit cbb0cab1d929839d broke some platforms which used kgdb code but didn't actually include kgdb.h. So include kgdb.h in all the relevant traps code. Signed-off-by: Mike Frysinger <vapier@gentoo.org>