]> git.ipfire.org Git - thirdparty/u-boot.git/log
thirdparty/u-boot.git
14 years agoXilinx: U-boot: Added support for On-Die ECC
Naveen Mamindlapalli [Wed, 11 May 2011 15:07:53 +0000 (20:37 +0530)] 
Xilinx: U-boot: Added support for On-Die ECC

Added support for On-Die ECC supported by Micron flash.

Signed-off-by: Naveen Mamindlapalli<naveenm@xilinx.com>
14 years agoXilinx: ARM: Modify serial driver so that putc(\n) will actually output \r\n
Brian Hill [Tue, 10 May 2011 20:50:08 +0000 (14:50 -0600)] 
Xilinx: ARM: Modify serial driver so that putc(\n) will actually output \r\n

14 years agoXilinx: ARM: Update DDR initialization to PEEP11.
Brian Hill [Tue, 10 May 2011 18:52:44 +0000 (12:52 -0600)] 
Xilinx: ARM: Update DDR initialization to PEEP11.

14 years agoXilinx: ARM: Include EXT2 support in Pele build.
Brian Hill [Thu, 28 Apr 2011 21:37:42 +0000 (15:37 -0600)] 
Xilinx: ARM: Include EXT2 support in Pele build.

14 years agoXilinx: ARM: Make use of boot mode register possible with u-boot
Brian Hill [Tue, 26 Apr 2011 14:54:27 +0000 (08:54 -0600)] 
Xilinx: ARM: Make use of boot mode register possible with u-boot

The environment variable modeboot is set to something appropriate
based on the contents of the boot mode register.
EXAMPLE:
For bootmode 2, modeboot will be set to "run norboot".
This method of booting can be utilized via bootcmd = "run modeboot"
or not, if the user prefers that u-boot and the kernel come from
separate storage devices.

14 years agoXilinx: ARM: Update SD driver to handle MMC_RSP_R2 properly.
Brian Hill [Thu, 21 Apr 2011 15:34:46 +0000 (09:34 -0600)] 
Xilinx: ARM: Update SD driver to handle MMC_RSP_R2 properly.

 Update SD driver to handle MMC_RSP_R2 properly. 136 bit response was
 not being copied properly.  This prevented some SD cards from being
 detected correctly.

14 years agoXilinx: ARM: Update DDR initialization for peep10
Brian Hill [Tue, 5 Apr 2011 14:38:26 +0000 (08:38 -0600)] 
Xilinx: ARM: Update DDR initialization for peep10

14 years agoXilinx: ARM: Update to support PEEP 9 NOR flash changes.
Brian Hill [Thu, 31 Mar 2011 21:34:48 +0000 (15:34 -0600)] 
Xilinx: ARM: Update to support PEEP 9 NOR flash changes.

 NOR flash is now at 0xE2000000, not 0xE4000000.

14 years agoMerge /home/bhill/work/u-boot/u-boot-xarm
GIT Repo [Mon, 21 Mar 2011 22:15:20 +0000 (16:15 -0600)] 
Merge /home/bhill/work/u-boot/u-boot-xarm

14 years agoXilinx: ARM: Add QSPIx2 support
Brian Hill [Mon, 21 Mar 2011 15:04:55 +0000 (09:04 -0600)] 
Xilinx: ARM: Add QSPIx2 support

 Add QSPIx2 support.
 Note that update Boot ROM requred to boot from images programmed in this
 manner.

 (common) flash driver modifed to lie about total number of sectors, and
 to use 4 byte addressing for memories > 16MB.

14 years agoXilinx: ARM: Introduce Device Tree support.
Brian Hill [Thu, 10 Mar 2011 19:39:06 +0000 (12:39 -0700)] 
Xilinx: ARM: Introduce Device Tree support.

Add support for fdt and bootm commands.
Use of bootm requires a proper uImage, which may be built by:
mkimage -A arm -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n 'Linux' -d arch/arm/boot/Image uImage

EXAMPLE USAGE:

tftp 0x1000000 linux-2.6-xarm/arch/arm/boot/uImage
tftp 0x900000 arm-support/ramdisks/ramdisk8M-amp.image.gz
tftp 0x2000000 xilinx.dtb

fdt addr 0x2000000
fdt print

setenv bootargs console=ttyDF0,9600 root=/dev/ram rw initrd=0x900000,8M earlyprintk debug
fdt chosen

fdt list /chosen

bootm 0x1000000 - 0x2000000

The uImage CRC is verified, and it is copied to the load location.  The device
tree location is set in r2 for the kernel.

14 years agoXilinx: ARM: Add initial SecureDigital support.
Brian Hill [Thu, 9 Dec 2010 16:29:25 +0000 (09:29 -0700)] 
Xilinx: ARM: Add initial SecureDigital support.

Usage:
pele-boot> mmc rescan 0
pele-boot> fatls mmc 0
  3025088   vmlinux.bin
  1048576   ramdisk1m.image
  3145728   ramdisk3m.image
  7340032   ramdisk7m.test.image

4 file(s), 0 dir(s)

pele-boot> fatload mmc 0 0x8000 vmlinux.bin
pele-boot> fatload mmc 0 0x800000 ramdisk3m.image
pele-boot> go 0x8000

14 years agoMerge /home/linnj/u-boot/u-boot-xarm
GIT Repo [Mon, 31 Jan 2011 21:47:40 +0000 (14:47 -0700)] 
Merge /home/linnj/u-boot/u-boot-xarm

14 years agoXilinx: ARM: fixed resets on AXI fabric ports
John Linn [Mon, 31 Jan 2011 21:18:39 +0000 (14:18 -0700)] 
Xilinx: ARM: fixed resets on AXI fabric ports

All the resets were not being cleared such that AXI DMA was not
working under Linux. The boot rom clears them all also.

14 years agoXilinx: ARM: Initial QSPI support
Brian Hill [Fri, 28 Jan 2011 20:40:04 +0000 (13:40 -0700)] 
Xilinx: ARM: Initial QSPI support

Initial support of QSPI.  Driver ported directly from Linux - primary
operational change is the use of polling rather than interrupts.

Commands:
sf probe 0 0 0

sf erase <offset> <length>
Where <length> must exactly fall on a sector boundary (N25Q128 = 1k)

sf write <mem addr> <flash offset> <len>
sf read <mem addr> <flash offset> <len>

Common file
drivers/mtd/spi/stmicro.c
modified to recognized N25Q128 device.

Example session:
sf probe 0 0 0
sf erase 0x100000 0x140000
tftp 0x8000 vmlinux.bin
sf write 0x8000 0x100000 0x140000

sf read 0x800000 0x100000 0x140000

NOTE: Use of SF commands disables linear flash. QSPI not avalable at 0xFC000000
until again set up by boot ROM (post reset).

14 years agoXilinx: ARM: Added DDR initialization for PEEP8 with 256 MB
John Linn [Fri, 21 Jan 2011 15:56:57 +0000 (08:56 -0700)] 
Xilinx: ARM: Added DDR initialization for PEEP8 with 256 MB

Linux needs to test with more memory.  This will probably not run
with previous PEEP designs. Conditional compilation was added to
deal with that.

14 years agoXilinx: ARM: updated size of kernel in environment for NAND
John Linn [Sat, 11 Dec 2010 00:43:19 +0000 (17:43 -0700)] 
Xilinx: ARM: updated size of kernel in environment for NAND

The kernel was crashing because not all of it was being copied after
we added more drivers (USB).

15 years agoXilinx: ARM: changed back to NOR as default flash
John Linn [Thu, 2 Dec 2010 15:38:09 +0000 (08:38 -0700)] 
Xilinx: ARM: changed back to NOR as default flash

15 years agoMerge branch 'master' of /home/bhill/work/u-boot/u-boot-xarm
GIT Repo [Wed, 1 Dec 2010 23:29:52 +0000 (16:29 -0700)] 
Merge branch 'master' of /home/bhill/work/u-boot/u-boot-xarm

15 years agoXilinx: ARM: Add script xromhdr.pl to generate Xilinx Boot ROM Header.
Brian Hill [Wed, 1 Dec 2010 22:56:32 +0000 (15:56 -0700)] 
Xilinx: ARM: Add script xromhdr.pl to generate Xilinx Boot ROM Header.

EXAMPLE:
./xromhdr.pl build/u-boot.bin NOR
./xromhdr.pl build/u-boot.bin QSPI

15 years agoXilinx: ARM: NAND: Merge latest Linux NAND driver mods to u-boot.
Brian Hill [Wed, 1 Dec 2010 17:18:10 +0000 (10:18 -0700)] 
Xilinx: ARM: NAND: Merge latest Linux NAND driver mods to u-boot.

15 years agoXilinx: ARM: Updated NAND addresses for new partitions
John Linn [Tue, 30 Nov 2010 00:37:11 +0000 (17:37 -0700)] 
Xilinx: ARM: Updated NAND addresses for new partitions

Due to some issues with bad blocks, we decided to move the partitions
some so that the Nand boot env var needed to be updated.

15 years agoXilinx: ARM: Updating boot commands for all flash types
John Linn [Thu, 25 Nov 2010 00:06:58 +0000 (17:06 -0700)] 
Xilinx: ARM: Updating boot commands for all flash types

Now that NAND, QSPI and NOR are all working, the boot command is
less clear.

This commit adds environment vars norboot, nandboot, and qspiboot
which can be used with the run command (run <env var>) to boot
from any of the memories.

The default auto boot is still NOR.

15 years agoXilinx: ARM: Updated boot command to use QSPI
John Linn [Mon, 15 Nov 2010 19:46:32 +0000 (12:46 -0700)] 
Xilinx: ARM: Updated boot command to use QSPI

U-boot has to be built differently when it is to be written to
QSPI vs NOR flash. Since both use execute in place mode, the header
in u-boot has to have the address to jump to in flash for the boot
rom to use.

The boot command copies the kernel and root file system from flash
to ram and it has to know which addresses for flash (QSPI or NOR).

15 years agoXilinx: ARM: Provide a mechanism to specify the XIP header addres in xpele.h.
Brian Hill [Mon, 15 Nov 2010 17:37:05 +0000 (10:37 -0700)] 
Xilinx: ARM:  Provide a mechanism to specify the XIP header addres in xpele.h.

CONFIG_PELE_XIP_START in include/configs/xpele.h is used to specify the XIP
address in the boot rom flash header.

15 years agoXilinx: ARM: Update header expected by Xilinx boot ROM to launch u-boot.
Brian Hill [Fri, 12 Nov 2010 18:01:21 +0000 (11:01 -0700)] 
Xilinx: ARM: Update header expected by Xilinx boot ROM to launch u-boot.

15 years agoXilinx: ARM: reapply Xilinx Boot ROM XIP header; removed during v2010.9 update.
Brian Hill [Tue, 9 Nov 2010 17:50:14 +0000 (10:50 -0700)] 
Xilinx: ARM: reapply Xilinx Boot ROM XIP header; removed during v2010.9 update.

15 years agoMerge branch 'v2010.09' of /home/bhill/work/u-boot/u-boot into pele-peep6
Brian Hill [Mon, 8 Nov 2010 22:30:55 +0000 (15:30 -0700)] 
Merge branch 'v2010.09' of /home/bhill/work/u-boot/u-boot into pele-peep6

Conflicts:
Makefile
cpu/arm_cortexa8/start.S
cpu/arm_cortexa8/u-boot.lds

15 years agoXilinx: ARM: Add initial NAND flash support.
Brian Hill [Thu, 28 Oct 2010 19:42:50 +0000 (13:42 -0600)] 
Xilinx: ARM: Add initial NAND flash support.

Exmaple usage:
pele-boot> nand device 0
pele-boot> nand erase

pele-boot> tftpboot 0x8000 linux-2.6-xlnx/vmlinux.bin
nand write <mem> <flash offset> <bytes>
pele-boot> nand write 0x8000 0 0x2d2000

pele-boot> tftpboot 0x800000 ramdisk3M.image.gz
pele-boot> nand write 0x800000 0x500000 0xef000

nand read <mem> <flash offset> <bytes>
pele-boot> nand read 0x8000 0 0x2d2000
pele-boot> nand read 0x800000 0x500000 0xef000
pele-boot> go 0x8000

15 years agoPrepare v2010.09 v2010.09
Wolfgang Denk [Tue, 28 Sep 2010 21:20:55 +0000 (23:20 +0200)] 
Prepare v2010.09

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agompc512x: fix build issues
Wolfgang Denk [Tue, 28 Sep 2010 21:02:05 +0000 (23:02 +0200)] 
mpc512x: fix build issues

Commit 800eb0964 "POST cleanup." removed file
arch/powerpc/cpu/mpc512x/common.c but failed to remove the reference
to it from arch/powerpc/cpu/mpc512x/Makefile which causes somewhat
obscure build errors:

make[1]: *** No rule to make target `/work/wd/tmp-ppc/arch/powerpc/cpu/mpc512x/.depend', needed by `_depend'.  Stop.

Fix these.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoARMV7: OMAP3: Update Beagle xM pinmux with USB hub and DVI gpio setup
Steve Sakoman [Mon, 20 Sep 2010 16:55:24 +0000 (09:55 -0700)] 
ARMV7: OMAP3: Update Beagle xM pinmux with USB hub and DVI gpio setup

This patch adds missing pinmux setup for 4 GPIO signals used on the Beagle xM:
 - USB hub reset (gpio_56)
 - P8 USB hub reset (gpio_63)
 - DVI enable (gpio_129)
 - P8 DVI enable (gpio_170)

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP4: Calculate SDRAM size
Aneesh V [Sun, 12 Sep 2010 05:02:55 +0000 (10:32 +0530)] 
ARMV7: OMAP4: Calculate SDRAM size

Calculate the SDRAM size from DMM configuration registers instead of using
hard-coded values. This gives correct values for all different boards.

It's assumed that DMM sections do not overlap memory areas.

Signed-off-by: Aneesh V <aneesh@ti.com>
Tested-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP4: Fix Panda pinmux setting to enable Wifi/BT Module
Steve Sakoman [Wed, 22 Sep 2010 14:30:11 +0000 (07:30 -0700)] 
ARMV7: OMAP4: Fix Panda pinmux setting to enable Wifi/BT Module

This patch corrects the pinmux settings to enable proper functioning
of the wifi/bluetooth module.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoixp/npe: Remove duplicated comment
Thomas Weber [Tue, 28 Sep 2010 12:03:32 +0000 (14:03 +0200)] 
ixp/npe: Remove duplicated comment

Signed-off-by: Thomas Weber <weber@corscience.de>
15 years agobmw: Remove duplicated include of header file
Thomas Weber [Tue, 28 Sep 2010 12:03:33 +0000 (14:03 +0200)] 
bmw: Remove duplicated include of header file

Signed-off-by: Thomas Weber <weber@corscience.de>
15 years agoREADME: Fix description of version numbering scheme
Thomas Weber [Tue, 28 Sep 2010 06:06:25 +0000 (08:06 +0200)] 
README: Fix description of version numbering scheme

The version numbering scheme was changed in Oct, 2008.
This patch brings the documentation to the actual level.
The description is taken from:
http://www.denx.de/wiki/U-Boot/ReleaseCycle

Signed-off-by: Thomas Weber <weber@corscience.de>
Changed text slightly.
Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoFix "ubi part" cmd re-entrancy
Karl Beldan [Thu, 23 Sep 2010 08:46:31 +0000 (10:46 +0200)] 
Fix "ubi part" cmd re-entrancy

Commit 2ee951ba (UBI: Enable re-initializing of the "ubi part" command)
reset mtd_devs in ubi_exit() but missed ubi_init()'s failure path.

Signed-off-by: Karl Beldan <karl.beldan@gmail.com>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Thu, 23 Sep 2010 19:16:32 +0000 (21:16 +0200)] 
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

15 years agoppc4xx/fdt/flash: Change fdt_fixup_nor_flash_node() to not rely on cs size
Stefan Roese [Thu, 16 Sep 2010 12:01:53 +0000 (14:01 +0200)] 
ppc4xx/fdt/flash: Change fdt_fixup_nor_flash_node() to not rely on cs size

This patch changes the behaviour of the fdt_fixup_nor_flash_node()
function. Now it doesn't patch the size of the "reg" property with the
chip-select size, but with the size returned from the new function
flash_get_bank_size(). This function will return per weak default the
flash size of the bank (bank = chip-select numer) detected by the flash
driver. If this does not fit your needs, this function may be overridden
by a board specific one.

For this the parameters needed to be changed. So I intentionally squashed
the PPC4xx stuff using this routine into this patch. Otherwise it would
not be git-bisectable anymore.

The board specific function for the AMCC/APM Ebony eval board is now
included in this patch version.

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Detlev Zundel <dzu@denx.de>
Cc: Gerald Van Baren <vanbaren@cideas.com>
Cc: Wolfgang Denk <wd@denx.de>
15 years agoppc4xx: POST UART: Use in/out_8() io-accessor functions
Stefan Roese [Tue, 14 Sep 2010 07:38:18 +0000 (09:38 +0200)] 
ppc4xx: POST UART: Use in/out_8() io-accessor functions

This patch fixes a problem in the PPC4xx POST UART driver. This driver
incorrectly used the in/out8() io-accessor functions. This could lead to
problems since these functions don't guarantee execution ordering. This
patch now replaces these functions with the correct ones.

Additionally the driver is converted to using the NS16550 struct instead
of macros for the register offsets.

And some common code is factored out for better maintainability.

Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoppc4xx: Fix CATcenter build
Stefan Roese [Fri, 10 Sep 2010 14:29:37 +0000 (16:29 +0200)] 
ppc4xx: Fix CATcenter build

Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Wolfgang Denk [Wed, 22 Sep 2010 20:37:49 +0000 (22:37 +0200)] 
Merge branch 'master' of git://git.denx.de/u-boot-video

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Wed, 22 Sep 2010 20:36:42 +0000 (22:36 +0200)] 
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

15 years agoMerge branch 'master' of /home/wd/git/u-boot/master
Wolfgang Denk [Wed, 22 Sep 2010 20:35:44 +0000 (22:35 +0200)] 
Merge branch 'master' of /home/wd/git/u-boot/master

15 years agoBlackfin: bfin_spi: use same gpio cs define as Linux
Mike Frysinger [Mon, 20 Sep 2010 21:54:09 +0000 (17:54 -0400)] 
Blackfin: bfin_spi: use same gpio cs define as Linux

Linux uses an offset of 8 to switch from hardware cs to a gpio cs,
so have u-boot use the same value.  Also make sure it is public
for boards to access.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: update some missed board config.mk files
Mike Frysinger [Mon, 20 Sep 2010 18:17:39 +0000 (14:17 -0400)] 
Blackfin: update some missed board config.mk files

Seems these two files were missed during the big lib shuffle.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agovideo: cfb_console: fix definition and usage of CURSOR_xxx macros
Timur Tabi [Fri, 27 Aug 2010 20:45:47 +0000 (15:45 -0500)] 
video: cfb_console: fix definition and usage of CURSOR_xxx macros

The CURSOR_ON, CURSOR_OFF, and CURSOR_SET macros are defined incorrectly.  If
cursor support is disabled, then these macros are defined to nothing, but
then they are used like this:

if (console_col < CONSOLE_COLS)
CURSOR_OFF
console_row++;

which was compiled like this:

if (console_col < CONSOLE_COLS)
console_row++;

This is obviously not what was intended.

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Detlev Zundel <dzu@denx.de>
15 years agoPOST cleanup.
Michael Zaidman [Mon, 20 Sep 2010 06:51:53 +0000 (08:51 +0200)] 
POST cleanup.

- Revives POST for blackfin arch;
- Removes redundant code:
     arch/blackfin/lib/post.c
     arch/powerpc/cpu/ppc4xx/commproc.c
     arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage.

Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com>
Acked-by: Detlev Zundel <dzu@denx.de>
Tested-by: Anatolij Gustschin <agust@denx.de>
List of the maintainers of the affected by patch boards:
Cc: Stephan Linz <linz@li-pro.net>
Cc: Denis Peter <d.peter@mpl.ch>
Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Niklaus Giger <niklaus.giger@netstal.com>
Cc: Larry Johnson <lrj@acm.org>
Cc: Feng Kan <fkan@amcc.com>
15 years agocmd_mmc: use common usage function
Mike Frysinger [Thu, 29 Jul 2010 17:40:43 +0000 (13:40 -0400)] 
cmd_mmc: use common usage function

Rather than using a custom "Usage:", use the common cmd_usage() function,
and tail into it now that it returns 1 for us.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agosetlocalversion: add some more fallbacks for git describe
Mike Frysinger [Mon, 20 Sep 2010 18:36:18 +0000 (14:36 -0400)] 
setlocalversion: add some more fallbacks for git describe

If working out of a custom git tree that lacks annotated tags, the
'git describe' operation spews "fatal: cannot describe" errors all
over the place.  So add some fallback code in case the best naming
was unable to locate something useful.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoMerge branch 'master' of /home/wd/git/u-boot/master
Wolfgang Denk [Tue, 21 Sep 2010 07:34:16 +0000 (09:34 +0200)] 
Merge branch 'master' of /home/wd/git/u-boot/master

15 years agoPrepare v2010.09-rc2 v2010.09-rc2
Wolfgang Denk [Sun, 19 Sep 2010 15:47:52 +0000 (17:47 +0200)] 
Prepare v2010.09-rc2

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoSave environment data to mmc.
Terry Lv [Mon, 17 May 2010 02:57:01 +0000 (10:57 +0800)] 
Save environment data to mmc.

This patch is to save environment data to mmc card.
It uses interfaces defined in generic mmc.

Signed-off-by: Terry Lv <r65388@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
15 years agosocrates: adjust TEXT_BASE to increase U-Boot image size
Wolfgang Denk [Fri, 10 Sep 2010 21:47:00 +0000 (23:47 +0200)] 
socrates: adjust TEXT_BASE to increase U-Boot image size

We need more room for the U-Boot image.
Shift TEXT_BASE as needed.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agommc: fix compiler warnings
Wolfgang Denk [Sat, 18 Sep 2010 23:03:20 +0000 (01:03 +0200)] 
mmc: fix compiler warnings

Commit d2bf29e3 caused a number of compiler warnings:

mmc.c: In function 'mmc_bwrite':
mmc.c:97: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
mmc.c:97: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'lbaint_t'
mmc.c: In function 'mmc_bread':
mmc.c:229: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
mmc.c:229: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'lbaint_t'

Fix these.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Lei Wen <leiwen@marvell.com>
15 years agotools/env: fail on invalid options
Daniel Hobi [Thu, 16 Sep 2010 12:36:09 +0000 (14:36 +0200)] 
tools/env: fail on invalid options

Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
15 years agotools/env: allow option "-n" for fw_printenv
Daniel Hobi [Wed, 15 Sep 2010 17:46:26 +0000 (19:46 +0200)] 
tools/env: allow option "-n" for fw_printenv

In commit bd7b26f8 (Tools: set multiple variable with fw_setenv utility),
the option parsing was changed to getopt_long(3), but option "-n"
of fw_printenv was not included.

This leads to an error message "invalid option -- 'n'" on stderr,
although the output on stdout is correct.

Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
15 years agoARM: Update ARM mach-types
Thomas Weber [Tue, 14 Sep 2010 14:42:54 +0000 (16:42 +0200)] 
ARM: Update ARM mach-types

This patch updates the mach-types.h based on the latest linux kernel

Signed-off-by: Thomas Weber <weber@corscience.de>
15 years agommc: print out partition table
Lei Wen [Mon, 13 Sep 2010 14:07:28 +0000 (22:07 +0800)] 
mmc: print out partition table

Signed-off-by: Lei Wen <leiwen@marvell.com>
15 years agommc: add boundary check for mmc operation
Lei Wen [Mon, 13 Sep 2010 14:07:27 +0000 (22:07 +0800)] 
mmc: add boundary check for mmc operation

Signed-off-by: Lei Wen <leiwen@marvell.com>
15 years agovideo: cfb_console: fix definition and usage of CURSOR_xxx macros
Timur Tabi [Fri, 27 Aug 2010 20:45:47 +0000 (15:45 -0500)] 
video: cfb_console: fix definition and usage of CURSOR_xxx macros

The CURSOR_ON, CURSOR_OFF, and CURSOR_SET macros are defined incorrectly.  If
cursor support is disabled, then these macros are defined to nothing, but
then they are used like this:

if (console_col < CONSOLE_COLS)
CURSOR_OFF
console_row++;

which was compiled like this:

if (console_col < CONSOLE_COLS)
console_row++;

This is obviously not what was intended.

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Detlev Zundel <dzu@denx.de>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Wed, 15 Sep 2010 20:06:32 +0000 (22:06 +0200)] 
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-x86
Wolfgang Denk [Wed, 15 Sep 2010 20:04:42 +0000 (22:04 +0200)] 
Merge branch 'master' of git://git.denx.de/u-boot-x86

15 years agonand/davinci: make sure ECC calculation has really started
Wolfram Sang [Thu, 9 Sep 2010 11:54:41 +0000 (13:54 +0200)] 
nand/davinci: make sure ECC calculation has really started

Due to a register glitch (result code <4 might show up right after the
start-calculation-bit was set), make sure the ECC has really started.

See 1c3275b656045aff9a75bb2c9f3251af1043ebb3 in the kernel.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
15 years agodisplay_buffer: fix misaligned buffer
Reinhard Meyer [Wed, 8 Sep 2010 10:25:40 +0000 (12:25 +0200)] 
display_buffer: fix misaligned buffer

use a union to cause necessary alignment per architecture

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
15 years agox86: Remove Unmaintained Boards
Graeme Russ [Sun, 22 Aug 2010 06:26:00 +0000 (16:26 +1000)] 
x86: Remove Unmaintained Boards

The SC520 CDP boards originally implemented by Daniel Engström are now
very broken. Attempts to contact Daniel via the email address on the
copyright notice have failed. Remove these boards from mainline

15 years agox86: Fix x86 Cold Boot
Graeme Russ [Sun, 22 Aug 2010 06:25:59 +0000 (16:25 +1000)] 
x86: Fix x86 Cold Boot

Commit 077e1958ca4afe12d88043b123ded058c51b89f7 broke the ability of the
x86 port to boot from a cold-reset by removing the initial IDT. Re-
instate the initial IDT to allow cold-booting of x86 boards

15 years agox86: Add do_bdinfo()
Graeme Russ [Sun, 22 Aug 2010 06:25:58 +0000 (16:25 +1000)] 
x86: Add do_bdinfo()

x86 failed to compile with a message "a case for this architecture does
not exist!" - Add do_bdinfo() for this arch

15 years agox86: Fix do_go_exec() - const argv[]
Graeme Russ [Sun, 22 Aug 2010 06:25:58 +0000 (16:25 +1000)] 
x86: Fix do_go_exec() - const argv[]

Commit 54841ab50c20d6fa6c9cc3eb826989da3a22d934 made the argv parameter
to do_go_exec() const but did not allow for the fact that argv[-1] is
set to point to the global data structure and relies on argv being non-
const.

With this patch, do_go_exec() creates a new copy of the argv array with
an extra element to store global data pointer rather than simply
clobbering an arbitrary memory location.

15 years agousb: musb: set target address for non-multipoint devices
Bryan Wu [Mon, 9 Aug 2010 22:41:12 +0000 (18:41 -0400)] 
usb: musb: set target address for non-multipoint devices

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agousb: musb: setup TXCOUNT for Blackfin musb
Bryan Wu [Mon, 9 Aug 2010 18:57:41 +0000 (14:57 -0400)] 
usb: musb: setup TXCOUNT for Blackfin musb

The Blackfin implementation of musb has a TXCOUNT register that needs to
be programmed when transmitting data.

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoPrepare v2010.09-rc1 v2010.09-rc1
Wolfgang Denk [Thu, 9 Sep 2010 22:16:19 +0000 (00:16 +0200)] 
Prepare v2010.09-rc1

Coding style cleanup.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Thu, 9 Sep 2010 19:39:46 +0000 (21:39 +0200)] 
Merge branch 'master' of git://git.denx.de/u-boot-arm

15 years agoMX51: Update responsible for mx51evk
Stefano Babic [Fri, 13 Aug 2010 14:47:17 +0000 (16:47 +0200)] 
MX51: Update responsible for mx51evk

Signed-off-by: Stefano Babic <sbabic@denx.de>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-ti
Wolfgang Denk [Thu, 9 Sep 2010 17:55:02 +0000 (19:55 +0200)] 
Merge branch 'master' of git://git.denx.de/u-boot-ti

15 years agobedbug_860.c, bedbug_603e.c: Fix return type to silence compile warnings.
Wolfgang Denk [Wed, 18 Aug 2010 22:27:33 +0000 (00:27 +0200)] 
bedbug_860.c, bedbug_603e.c: Fix return type to silence compile warnings.

commit 47e26b1b "cmd_usage(): simplify return code handling" caused
the following compile warnings:

bedbug_860.c: In function 'bedbug860_do_break':
bedbug_860.c:73: warning: 'return' with a value, in function returning void
bedbug_860.c:121: warning: 'return' with a value, in function returning void

Fix the return type.

Actually these files could need some cleanup - commands should
return proper error codes, and there are coding style issues.
=> To be fixed later.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoARMV7: Fix pad mux for Panda LEDs
Ricardo Salveti de Araujo [Tue, 7 Sep 2010 23:17:52 +0000 (16:17 -0700)] 
ARMV7: Fix pad mux for Panda LEDs

Correctly set PAD1_FREF_CLK4_REQ and PAD0_FREF_CLK4_OUT to enable and
activate both LEDs while setting pad mux.

Since this increases the line length, this patch also adjusts the white
space in this section of code to allign the pad mux signal description
comments.

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP: Overo: Autodetect presence/absence of transceiver on mmc2
Steve Sakoman [Tue, 24 Aug 2010 17:37:29 +0000 (10:37 -0700)] 
ARMV7: OMAP: Overo: Autodetect presence/absence of transceiver on mmc2

An upcoming version of Overo uses a Wifi/BT module with 1.8V signaling,
eliminating the need for an external transceiver to handle the level
shifting.  This patch detects whether an external transceiver is present
and adjusts the pinmux settings as appropriate.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP3: Add support for Beagle xM
Steve Sakoman [Fri, 20 Aug 2010 03:56:11 +0000 (20:56 -0700)] 
ARMV7: OMAP3: Add support for Beagle xM

This patch adds support for the Beagle xM.  It uses the board ID
GPIO bits to recognize this revision and perform appropriate setup.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP3: Add CONFIG_SYS_NAND_QUIET_TEST to Beagle and Overo configs
Steve Sakoman [Fri, 20 Aug 2010 03:52:35 +0000 (20:52 -0700)] 
ARMV7: OMAP3: Add CONFIG_SYS_NAND_QUIET_TEST to Beagle and Overo configs

Future versions of these boards have options for POP memory with no NAND.
This option prevents display of error messages when no NAND is detected.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agomtd: nand: supress 'unknown NAND' warning if no nand is found
Steve Sakoman [Fri, 20 Aug 2010 03:14:01 +0000 (20:14 -0700)] 
mtd: nand: supress 'unknown NAND' warning if no nand is found

This printk was added recently and results in ugly output on systems
with no NAND:

NAND:  nand_get_flash_type: unknown NAND device: Manufacturer ID: 0x00, Chip ID: 0x00 0 MiB

instead of:

NAND:  0 MiB

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP3: Remove erroneous hard coded sdram setup for 128MB/bank
Steve Sakoman [Fri, 20 Aug 2010 03:09:57 +0000 (20:09 -0700)] 
ARMV7: OMAP3: Remove erroneous hard coded sdram setup for 128MB/bank

Upcoming Beagle and Overo revisions use POP memory with 256MB or 512MB
per bank.  This patches uses the SDRC settings from x-load or the config
header to set up timing properly.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP3: Fix broken reset command on OMAP36XX/37XX and OMAP4
Steve Sakoman [Wed, 25 Aug 2010 20:22:44 +0000 (13:22 -0700)] 
ARMV7: OMAP3: Fix broken reset command on OMAP36XX/37XX and OMAP4

Using the reset command on OMAP36XX/37XX and OMAP4 caused a hang. This
patch uses the reset bit appropriate for each CPU architecture.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP3: Apply Cortex-A8 errata workarounds only on affected revisions
Mans Rullgard [Wed, 14 Apr 2010 15:10:28 +0000 (16:10 +0100)] 
ARMV7: OMAP3: Apply Cortex-A8 errata workarounds only on affected revisions

The workarounds for errata 621766 and 725233 should only be applied
on affected Cortex-A8 revisions.  Recent chips use r3px cores where
these have been fixed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP3: Convert setup_auxcr() to pure asm
Mans Rullgard [Wed, 14 Apr 2010 14:49:57 +0000 (15:49 +0100)] 
ARMV7: OMAP3: Convert setup_auxcr() to pure asm

This function consists entirely of inline asm statements, so writing
it directly in a .S file is simpler. Additionally, the inline asm is
not safe as is, since registers are not guaranteed to be preserved
between asm() statements.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP3: Fix and clean up L2 cache enable/disable functions
Mans Rullgard [Wed, 14 Apr 2010 10:08:00 +0000 (11:08 +0100)] 
ARMV7: OMAP3: Fix and clean up L2 cache enable/disable functions

On OMAP34xx ES1.0, the L2 enable bit can only be set in secure mode,
so an SMC call to the ROM monitor is required.  On later versions,
and on newer devices, this bit is banked and we can set it directly.

The code checked only the ES revision of the chip, and hence incorrectly
used the ROM call on ES1.0 versions of other devices.

This patch adds a check for chip family as well as revision, and also
removes some code duplication between the enable and disable functions.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP3: Add clock setup for OMAP36XX/37XX
Steve Sakoman [Wed, 18 Aug 2010 14:34:09 +0000 (07:34 -0700)] 
ARMV7: OMAP3: Add clock setup for OMAP36XX/37XX

This patch configures clocks properly when a 36XX/37XX
processor is detected.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP3: Update CPU type detection for AM35XX/OMAP36XX/37XX
Steve Sakoman [Tue, 17 Aug 2010 21:39:34 +0000 (14:39 -0700)] 
ARMV7: OMAP3: Update CPU type detection for AM35XX/OMAP36XX/37XX

TI has added new processors to the OMAP3 family.  This patch enhances
the code in sysinfo.c to detect which family member is present.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP: Configure Overo's second network chip
Steve Sakoman [Fri, 13 Aug 2010 04:07:02 +0000 (21:07 -0700)] 
ARMV7: OMAP: Configure Overo's second network chip

Confiures GPMC timings for both chips and also configures pinmux
for GPIO_65, which is used as the interrupt signal for the second chip

Signed-off-by: Scott Ellis <scott@jumpnowtek.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP: Add detection and support for Beagle C4 revision
Steve Sakoman [Thu, 12 Aug 2010 22:17:37 +0000 (15:17 -0700)] 
ARMV7: OMAP: Add detection and support for Beagle C4 revision

This patch enhances the revision detection function and adds
support for the C4 revision.  The board revision is printed
and approriate revision specific setup is done automatically.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP: Add board revision detection for Overo
Steve Sakoman [Thu, 12 Aug 2010 22:13:02 +0000 (15:13 -0700)] 
ARMV7: OMAP: Add board revision detection for Overo

The latest Overo COM modules encode their revision number on
GPIOs 115, 113, and 112.  All boards to date have no pullups on these pins
and hence appear as revision 0.

This patch reads and prints the revision information.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP: Add mpurate boot arg for Overo and Beagle
Steve Sakoman [Wed, 3 Feb 2010 22:39:14 +0000 (14:39 -0800)] 
ARMV7: OMAP: Add mpurate boot arg for Overo and Beagle

Allows one to set the processor clock rate via "setenv mpurate 720" for example

Default is set to a "safe" 500 Mhz.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP: Enable input driver on Overo's MMC1_CLK and MMC3_CLK pinmux setup
Steve Sakoman [Tue, 16 Feb 2010 18:00:45 +0000 (10:00 -0800)] 
ARMV7: OMAP: Enable input driver on Overo's MMC1_CLK and MMC3_CLK pinmux setup

This patch modifies the pinmux setup for MMC1_CLK and MMC3_CLK to enable
the input driver.  MMC2_CLK was already properly configured.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP: add convenience function to set TWL4030 regulator voltages
Steve Sakoman [Tue, 10 Aug 2010 19:58:39 +0000 (12:58 -0700)] 
ARMV7: OMAP: add convenience function to set TWL4030 regulator voltages

This patch adds a function to allow one to easily set the target
voltage for the TWL4030 regulators.  It also modifies the existing
code to use this new function.  Applicable definitions are moved
out of the driver file and into the header file so that they are
generally accessible

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoARMV7: OMAP: Move syslib.c to omap-common since it can be shared by OMAP3 and OMAP4
Steve Sakoman [Wed, 4 Aug 2010 16:39:40 +0000 (09:39 -0700)] 
ARMV7: OMAP: Move syslib.c to omap-common since it can be shared by OMAP3 and OMAP4

The functions in syslib.c can be shared, so this patch moves it from
cpu/omap3 to cpu/omap-common

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
15 years agoMerge branch 'avr32' of git://git.denx.de/u-boot-atmel
Wolfgang Denk [Tue, 7 Sep 2010 22:48:27 +0000 (00:48 +0200)] 
Merge branch 'avr32' of git://git.denx.de/u-boot-atmel

15 years agoMerge branch 'at91' of git://git.denx.de/u-boot-atmel
Wolfgang Denk [Tue, 7 Sep 2010 22:42:00 +0000 (00:42 +0200)] 
Merge branch 'at91' of git://git.denx.de/u-boot-atmel

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-samsung
Wolfgang Denk [Tue, 7 Sep 2010 22:03:22 +0000 (00:03 +0200)] 
Merge branch 'master' of git://git.denx.de/u-boot-samsung

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-marvell
Wolfgang Denk [Tue, 7 Sep 2010 21:20:53 +0000 (23:20 +0200)] 
Merge branch 'master' of git://git.denx.de/u-boot-marvell