summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-01-07PACK3 changesMichael Brandt
applied PACK3 changes: * cpu/arm_cortexa9/start.S: reset register changed, but U-Boot reset command still does not work. * config.mk: build address changed to 0x05FC0000 * board/st/u8500/mmc.c: MBR change: descrease 4th partition size (userfs 2) from 0x00c0'0000 to 0x00b9'a000 sectors (6,442,450,944 to 6,228,541,440 bytes). * board\st\u8500\init_mmc.c: modify bootargs to set board_id to HREF or MOP. Is is an extremly ugly solution. It modifies the bootargs env variable directly (bootargs[9] = board_id;), instead of setting a additional environment variable board_id and use it in the bootargs envvar. * board/st/u8500/mmc.c: undocumented clock changes. * board/st/u8500/mmc_utils.c: new routine to switch to 4-bit interface. The switch is done in mmc_read_file(). It would make more sense to do so in mmc_init. * board/st/u8500/u8500.c: clock changes for HSI and I2C. I2C is now clocked by SOC1 PLL and runs with 24 MHz (depends on boot ROM SOC1 initialisation)
2010-01-05clkinfo pretty print and clean-up.Michael Brandt
clean-up and clkinfo pretty print.
2010-01-04Merge branch 'boottime' into mop500Michael Brandt
Conflicts: .gitignore include/configs/u8500.h
2010-01-04Merge branch 'master' of http://git.denx.de/u-bootMichael Brandt
2010-01-03Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk
2009-12-23lib_arm/board.c: fix reference to getenv_IPaddrMichael Brandt
In commit 6ac59c5518e1d2e2ef1c4b8dee99267dfbdf9cdc The changes in net/Makefile and net/net.c cause lib_arm/board.c:360: undefined reference to `getenv_IPaddr' since net.c is now not compiled at all if CONFIG_CMD_NET is not set. Previously net.c:getenv_IPaddr() was always compiled, i.e. not embraced by ifdef CONFIG_CMD_NET. Do use getenv_IPaddr only if CONFIG_CMD_NET is set.
2009-12-22Merge branch 'master' of http://git.denx.de/u-bootMichael Brandt
Conflicts: include/usb/musb_udc.h
2009-12-22ppc4xx: alpr: Remove some not needed commands to make image fit againStefan Roese
The latest changes increased the size of the alpr image a bit more. Now it doesn't fit into the 256k reserved for it. This patch now removes the commands "ping" and "diag" which are not needed in the production systems. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Pieter Voorthuijsen <pieter.voorthuijsen@prodrive.nl>
2009-12-22i2c, ppc4xx: fix compiling KAREF and METROBOX boards.Heiko Schocher
commit eb5eb2b0f744f0cba405160c5d01335c40f09acf ppc4xx: Cleanup PPC4xx I2C infrastructure This patch cleans up the PPC4xx I2C intrastructure: - Use C struct to describe the I2C registers instead of defines - Coding style cleanup (braces, whitespace, comments, line length) - Extract common code from i2c_read() and i2c_write() - Remove unneeded IIC defines from ppc405.h & ppc440.h breaks comiling for the KAREF and METROBOX boards. This patch fixes this issue. Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
2009-12-21move prototypes for gunzip() and zunzip() to common.hWolfgang Wegner
Prototype for gunzip/zunzip was only in lib_generic/gunzip.c and thus repeated in every file using it. This patch moves the prototypes to common.h and removes all prototypes distributed anywhere else. Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
2009-12-21Merge branch 'master' of git://git.denx.de/u-boot-usbWolfgang Denk
2009-12-20usb: write command for RAW partition.Mahavir Jain
This patch implements write support to usb device with raw partition. It will be useful for filesystem write support to usb device from u-boot in future. Tested with writing kernel image to raw usb disk & booting with usb read command into ram. [Note: run usb part to get info about start sector & number of sectors on a partition for usb write operation.] Signed-off-by: Mahavir Jain <mjain@marvell.com>
2009-12-20omap3evm: musb: add USB configAjay Kumar Gupta
Added USB host and device config for host (MSC, Keyboard) and device (ACM) functionalities. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
2009-12-20OMAP3 USB Initialize twl4030 only if requiredTom Rix
OMAP3EVM uses ISP1504 phy and so twl4030 related init is not required. Submitted-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
2009-12-20OMAP3 zoom2 Use usbtty if the debug board is not connected.Tom Rix
The preferred serial output comes from the debug board. When the debug board is disconnected, fall back on using usbtty from the usb connector on the Zoom2 board. This shows up as /dev/ttyACM0 in a linux host. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
2009-12-20USBTTY make some function declarations easier to use.Tom Rix
Zoom2 needs to use these declarations and the include directory is a better place from them than in the middle of the driver directory. It did not make sense to create a new file for just a couple of lines so they were appended to the serial.h Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
2009-12-20OMAP3 beagle Add usbtty configurationTom Rix
The primary console of beagle is the serial header. A secondary console is to use the usbtty. The user can set this manually by doing setenv stdout usbtty; setenv stdin usbtty; setenv stderr usbtty saveenv usbtty will be usable by accessing the /dev/ttyACM0 on a linux host. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
2009-12-20OMAP3 zoom1 Add usbtty configurationTom Rix
The primary console of zoom1 is the serial out from the jumpers accessed by removing the back panel. A secondary console is to use the usbtty. The user can set this manually by doing setenv stdout usbtty; setenv stdin usbtty; setenv stderr usbtty saveenv usbtty will be usable by accessing the /dev/ttyACM0 on a linux host. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
2009-12-20OMAP3 Add usb device supportTom Rix
This change adds the usb device support for musb. Omap3 platform support added at the same level as davinci. The interface for usbtty to use the musb device support was added. Verified on omap3 beagle, zoom1 and zoom2. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
2009-12-20TWL4030 Add usb PHY supportTom Rix
The twl4030 provides a PHY device for connecting a link device, like musb, to physical connection. This change adds the twl4030 usb registers and functions for initializing the PHY as required by omap3. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
2009-12-20USB add macros for debugging usb device setup.Tom Rix
When developing usb device features, it is useful to print out common usb structures. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
2009-12-20USB Consolidate descriptor definitionsTom Rix
The header files usb.h and usbdescriptors.h have the same nameed structure definitions for usb_config_descriptor usb_interface_descriptor usb_endpoint_descriptor usb_device_descriptor usb_string_descriptor These are out right duplicates in usb.h usb_device_descriptor usb_string_descriptor This one has extra unused elements usb_endpoint_descriptor unsigned char bRefresh unsigned char bSynchAddress; These in usb.h have extra elements at the end of the usb 2.0 specified descriptor and are used. usb_config_descriptor usb_interface_descriptor The change is to consolidate the definition of the descriptors to usbdescriptors.h. The dublicates in usb.h are removed. The extra element structure will have their name shorted by removing the '_descriptor' suffix. So usb_config_descriptor -> usb_config usb_interface_descriptor -> usb_interface For these, the common descriptor elements are accessed now by an element 'desc'. As an example - if (iface->bInterfaceClass != USB_CLASS_HUB) + if (iface->desc.bInterfaceClass != USB_CLASS_HUB) This has been compile tested on MAKEALL arm, ppc and mips. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
2009-12-18Merge branch 'mop500'Michael Brandt
2009-12-18added clkinfo, clkmaja and build for SRAM configMichael Brandt
clkinfo command shows current PLL and clock settings. clkmaja changes certain clocks to be more U5500 (Maja) alike. With make u8500_SRAM_config a U-Boot suitable to run from SRAM can be compiled. Signed-off-by: Michael Brandt <Michael.Brandt@stericsson.com>
2009-12-17Merge branch 'next' of git://git.denx.de/u-boot-netWolfgang Denk
2009-12-17Update Makefile for tag generatingLi Yang
Get tag directories from the $(__LIB) and also generate tag for .S files. Signed-off-by: Li Yang <leoli@freescale.com>
2009-12-17drivers/bios_emulator: Fix compile error in .depend not being generatedKumar Gala
make -C drivers/bios_emulator/ make[2]: Entering directory `drivers/bios_emulator' In file included from atibios.c:49: biosemui.h:47:21: error: biosemu.h: No such file or directory ... x86emu/decode.c:40:28: error: x86emu/x86emui.h: No such file or directory ... Due to lack of proper CPPFLAGS being passed to .depend generation rule Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2009-12-15Merge branch 'next' of ../nextWolfgang Denk
2009-12-15Update CHANGELOG; prepare Prepare v2009.11Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-12-15mpc85xx, mpc86xx: Fix gd->cpu pointer after relocationPeter Tyser
The gd->cpu pointer is set to an address located in flash when the probecpu() function is called while U-Boot is executing from flash. This pointer needs to be updated to point to an address in RAM after relocation has occurred otherwise Linux may not be able to boot due to "fdt board" crashing if flash has been erased or changed. This bug was introduced in commit a0e2066f392782730f0398095e583c87812d97f2. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Reported-by: Ed Swarthout <Ed.Swarthout@freescale.com> Tested-by: Kumar Gala <galak@kernel.crashing.org> Tested on MPC8527DS. Tested by: Ed Swarthout <Ed.Swarthout@freescale.com>
2009-12-14Net: Clean up LAN91C96 SupportBen Warren
A previous Commit converted the LAN91C96 Ethernet driver to using the CONFIG_NET_MULTI API, but did not include full board support. This patch finishes the job. Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2009-12-14MVBLUE: Remove CONFIG_CMD_IRQPeter Tyser
Neither the MVBLUE nor its underlying architecture implement the do_irqinfo() function which is required when CONFIG_CMD_IRQ is defined. This change fixes the following MVBLUE compiler error: -> ./MAKEALL MVBLUE Configuring for MVBLUE board... common/libcommon.a(cmd_irq.o):(.u_boot_cmd+0x24): undefined reference to `do_irqinfo' make: *** [u-boot] Error 1 Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
2009-12-14imx27lite: Reenable MTD support on NOR flash.Detlev Zundel
The support for this was silently dropped by a configuration split during the merge of the imx27lite board support in commit 864aa034f3a0e10ce710e8bbda171df3cab59414 (cmd_mtdparts: Move to common handling of FLASH devices via MTD layer). Signed-off-by: Detlev Zundel <dzu@denx.de>
2009-12-13net: dm9000x: fix debug outputThomas Weber
commit 60f61e6d7655400bb785a2ef637581679941f6d1 breaks compile with gcc by introducing __func__ instead of constant string "func" in the macro call but missed to change the macro. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2009-12-13fec_mxc: incomplete error handlingJohn Ogness
fec_init() will only allocate fec->base_ptr if it is non-NULL. But the cleanup routine on error will free the pointer without setting it to NULL. This means that a later call to fec_init() would result in using an invalid pointer. Signed-off-by: John Ogness <john.ogness@linutronix.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2009-12-13net: e1000: Add support for the Intel 82546GB controllerReinhard Arlt
This chip is equipped for example on the esd PMC-ETH2-GB board. So let's add it to the list of supported chips to the e1000 driver. Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2009-12-13Add error codes/handling for TFTP-serverRemy Bohmer
Signed-off-by: Remy Bohmer <linux@bohmer.net> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2009-12-13LAN91C96: Enable NET_MULTI LAN driverNishanth Menon
This modification is NOT tested on any of the platforms modified as I dont have them. please help by testing+building+fixing Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2009-12-13TI OMAP3: SDP3430 FIX NET_MULTI WarningNishanth Menon
Enable the NET MULTI option and remove build warning Tested: SDP3430 Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2009-12-13NET: LAN91C96 CONFIG_NET_MULTIifyNishanth Menon
Make the lan91c96 driver capable of CONFIG_NET_MULTI to be clean for the new arch, add a a lil detect function Most of the formatting change was done to keep checkpatch silent, but a few functions and #if 0ed code which does not make sense for NET_MULTI have been removed Now, use the lan91c96_initialize() function to init the driver Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2009-12-13net: pull CONFIG checks out of source and into makefileMike Frysinger
Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2009-12-11nand: Fix access to last block in NAND devicesStefan Roese
Currently, the last block of NAND devices can't be accessed. This patch fixes this issue by correcting the boundary checking (off-by-one error). Signed-off-by: Stefan Roese <sr@denx.de> Cc: Scott Wood <scottwood@freescale.com> Cc: Wolfgang Denk <wd@denx.de>
2009-12-09mpc83xx: boot time regression, move LCRR setup back to cpu_init_fPeter Korsgaard
Commit c7190f02 (retain POR values of non-configured ACR, SPCR, SCCR, and LCRR bitfields) moved the LCRR assignment to after relocation to RAM because of the potential problem with changing the local bus clock while executing from flash. This change unfortunately adversely affects the boot time, as running all code up to cpu_init_r can cause significant slowdown. E.G. on a 8347 board a bootup time increase of ~600ms has been observed: 0.020 CPU: e300c1, MPC8347_PBGA_EA, Rev: 3.0 at 400 MHz, CSB: 266.667 MHz 0.168 RS: 232 0.172 I2C: ready 0.176 DRAM: 64 MB 1.236 FLASH: 32 MB Versus: 0.016 CPU: e300c1, MPC8347_PBGA_EA, Rev: 3.0 at 400 MHz, CSB: 266.667 MHz 0.092 RS: 232 0.092 I2C: ready 0.096 DRAM: 64 MB 0.644 FLASH: 32 MB So far no boards have needed the late LCRR setup, so simply revert it for now - If it is needed at a later time, those boards can either do their own final LCRR setup in board code (E.G. in board_early_init_r), or we can introduce a CONFIG_SYS_LCRR_LATE config option to only do the setup in cpu_init_r. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2009-12-08common: delete CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOULHeiko Schocher
There is more and more usage of printing 64bit values, so enable this feature generally, and delete the CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL defines. Signed-off-by: Heiko Schocher <hs@denx.de>
2009-12-085xxx, fdt: move fdt_fixup_memory() to cpu.c fileHeiko Schocher
u-boot updates, before starting Linux, the memory node in the DTS. As this is a "standard" feature, move this functionality to the cpu.c file for mpc5xxx and mpc512x processors. Signed-off-by: Heiko Schocher <hs@denx.de>
2009-12-08Merge branch 'master' of http://git.denx.de/u-bootMichael Brandt
2009-12-08microblaze: Correct ffs regression for MicroblazeMichal Simek
We are using generic implementation of ffs. This should be part of Simon's commit 0413cfecea350000eab5e591a0965c3e3ee0ff00 Here is warning message which this patch removes. In file included from /tmp/u-boot-microblaze/include/common.h:38, from cmd_mtdparts.c:87: /tmp/u-boot-microblaze/include/linux/bitops.h:123:1: warning: "ffs" redefined In file included from /tmp/u-boot-microblaze/include/linux/bitops.h:110, from /tmp/u-boot-microblaze/include/common.h:38, from cmd_mtdparts.c:87: /tmp/u-boot-microblaze/include/asm/bitops.h:269:1: warning: this is the location of the previous definition Signed-off-by: Michal Simek <monstr@monstr.eu>
2009-12-08microblaze: Stop stack clobbering in microblaze-generic.Graeme Smecher
A typo caused the stack and malloc regions to overlap, which prevented mem_malloc_init() from returning. This commit makes the memory layout match the example described in include/configs/microblaze-generic.h Signed-off-by: Graeme Smecher <graeme.smecher@mail.mcgill.ca> Signed-off-by: Michal Simek <monstr@monstr.eu>
2009-12-07Merge branch 'master' of ../work into nextWolfgang Denk
2009-12-07Update CHANGELOG, prepare -rc2Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>