summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-07-13-618/+1474
|\
| * Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2009-07-13-618/+1474
| |\
| | * versatile: update config and merge to cfi flash driverJean-Christophe PLAGNIOL-VILLARD2009-07-12-530/+51
| | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Peter Pearse <peter.pearse@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com>
| | * versatile: specify the board type on the promptJean-Christophe PLAGNIOL-VILLARD2009-07-12-2/+10
| | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Peter Pearse <peter.pearse@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com>
| | * at91: Introduction of at91sam9g10 SOC.Sedji Gaouaou2009-07-12-7/+67
| | | | | | | | | | | | | | | | | | | | | AT91sam9g10 is an ARM 926ej-s SOC. It is an evolution of the at91sam9261 with a faster clock speed: 266/133MHz. Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
| | * at91: Introduction of at91sam9g45 SOC.Sedji Gaouaou2009-07-12-22/+1221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AT91sam9g45 series is an ARM 926ej-s SOC family clocked at 400/133MHz. It embeds USB high speed host and device, LCD, DDR2 RAM, and a full set of peripherals. The first board that embeds at91sam9g45 chip is the AT91SAM9G45-EKES. On the board you can find 2 USART, USB high speed, a 480*272 LG lcd, ethernet, gpio/joystick/buttons. Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
| | * pxa: fix CKEN_B register bitsDaniel Mack2009-07-12-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | The current defition for CKEN_B register bits is nonsense. Adding 32 to the shifted value is equal to '| (1 << 5)', and this bit is marked 'reserved' in the PXA docs. Signed-off-by: Daniel Mack <daniel@caiaq.de>
| | * pxa: add clock for system bus 2 arbiterDaniel Mack2009-07-12-0/+1
| | | | | | | | | | | | | | | | | | | | | This clock is needed for systems using the USB2 device unit or the 2d graphics accelerator. Signed-off-by: Daniel Mack <daniel@caiaq.de>
| | * OMAP3 pandora: Fix CKE1 MUX setting to allow self-refreshGrazvydas Ignotas2009-07-12-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Pandora is using both SDRC CSes. The MUX setting is needed for the second CS clock signal to allow the 2 RAM parts to be put in self-refresh correctly. Based on similar patch for beagle and overo by Jean Pihet and Steve Sakoman.
| | * OMAP3 pandora: setup pulls for various GPIOsGrazvydas Ignotas2009-07-12-25/+25
| | | | | | | | | | | | | | | | | | | | | Set pullups or pulldowns for GPIOs which need them. Disable them for others, which have external pulls. Also make disabled pull setting consistent (some pins had type set to "up" even if pull type selection was disabled).
| | * OMAP3 pandora: setup pin mux for pins used on rev3 boardsGrazvydas Ignotas2009-07-12-1/+10
| | | | | | | | | | | | | | | | | | | | | Setup pin mux for GPIO pins connected on rev3 or later boards. Also change NUB2 IRQ pin. This should not affect older boards because they don't have any nubs (analog controllers) attached to them.
| | * OMAP3 pandora: pin mux cleanupGrazvydas Ignotas2009-07-12-25/+0
| | | | | | | | | | | | | | | Remove configuration of not unused pins, effectively leaving them in safe mode.
| | * arm: Kirkwood: bugfix: UART1 bar correctionPrafulla Wadaskar2009-07-12-1/+1
| | | | | | | | | | | | Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
| | * nand: Add Marvell Kirkwood NAND driverPrafulla Wadaskar2009-07-08-0/+83
| | | | | | | | | | | | | | | | | | | | | This patch adds a NAND driver for the Marvell Kirkwood SoC's Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Acked-by: Scott Wood <scottwood@freescale.com>
* | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-07-13-3/+8
|\ \ \ | |/ /
| * | Merge branch 'master' of git://git.denx.de/u-boot-cfi-flashWolfgang Denk2009-07-13-3/+8
| |\ \
| | * | issue write command to base for JEDEC flashPo-Yu Chuang2009-07-13-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For JEDEC flash, we should issue word programming command relative to base address rather than sector base address. Original source makes SST Flash fails to program sectors which are not on the 0x10000 boundaries. e.g. SST39LF040 uses addr1=0x5555 and addr2=0x2AAA, however, each sector is 0x1000 bytes. Thus, if we issue command to "sector base (0x41000) + offset(0x5555)", it sends to 0x46555 and the chip fails to recognize that address. This patch is tested with SST39LF040. Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com> Signed-off-by: Stefan Roese <sr@denx.de>
* | | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-07-13-1136/+720
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of git://git.denx.de/u-boot-shWolfgang Denk2009-07-13-1136/+720
| |\ \ \
| | * | | sh: Update pci config for Renesas r7780mp boardNobuhiro Iwamatsu2009-07-11-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | | sh: Add support ESPT-GIGA boradNobuhiro Iwamatsu2009-07-11-0/+575
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ESPT-Giga is SH7763-based reference board. Board support is relatively sparse, presently supporting serial, gigabit ethernet, USB host, and MTD. More information (in Japanese) available at: http://www.cente.jp/product/cente_hard/ESPT-Giga.html Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | | sh: Revised the build with newest compilerNobuhiro Iwamatsu2009-07-08-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check of data became severe from newest gcc. This patch checked in gcc-4.2 and 4.3 . Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | | sh3/sh4: rename config option TMU_CLK_DIVIDER to CONFIG_SYS_TMU_CLK_DIVJean-Christophe PLAGNIOL-VILLARD2009-07-08-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | | sh3/sh4: fix CONFIG_SYS_HZ to 1000Jean-Christophe PLAGNIOL-VILLARD2009-07-08-27/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | | sh: introduce clock frameworkJean-Christophe PLAGNIOL-VILLARD2009-07-08-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | | sh: unify linker scriptJean-Christophe PLAGNIOL-VILLARD2009-07-08-775/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all sh boards use the same cpu linker script so move it to cpu/$(CPU) that could be overwrite in following order SOC BOARD via the corresponding config.mk tested on r2dplus Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | | sh: make the linker scripts more genericJean-Christophe PLAGNIOL-VILLARD2009-07-08-314/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currently we need to sync the linker script enty and TEXT_BASE manualy and the reloc_dst is based on it instead provide it now from the ldflags tested on r2dplus Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | | sh7785lcr: fix out of tree buildJean-Christophe PLAGNIOL-VILLARD2009-07-08-3/+4
| | | |/ | | |/| | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-07-13-9/+25
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2009-07-13-9/+25
| |\ \ \
| | * | | ppc4xx: Set default PCI device ID for 405EP boardsMatthias Fuchs2009-07-10-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current code only sets the PCI vendor id to 0x1014 and leaved device id to 0x0000. Ths patch .... a) uses the correct PCI_VENDOR_ID_IBM macro for this b) sets the default device ID as stated in the UM to 0x0156 by using PCI_DEVICE_ID_IBM_405GP for this. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | | ppc4xx: Move 405EP pci code from cpu_init_f() to __pci_pre_init()Matthias Fuchs2009-07-10-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves some basic PCI initialisation from the 4xx cpu_init_f() to cpu/ppc4xx/4xx_pci.c. The original cpu_init_f() function enabled the 405EP's internal arbiter in all situations. Also the HCE bit in cpc0_pci is always set. The first is not really wanted for PCI adapter designs and the latter is a general bug for PCI adapter U-Boots. Because it enables PCI configuration by the system CPU even when the PCI configuration has not been setup by the 405EP. The one and only correct place is in pci_405gp_init() (see "Set HCE bit" comment). So for compatibility reasons the arbiter is still enabled in any case, but from weak pci_pre_init() so that it can be replaced by board specific code. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | | ppc4xx: Make is_pci_host() available for all 440 and 405 CPUsMatthias Fuchs2009-07-10-2/+2
| | | |/ | | |/| | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
* | | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-07-13-5/+155
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2009-07-13-5/+155
| |\ \ \
| | * | | Blackfin: cm-bf561: add example settings for EXT-BF5xx-USB-ETH2 add-onHarald Krapfenbauer2009-07-10-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cm-bf561 module can easily hook up to the EXT-BF5xx-USB-ETH2 extender board, so add a simple example of how to do that in the board config. Signed-off-by: Harald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| | * | | Blackfin: blackstamp: update spi flash settingsMike Frysinger2009-07-10-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest blackstamp boards can only run the SPI flash at 15MHz before they start to crap out, so lower the max speeds accordingly. The new SPI flash also has different sector requirements, so update the environment sizes as well. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| | * | | Blackfin: add cache_dump commandsMike Frysinger2009-07-10-0/+146
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | A few debug-type commands used to dump the raw icache/dcache data. Useful when trying to track down cache-related bugs. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-07-13-20/+158
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of git://git.denx.de/u-boot-usbWolfgang Denk2009-07-13-20/+158
| |\ \ \
| | * | | usb: Fix compiler warning with gcc4.4Kumar Gala2009-07-11-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ehci-hcd.c: In function 'ehci_submit_root': ehci-hcd.c:719: warning: value computed is not used ehci-hcd.c:748: warning: value computed is not used Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Remy Bohmer <linux@bohmer.net>
| | * | | usb: add Marvell Kirkwood ehci host controller driverPrafulla Wadaskar2009-07-09-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver is tested on Sheevaplug platform Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Remy Bohmer <linux@bohmer.net>
| | * | | mpc83xx: USB: fix: access of ehci struct elementsVivek Mahajan2009-07-09-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fixes the access to the 'ehci' struct elements for mpc83xx which should have been taken care of in 4ef01010aa4799c759d75e67007fdd3a38c88c8a Sorry about that. Signed-off-by: Vivek Mahajan <vivek.mahajan@freescale.com> Signed-off-by: Remy Bohmer <linux@bohmer.net>
| | * | | mpc8xxx: USB: fix: access of ehci struct elementsVivek Mahajan2009-07-09-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the access to the 'ehci' struct elements which should have been taken care off in 4ef01010aa4799c759d75e67007fdd3a38c88c8a Sorry about that. Signed-off-by: Vivek Mahajan <vivek.mahajan@freescale.com> Signed-off-by: Remy Bohmer <linux@bohmer.net>
| | * | | usb: musb: add timeout via CONFIG_MUSB_TIMEOUTBryan Wu2009-07-09-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bryan Wu <bryan.wu@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Remy Bohmer <linux@bohmer.net>
| | * | | usb: musb: drop old musb read/write prototypesMike Frysinger2009-07-09-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions are no longer defined, so remove their prototypes. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Remy Bohmer <linux@bohmer.net>
| | * | | usb: fix CONFIG_SYS_MPC83xx_USB_ADDR not defined errorKim Phillips2009-07-09-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix a stray CONFIG_MPC83XX that escaped commit 0f898604945af4543c1525fc33b6bae621a3b805. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Remy Bohmer <linux@bohmer.net>
* | | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-07-13-10/+37
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of git://git.denx.de/u-boot-ubiWolfgang Denk2009-07-13-10/+37
| |\ \ \ | | |/ / | |/| |
| | * | Command improvements for ubifsSimon Kagstrom2009-07-09-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that an argument is passed to ubifsmount and that addresses and sizes are actually numbers for ubifsload. Also improve the instructions a bit. Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net> Signed-off-by: Stefan Roese <sr@denx.de>