12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Minkyu Kang [Wed, 28 Apr 2010 09:56:39 +0000 (18:56 +0900)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

12 years agoMX31: Removed erroneous board name from QONG
Stefano Babic [Tue, 13 Apr 2010 10:19:06 +0000 (12:19 +0200)]
MX31: Removed erroneous board name from QONG

QONG is a module that can be installed on several boards,
not only on the QONG-EVB manufactured by Dave srl.

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoMX31: Add UBI support to QONG module
Stefano Babic [Thu, 8 Apr 2010 15:23:52 +0000 (17:23 +0200)]
MX31: Add UBI support to QONG module

The UBI/UBIFS support is added to the QONG module.

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoMX31: Support 128MB RAM on QONG module
Stefano Babic [Wed, 31 Mar 2010 08:27:47 +0000 (10:27 +0200)]
MX31: Support 128MB RAM on QONG module

The QONG module can be downsized and delivered
with 128MB instead of 256MB. The patch adds
run time support for the two different memory

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoMX31: Add support for NAND to QONG board
Stefano Babic [Mon, 29 Mar 2010 14:43:39 +0000 (16:43 +0200)]
MX31: Add support for NAND to QONG board

The NAND device is connected to the FPGA of the QONG board
and not to the NFC controller. For this reason, the FPGA must
be set and initialized before accessing to the NAND itself.

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoMX31: add pin definitions for NAND controller
Stefano Babic [Mon, 29 Mar 2010 13:56:10 +0000 (15:56 +0200)]
MX31: add pin definitions for NAND controller

Add pin definitions ralted to the NAND controller to be used
to set up the pin multiplexer.

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoMX31: add accessor function to get a gpio
Stefano Babic [Tue, 13 Apr 2010 10:07:00 +0000 (12:07 +0200)]
MX31: add accessor function to get a gpio

The patch adds an accessor function to get the value of a gpio.

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agomx51evk: correct list of possible BOOT_FROM values
Stefano Babic [Tue, 13 Apr 2010 10:38:43 +0000 (12:38 +0200)]
mx51evk: correct list of possible BOOT_FROM values

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agomkimage: correct spelling error in imximage
Stefano Babic [Tue, 13 Apr 2010 10:38:22 +0000 (12:38 +0200)]
mkimage: correct spelling error in imximage

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoMX25 print arm clock instead of mpllclk on boot
John Rigby [Thu, 8 Apr 2010 05:30:09 +0000 (23:30 -0600)]
MX25 print arm clock instead of mpllclk on boot

Replace call to imx_get_mpllclk with imx_get_armclk
to show frequency of ARM core instead of mpll internal
bus in print_cpuinfo.

Signed-off-by: John Rigby <jcrigby@gmail.com>
CC: Stefano Babic <sbabic@denx.de>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Minkyu Kang [Thu, 22 Apr 2010 03:39:56 +0000 (12:39 +0900)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

12 years agoconfigs/openrd_base.h: reordered macros
Frans Meulenbroeks [Tue, 6 Apr 2010 13:36:11 +0000 (19:06 +0530)]
configs/openrd_base.h: reordered macros

moved CONFIG_CMD_FAT to filesystem section
swapped CONFIG_CMD_NAND and CONFIG_CMD_MII so they are alpha correct

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
12 years agoconfigs/sheevaplug: added a few additional commands
Frans Meulenbroeks [Tue, 6 Apr 2010 12:56:19 +0000 (18:26 +0530)]
configs/sheevaplug: added a few additional commands

This patch includes a few additional commands in the sheevaplug
version of u-boot:
- support for LONGHELP so you can get help messages
- auto completion and command editing
- ubi and mii support
- ext2 filesystem (convenient if you have an ext2 from which you want to boot)
- jffs2 and ubifs filesystems (if you want to use these in NAND)

This also makes it more similar to openrd client.

Side effect of this patch is that the code now needs 3 sectors i.s.o. 2
so an existing env is overwritten

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
12 years agoMarvell GuruPlug Board Support
Siddarth Gore [Thu, 18 Mar 2010 14:55:40 +0000 (20:25 +0530)]
Marvell GuruPlug Board Support

GuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0
GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot


This patch is for GuruPlug Plus, but it supports Standard version
as well.

Signed-off-by: Siddarth Gore <gores@marvell.com>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Minkyu Kang [Mon, 19 Apr 2010 01:26:18 +0000 (10:26 +0900)]
Merge branch 'master' of git://git.denx.de/u-boot-arm


Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoMoved board specific values in config file
Stefano Babic [Sun, 28 Mar 2010 11:43:26 +0000 (13:43 +0200)]
Moved board specific values in config file

The lowlevel_init file contained some hard-coded values
to setup the RAM. These board related values are moved into
the board configuration file.

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoMX51EVK: Remove CPLD related code
Fabio Estevam [Wed, 31 Mar 2010 13:32:56 +0000 (06:32 -0700)]
MX51EVK: Remove CPLD related code

There is no CPLD on MX51EVK board, so remove CPLD related function.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agoarm, i.mx27: add support for magnesium board from projectiondesign
Heiko Schocher [Fri, 5 Mar 2010 06:36:33 +0000 (07:36 +0100)]
arm, i.mx27: add support for magnesium board from projectiondesign

This patch adds support for the magnesium board from
projectiondesign. This board uses i.MX27 SoC and has
8MB NOR flash, 128MB NAND flash, FEC ethernet controller
integrated into i.MX27. As this port is based on
the imx27lite port, common config options are collected
in include/configs/imx27lite-common.h

Signed-off-by: Heiko Schocher <hs@denx.de>
12 years agoarm, mx27: add support for SDHC1 pin init
Heiko Schocher [Thu, 4 Mar 2010 07:12:05 +0000 (08:12 +0100)]
arm, mx27: add support for SDHC1 pin init

Signed-off-by: Heiko Schocher <hs@denx.de>
12 years agoSAMSUNG: make s5p common gpio functions
Minkyu Kang [Wed, 24 Mar 2010 06:31:06 +0000 (15:31 +0900)]
SAMSUNG: make s5p common gpio functions

Because of s5pc1xx gpio is same as s5p seires SoC,
move gpio functions to drvier/gpio/
and modify structure's name from s5pc1xx_ to s5p_.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoSAMSUNG: serial: modify name from s5pc1xx to s5p
Minkyu Kang [Wed, 24 Mar 2010 07:59:30 +0000 (16:59 +0900)]
SAMSUNG: serial: modify name from s5pc1xx to s5p

Because of other s5p series SoC will use these serial functions,
modify function's name and structure's name.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agopm9263: remove CONFIG_CMD_AUTOSCRIPT
Asen Dimov [Wed, 7 Apr 2010 09:33:11 +0000 (12:33 +0300)]

Signed-off-by: Asen Dimov <dimov@ronetix.at>
12 years agoat91: add defines for RTT and GPBR
Alexander Holler [Mon, 29 Mar 2010 19:39:43 +0000 (21:39 +0200)]
at91: add defines for RTT and GPBR

Signed-off-by: Alexander Holler <holler@ahsoftware.de>
12 years agopm9261: remove CONFIG_CMD_AUTOSCRIPT
Asen Dimov [Tue, 6 Apr 2010 13:17:34 +0000 (16:17 +0300)]

Signed-off-by: Asen Dimov <dimov@ronetix.at>
12 years agopm9261 converted to at91 soc access
Asen Dimov [Tue, 6 Apr 2010 13:18:04 +0000 (16:18 +0300)]
pm9261 converted to at91 soc access

Signed-off-by: Asen Dimov <dimov@ronetix.at>
12 years agoARM Update mach-types
trix [Sat, 10 Apr 2010 17:46:49 +0000 (12:46 -0500)]
ARM Update mach-types

Fetched from http://www.arm.linux.org.uk/developer/machines/download.php
And built with

repo http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
commit 85b3cce880a19e78286570d5fd004cc3cac06f57

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
12 years agoppc4xx: Add option for PPC440SPe ports without old Rev. A support
Stefan Roese [Fri, 9 Apr 2010 12:03:59 +0000 (14:03 +0200)]
ppc4xx: Add option for PPC440SPe ports without old Rev. A support

The 440SPe Rev. A is quite old and newer 440SPe boards don't need support
for this CPU revision. Since removing support for this older version
simplifies the creation for newer U-Boot ports, this patch now enables
440SPe > Rev. A support by creating the CONFIG_440SPE_REVA define. By
defining this in the board config header, Rev. A will still be supported.
Otherwise (default for newer board ports), Rev. A will not be supported.

Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoppc4xx: alpr: Remove some not needed commands to make image fit again
Stefan Roese [Thu, 8 Apr 2010 07:33:13 +0000 (09:33 +0200)]
ppc4xx: alpr: Remove some not needed commands to make image fit again

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 "loads" and "loadb" which are not needed in the production

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Pieter Voorthuijsen <pieter.voorthuijsen@prodrive.nl>
12 years agoUpdate README to reflect new directory structure
Peter Tyser [Tue, 13 Apr 2010 03:28:21 +0000 (22:28 -0500)]
Update README to reflect new directory structure

Also fix up some whitespace issues that were introduced when moving
directory locations.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agonios2: Move cpu/nios2/* to arch/nios2/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:20 +0000 (22:28 -0500)]
nios2: Move cpu/nios2/* to arch/nios2/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agonios: Move cpu/nios/* to arch/nios/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:19 +0000 (22:28 -0500)]
nios: Move cpu/nios/* to arch/nios/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agosparc: Move cpu/leon[23] to arch/sparc/cpu/leon[23]
Peter Tyser [Tue, 13 Apr 2010 03:28:18 +0000 (22:28 -0500)]
sparc: Move cpu/leon[23] to arch/sparc/cpu/leon[23]

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoi386: Move cpu/i386/* to arch/i386/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:17 +0000 (22:28 -0500)]
i386: Move cpu/i386/* to arch/i386/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agomicroblaze: Move cpu/microblaze/* to arch/microblaze/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:16 +0000 (22:28 -0500)]
microblaze: Move cpu/microblaze/* to arch/microblaze/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoavr32: Move cpu/at32ap/* to arch/avr32/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:15 +0000 (22:28 -0500)]
avr32: Move cpu/at32ap/* to arch/avr32/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agomips: Move cpu/mips/* to arch/mips/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:14 +0000 (22:28 -0500)]
mips: Move cpu/mips/* to arch/mips/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoblackfin: Move cpu/blackfin/* to arch/blackfin/cpu/*
Peter Tyser [Tue, 13 Apr 2010 03:28:13 +0000 (22:28 -0500)]
blackfin: Move cpu/blackfin/* to arch/blackfin/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agom68k: Move cpu/$CPU to arch/m68k/cpu/$CPU
Peter Tyser [Tue, 13 Apr 2010 03:28:12 +0000 (22:28 -0500)]
m68k: Move cpu/$CPU to arch/m68k/cpu/$CPU

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoarm: Move cpu/$CPU to arch/arm/cpu/$CPU
Peter Tyser [Tue, 13 Apr 2010 03:28:11 +0000 (22:28 -0500)]
arm: Move cpu/$CPU to arch/arm/cpu/$CPU

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agosh: Move cpu/$CPU to arch/sh/cpu/$CPU
Peter Tyser [Tue, 13 Apr 2010 03:28:10 +0000 (22:28 -0500)]
sh: Move cpu/$CPU to arch/sh/cpu/$CPU

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoppc: Move cpu/$CPU to arch/ppc/cpu/$CPU
Peter Tyser [Tue, 13 Apr 2010 03:28:09 +0000 (22:28 -0500)]
ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoMove architecture-specific includes to arch/$ARCH/include/asm
Peter Tyser [Tue, 13 Apr 2010 03:28:08 +0000 (22:28 -0500)]
Move architecture-specific includes to arch/$ARCH/include/asm

This helps to clean up the include/ directory so that it only contains
non-architecture-specific headers and also matches Linux's directory
layout which many U-Boot developers are already familiar with.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoReplace "#include <asm-$ARCH/$FILE>" with "#include <asm/$FILE>"
Peter Tyser [Tue, 13 Apr 2010 03:28:07 +0000 (22:28 -0500)]
Replace "#include <asm-$ARCH/$FILE>" with "#include <asm/$FILE>"

The appropriate include/asm-$ARCH directory should already by symlinked
to include/asm so using the whole "asm-$ARCH" path is unnecessary.

This change should also allow us to move the include/asm-$ARCH
directories into their appropriate lib/$ARCH/ directories.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoMove libfdt/ into lib/
Peter Tyser [Tue, 13 Apr 2010 03:28:06 +0000 (22:28 -0500)]
Move libfdt/ into lib/

Move the libfdt directory into the common lib/ directory to clean up the
top-level directory.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoRename lib_generic/ to lib/
Peter Tyser [Tue, 13 Apr 2010 03:28:05 +0000 (22:28 -0500)]
Rename lib_generic/ to lib/

Now that the other architecture-specific lib directories have been
moved out of the top-level directory there's not much reason to have the
'_generic' suffix on the common lib directory.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoMove lib_$ARCH directories to arch/$ARCH/lib
Peter Tyser [Tue, 13 Apr 2010 03:28:04 +0000 (22:28 -0500)]
Move lib_$ARCH directories to arch/$ARCH/lib

Also move lib_$ARCH/config.mk to arch/$ARCH/config.mk

This change is intended to clean up the top-level directory structure
and more closely mimic Linux's directory organization.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoChange directory-specific CFLAGS to use full path
Peter Tyser [Tue, 13 Apr 2010 03:28:03 +0000 (22:28 -0500)]
Change directory-specific CFLAGS to use full path

Previously, a specific file or directory could be compiled with custom
CFLAGS by adding a Makefile variable such as:
  CFLAGS_dlmalloc.o = <custom flags for common/dlmalloc.c>
  CFLAGS_lib = <custom flags for lib directory>

This method breaks down once multiple files or directories share the
same path.  Eg FLAGS_fileA = <custom flags> would incorrectly result in
both dir1/fileA.c and dir2/fileA.c being compiled with <custom flags>.

This change allows finer grained control which we need once we move
lib_$ARCH to arch/$ARCH/lib/ and lib_generic/ to lib/.  Without this
change all lib/ directories would share the same custom CFLAGS.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoCreate CPUDIR variable
Peter Tyser [Tue, 13 Apr 2010 03:28:02 +0000 (22:28 -0500)]
Create CPUDIR variable

The CPUDIR variable points to the location of a target's CPU directory.
Currently, it is set to cpu/$CPU.  However, using $CPUDIR will allow for
more flexibility in the future.  It lays the groundwork for reorganizing
U-Boot's directory structure to support a layout such as:

  arch/$ARCH/cpu/$CPU/* (architecture with multiple CPU types)
  arch/$ARCH/cpu/*      (architecture with one CPU type)

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Sat, 10 Apr 2010 21:59:39 +0000 (23:59 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

12 years agoFIX: watchdog timeout, while waiting for input
Jens Scharsig [Fri, 9 Apr 2010 17:02:38 +0000 (19:02 +0200)]
FIX: watchdog timeout, while waiting for input

* add WATCHDOG_RESET to !tstc() loops
* prevents watchdog timeout, while waiting for input,

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
12 years agoconfig_cmd_all.h: Sort entries alphabetically
Detlev Zundel [Thu, 8 Apr 2010 15:55:48 +0000 (17:55 +0200)]
config_cmd_all.h: Sort entries alphabetically

Signed-off-by: Detlev Zundel <dzu@denx.de>
12 years agoconfig_cmd_all.h: added missing CONFIG_CMD_UBI and CONFIG_CMD_UBIFS
Frans Meulenbroeks [Thu, 8 Apr 2010 15:55:47 +0000 (17:55 +0200)]
config_cmd_all.h: added missing CONFIG_CMD_UBI and CONFIG_CMD_UBIFS

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
12 years agomalloc: sbrk() should return MORECORE_FAILURE instead of NULL on failure
karl.beldan@gmail.com [Tue, 6 Apr 2010 20:18:08 +0000 (22:18 +0200)]
malloc: sbrk() should return MORECORE_FAILURE instead of NULL on failure

Signed-off-by: Karl Beldan <karl.beldan@gmail.com>
12 years agomkimage: Fix strict-aliasing compiler warning
Peter Tyser [Mon, 5 Apr 2010 03:36:03 +0000 (22:36 -0500)]
mkimage: Fix strict-aliasing compiler warning

Version 4.2.4 of gcc produces the following warnings without this change:
  mkimage.c: In function ‘main’:
  mkimage.c:204: warning: dereferencing type-punned pointer will break strict-aliasing rules
  mkimage.c:222: warning: dereferencing type-punned pointer will break strict-aliasing rules

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
12 years agoAdd initial support for Matrix Vision mvSMR board based on MPC5200B.
Andre Schwarz [Thu, 1 Apr 2010 19:26:55 +0000 (21:26 +0200)]
Add initial support for Matrix Vision mvSMR board based on MPC5200B.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
12 years agocmd_bmp.c: add standard subcommand handling
Frans Meulenbroeks [Sat, 27 Mar 2010 10:16:10 +0000 (11:16 +0100)]
cmd_bmp.c: add standard subcommand handling

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Acked-by: Detlev Zundel <dzu@denx.de>
12 years agodrivers/mtd/spi/eeprom_m95xxx.c: add missing error checking
Albin Tonnerre [Sun, 14 Mar 2010 17:47:23 +0000 (18:47 +0100)]
drivers/mtd/spi/eeprom_m95xxx.c: add missing error checking

Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-ubi
Wolfgang Denk [Fri, 9 Apr 2010 19:49:42 +0000 (21:49 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ubi

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Fri, 9 Apr 2010 19:42:18 +0000 (21:42 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

12 years agocmd_ubi: Fix uninitialized variable warning
Peter Tyser [Mon, 5 Apr 2010 03:40:50 +0000 (22:40 -0500)]
cmd_ubi: Fix uninitialized variable warning

gcc 3.4.6 previously reported the following error on many MIPS boards
which utilize UBI:
  cmd_ubi.c:193: warning: 'vol' might be used uninitialized in this function

The current code is structured such that 'vol' will never be used when
it is NULL anyway, but gcc isn't smart enough to figure this out.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoUSB storage probe
Kim B. Heino [Fri, 12 Mar 2010 08:07:00 +0000 (10:07 +0200)]
USB storage probe

While debugging one ill behaving USB device I found two bugs in USB
storage probe.

usb_stor_get_info() returns -1 (error), 0 (skip) or 1 (ok). First part
of this patch fixes error case.

Second part fixes usb_inquiry()'s retry counter handling. Original code
had retry = -1 on error case, not retry = 0 as checked in the next line.

Signed-off-by: Kim B. Heino <Kim.Heino@bluegiga.com>
12 years agoUSB storage count
Kim B. Heino [Fri, 12 Mar 2010 13:46:56 +0000 (15:46 +0200)]
USB storage count

Here's another USB storage patch. Currently U-Boot handles storage
devices #0 - #4 as valid devices, even if there is none connected. This
patch fixes usb_stor_get_dev() to check detected device count instead
of MAX-define.

This is very important for ill behaving devices. usb_dev_desc[] can be
partially initialized if device probe fails.

After fixing get_dev() it was easy to fix "usb part" etc commands.
Previously it outputed "Unknown partition table" five times, now it's
"no USB devices available".

Signed-off-by: Kim B. Heino <Kim.Heino@bluegiga.com>
12 years agoEHCI: add NEC PCI ID
Sergei Shtylyov [Sat, 27 Feb 2010 18:34:41 +0000 (21:34 +0300)]

Add NEC EHCI controller to the list of the supported devices.

Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com>
 drivers/usb/host/ehci-pci.c |    1 +
 1 file changed, 1 insertion(+)

12 years agoEHCI: fix port reset reporting
Sergei Shtylyov [Sat, 27 Feb 2010 18:33:21 +0000 (21:33 +0300)]
EHCI: fix port reset reporting

Commit b416191a14770c6bcc6fd67be7decf8159b2baee (Fix EHCI port reset.) didn't
move the code that checked for successful clearing of the port reset bit from
ehci_submit_root(), relying on wait_ms() call instead. The mentioned code also
erroneously reported port reset state when the reset was already completed.

Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com>
12 years agoEHCI: fix off-by-one error in ehci_submit_root()
Sergei Shtylyov [Sat, 27 Feb 2010 18:32:17 +0000 (21:32 +0300)]
EHCI: fix off-by-one error in ehci_submit_root()

USB devices on the 2nd port are not detected and I get the following message:

The request port(1) is not configured

That's with default CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS value of 2. 'req->index'
is 1-based, so the comparison in ehci_submit_root() can't be correct.

Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com>
12 years agoEHCI: fix root hub device descriptor
Sergei Shtylyov [Sat, 27 Feb 2010 18:29:42 +0000 (21:29 +0300)]
EHCI: fix root hub device descriptor

On little endian machines, EHCI root hub's USB revision is reported as 0.2 --
cpu_to_le16() was missed in the initializer for the 'bcdUSB' descriptor field.
The same should be done for the 'bcdDevice' field.

Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com>
12 years agovideo: ati_radeon_fb.c: fix warning while compiling with DEBUG
Anatolij Gustschin [Thu, 8 Apr 2010 13:50:55 +0000 (15:50 +0200)]
video: ati_radeon_fb.c: fix warning while compiling with DEBUG

Fixes this warning:

ati_radeon_fb.c: In function 'radeon_probe':
ati_radeon_fb.c:598: warning: format '%x' expects type 'unsigned int',
but argument 2 has type 'void *'

Signed-off-by: Anatolij Gustschin <agust@denx.de>
12 years agoati_radeon: Support PCI virtual not eq bus mapping.
Ed Swarthout [Wed, 31 Mar 2010 20:52:40 +0000 (15:52 -0500)]
ati_radeon: Support PCI virtual not eq bus mapping.

Use pci_bus_to_virt() to convert the bus address from the BARs to
virtual address' to eliminate the direct mapping requirement.

Rename variables to better match usage (_phys -> _bus or no-suffix)

This fixes the mpc8572ds CONFIG_PHYS_64BIT mode failure:
"videoboot: Video ROM failed to map!"

Tested on mpc8572ds with and without CONFIG_PHYS_64BIT.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
12 years agoati_radeon: return with error when emulator fails
Ed Swarthout [Wed, 31 Mar 2010 14:54:28 +0000 (09:54 -0500)]
ati_radeon: return with error when emulator fails

Console was being switched to video even if emulator fails and
causing this hang:

               Scanning PCI bus 04
        04  00  1095  3132  0104  00
    PCIE3 on bus 03 - 04
Video: ATI Radeon video card (1002, 5b60) found @(2:0:0)
videoboot: Booting PCI video card bus 2, function 0, device 0
videoboot: Video ROM failed to map!
640x480x8 31kHz 59Hz
radeonfb: FIFO Timeout !

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Tested-by: Anatolij Gustschin <agust@denx.de>
12 years agovideo: cfb_console.c: add support for RLE8 bitmaps
Anatolij Gustschin [Mon, 15 Mar 2010 13:50:25 +0000 (14:50 +0100)]
video: cfb_console.c: add support for RLE8 bitmaps

Allow displaying 8-bit RLE BMP images.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Wed, 7 Apr 2010 22:26:03 +0000 (00:26 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Wed, 7 Apr 2010 22:23:11 +0000 (00:23 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Wolfgang Denk [Wed, 7 Apr 2010 22:15:11 +0000 (00:15 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Wed, 7 Apr 2010 22:06:31 +0000 (00:06 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

12 years agocfi_flash: reset timer in flash status check
Thomas Chou [Thu, 1 Apr 2010 03:15:05 +0000 (11:15 +0800)]
cfi_flash: reset timer in flash status check

This patch adds reset_timer() before the flash status check
waiting loop.

Since the timer is basically running asynchronous to the cfi
code, it is possible to call get_timer(0), then only a few
_SYSCLK_ cycles later an interrupt is generated. This causes
timeout even though much less time has elapsed. So the timer
period registers should be reset before get_timer(0) is

There is similar usage in nand_base.c.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoppc/85xx: Use CONFIG_NS16550_MIN_FUNCTIONS to reduce NAND_SPL size
Kumar Gala [Wed, 7 Apr 2010 06:34:11 +0000 (01:34 -0500)]
ppc/85xx: Use CONFIG_NS16550_MIN_FUNCTIONS to reduce NAND_SPL size

The MPC8536DS_NAND SPL build was failing due to code size increase
introduced by commit:

commit 33f57bd553edf29dffef5a6c7d76e169c79a6049
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Fri Mar 26 15:14:43 2010 -0500

    85xx: Fix enabling of L1 cache parity on secondary cores

We built in some NS16550 functions that we dont need and can get
rid of them via CONFIG_NS16550_MIN_FUNCTIONS.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agop2020ds: add alternate boot bank support using the ngPIXIS FPGA
Timur Tabi [Thu, 1 Apr 2010 15:49:42 +0000 (10:49 -0500)]
p2020ds: add alternate boot bank support using the ngPIXIS FPGA

The Freescale P2020DS board uses a new type of PIXIS FPGA, called the ngPIXIS.
The ngPIXIS has one distinct new feature: the values of the on-board switches
can be selectively overridden with shadow registers.  This feature is used to
boot from a different NOR flash bank, instead of having a register dedicated
for this purpose.  Because the ngPIXIS is so different from the previous PIXIS,
a new file is introduced: ngpixis.c.

Also update the P2020DS checkboard() function to use the new macros defined
in the header file.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agofsl: improve the PIXIS code and fix a few bugs
Timur Tabi [Wed, 31 Mar 2010 22:44:13 +0000 (17:44 -0500)]
fsl: improve the PIXIS code and fix a few bugs

Refactor and document the Freescale PIXIS code, used on most 85xx and 86xx
boards.  This makes the code easier to read and more flexible.

Delete pixis.h, because none of the exported functions were actually being
used by any other file.  Make all of the functions in pixis.c 'static'.
Remove "#include pixis.h" from every file that has it.

Remove some unnecessary #includes.

Make 'pixis_base' into a macro, so that we don't need to define it in every

Add "while(1);" loops at the end of functions that reset the board, so that
execution doesn't continue while the reset is in progress.

Replace in_8/out_8 calls with clrbits_8, setbits_8, or clrsetbits_8, where

Replace ulong/uint with their spelled-out equivalents.  Remove unnecessary
typecasts, changing the types of some variables if necessary.

it easier for specific boards to support variations in the PIXIS registers
sets.  No current boards appears to need this feature.

Fix the definition of CONFIG_SYS_PIXIS_VBOOT_MASK for the MPC8610 HPCD.
Apparently, "pixis_reset altbank" has never worked on this board.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years ago85xx: Set HID1[mbdd] on e500v2 rev5.0 or greater
Sandeep Gopalpet [Fri, 12 Mar 2010 05:15:02 +0000 (10:45 +0530)]
85xx: Set HID1[mbdd] on e500v2 rev5.0 or greater

The HID1[MBDD] bit is new on rev5.0 or greater cores and will optimize
the performance of mbar/eieio instructions.

Signed-off-by: Sandeep Gopalpet <sandeep.kumar@freescale.com>
12 years ago85xx: Added various P1012/P1013/P1021/P1022 defines
Kumar Gala [Wed, 31 Mar 2010 04:06:53 +0000 (23:06 -0500)]
85xx: Added various P1012/P1013/P1021/P1022 defines

There are various locations that we have chip specific info:

* Makefile for which ddr code to build
* Added P1012/P1013/P1021/P1022 to cpu_type_list and SVR list
* Added number of LAWs for P1012/P1013/P1021/P1022
* Set CONFIG_MAX_CPUS to 2 for P1021/P1022
* PCI port config

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoppc/8xxx: Delete PCI nodes from device tree if not configured
Kumar Gala [Tue, 30 Mar 2010 15:07:12 +0000 (10:07 -0500)]
ppc/8xxx: Delete PCI nodes from device tree if not configured

If the PCI controller wasn't configured or enabled delete from the
device tree (include its alias).

For the case that we didn't even configure u-boot with knowledge of
the controller we can use the fact that the pci_controller pointer
is NULL to delete the node in the device tree.  We determine that
a controller was not setup (because of HW config) based on the fact
that cfg_addr wasn't setup.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoBlackfin: IP04: new board port
Brent Kandetzki [Wed, 24 Mar 2010 21:41:33 +0000 (17:41 -0400)]
Blackfin: IP04: new board port

A low cost 4 port IP-PBX board.

Signed-off-by: Brent Kandetzki <BrentK@teleco.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: drop bfin #undef in linker script
Mike Frysinger [Tue, 23 Mar 2010 20:23:39 +0000 (16:23 -0400)]
Blackfin: drop bfin #undef in linker script

Now that the linker script is preprocessed with -ansi, there is no need to
manually undef the bfin define.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: call watchdog_init() for external watchdogs
Mike Frysinger [Fri, 12 Feb 2010 01:19:10 +0000 (20:19 -0500)]
Blackfin: call watchdog_init() for external watchdogs

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: link with normal ABI target
Mike Frysinger [Wed, 10 Feb 2010 06:20:44 +0000 (01:20 -0500)]
Blackfin: link with normal ABI target

If someone uses the FDPIC toolchain to compile U-Boot, make sure the
linker knows to use the normal ABI target rather than the FDPIC one.
This wasn't needed with older toolchains, but when we fixed the linker
such that the default target changed based on tuple, this broke.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: sync ptrace headers with linux
Mike Frysinger [Fri, 29 Jan 2010 20:48:28 +0000 (15:48 -0500)]
Blackfin: sync ptrace headers with linux

Scrub a lot of dead cruft in the process.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: cm-bf561: update network/env settings
Harald Krapfenbauer [Fri, 22 Jan 2010 22:15:55 +0000 (17:15 -0500)]
Blackfin: cm-bf561: update network/env settings

Switch to the SMC911X driver by default now, and fix LDR env settings.

Signed-off-by: Harald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: bf537-stamp: add board test defines
Mike Frysinger [Fri, 22 Jan 2010 04:29:18 +0000 (23:29 -0500)]
Blackfin: bf537-stamp: add board test defines

We tweak the configs a little when doing automated hardware tests.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: relax .data alignment
Mike Frysinger [Wed, 20 Jan 2010 02:02:00 +0000 (21:02 -0500)]
Blackfin: relax .data alignment

The strictest alignment on Blackfin systems is 32bits (since that is the
largest load instruction), so don't force 256byte alignment here.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: drop reference to gd->reloc_off
Mike Frysinger [Tue, 19 Jan 2010 20:39:07 +0000 (15:39 -0500)]
Blackfin: drop reference to gd->reloc_off

The reloc_off member no longer exists, so drop it.  Also change this
function so that it is always compiled and prevents latent issues like
this in the future.

Reported-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agofdt: Add fdt_del_node_and_alias helper
Kumar Gala [Tue, 30 Mar 2010 15:19:26 +0000 (10:19 -0500)]
fdt: Add fdt_del_node_and_alias helper

Add a helper function that given an alias will delete both the node
the alias points to and the alias itself

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
12 years agoBlackfin: disable NetBSD bootm support by default
Mike Frysinger [Tue, 3 Nov 2009 20:53:12 +0000 (15:53 -0500)]
Blackfin: disable NetBSD bootm support by default

There is no Blackfin/NetBSD port, so enabling support for it by default
doesn't make any sense.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years ago85xx: Add defines for BUCSR bits to make code more readable
Kumar Gala [Mon, 29 Mar 2010 18:50:31 +0000 (13:50 -0500)]
85xx: Add defines for BUCSR bits to make code more readable

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agofsl-ddr: change the default burst mode for DDR3
Dave Liu [Fri, 5 Mar 2010 04:22:00 +0000 (12:22 +0800)]
fsl-ddr: change the default burst mode for DDR3

For 64B cacheline SoC, set the fixed 8-beat burst len,
for 32B cacheline SoC, set the On-The-Fly as default.

Signed-off-by: Dave Liu <daveliu@freescale.com>
12 years agofsl-ddr: Fix the turnaround timing for TIMING_CFG_4
Dave Liu [Fri, 5 Mar 2010 04:22:00 +0000 (12:22 +0800)]
fsl-ddr: Fix the turnaround timing for TIMING_CFG_4

Read-to-read/Write-to-write turnaround for same chip select
of DDR3 memory, BL/2+2 cycles is enough for them at BC4 and
OTF case, BL/2 cycles is enough for fixed BL8.
Cutting down the turnaround from BL/2+4 to BL/2+2 or BL/2
will improve the memory performance.

Signed-off-by: Dave Liu <daveliu@freescale.com>
12 years agofsl_esdhc: Only modify the field we are changing in WML
Roy Zang [Tue, 9 Feb 2010 10:23:33 +0000 (18:23 +0800)]
fsl_esdhc: Only modify the field we are changing in WML

When we set the read or write watermark in WML we should maintain the
rest of the register as is, rather than using some hard coded value.

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agofsl_esdhc: Add function to reset the eSDHC controller
Jerry Huang [Thu, 18 Mar 2010 20:57:06 +0000 (15:57 -0500)]
fsl_esdhc: Add function to reset the eSDHC controller

To support multiple block read command we must set abort or use auto
CMD12.  If we booted from eSDHC controller neither of these are used
and thus we need to reset the controller to allow multiple block read
to function.

Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com>
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agofsl_esdhc: Always stop clock before changing frequency
Kumar Gala [Thu, 18 Mar 2010 20:51:05 +0000 (15:51 -0500)]
fsl_esdhc: Always stop clock before changing frequency

We need to stop the clocks on 83xx/85xx as well as imx.  No need to make
this code conditional to just imx.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Stefano Babic <sbabic@denx.de>
12 years agoi2c: Move PPC4xx I2C driver into drivers/i2c directory
Stefan Roese [Thu, 1 Apr 2010 12:37:24 +0000 (14:37 +0200)]
i2c: Move PPC4xx I2C driver into drivers/i2c directory

This patch moves the PPC4xx specific I2C device driver into the I2C
drivers directory. All 4xx config headers are updated to include this

Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoarm/integrator: Remove unneccessary CONFIG_PCI check.
Detlev Zundel [Wed, 31 Mar 2010 13:38:55 +0000 (15:38 +0200)]
arm/integrator: Remove unneccessary CONFIG_PCI check.

pci_eth_init() is already conditional to CONFIG_PCI so not every caller
needs to have conditionals.

This is the only place in the current code base where such a check is
still at the calling site.

Signed-off-by: Detlev Zundel <dzu@denx.de>
CC: Ben Warren <biggerbadderben@gmail.com>
CC: Peter Pearse <peter.pearse@arm.com>