oweals/u-boot.git
14 years agodrivers/mmc/fsl_esdhc.c: fix compiler warnings
Wolfgang Denk [Sun, 9 May 2010 21:52:59 +0000 (23:52 +0200)]
drivers/mmc/fsl_esdhc.c: fix compiler warnings

Commit 77c1458d caused the following compiler warnings:

fsl_esdhc.c: In function 'esdhc_pio_read_write':
fsl_esdhc.c:142: warning: assignment discards qualifiers from pointer target type
fsl_esdhc.c: In function 'esdhc_setup_data':
fsl_esdhc.c:169: warning: unused variable 'wml_value'
fsl_esdhc.c: In function 'esdhc_pio_read_write':
fsl_esdhc.c:164: warning: control reaches end of non-void function

Fix these.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Dipen Dudhat <dipen.dudhat@freescale.com>
Cc: Andy Fleming <afleming@freescale.com>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Sat, 8 May 2010 23:16:51 +0000 (01:16 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

14 years agompc83xx/mvBLM7: add usb commands and cleanup.
Andre Schwarz [Mon, 3 May 2010 11:22:31 +0000 (13:22 +0200)]
mpc83xx/mvBLM7: add usb commands and cleanup.

Add USB commands.
Rename autoscript to bootscript.
Add automatic bootscript image generation to makefile.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: Add UPMA configuration to SIMPC8313
Ron Madrid [Wed, 28 Apr 2010 23:04:43 +0000 (16:04 -0700)]
mpc83xx: Add UPMA configuration to SIMPC8313

Added UPM array table, upmconfig, and Local Bus configuration support for SIMPC8313

Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoserial: punt unused serial_addr()
Mike Frysinger [Wed, 5 May 2010 08:32:43 +0000 (04:32 -0400)]
serial: punt unused serial_addr()

Only one file apparently defines this function, and it merely stubs
it out. So if no one is defining/calling it, punt it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoupdate include/asm/ gitignore after move
Mike Frysinger [Tue, 27 Apr 2010 18:15:34 +0000 (14:15 -0400)]
update include/asm/ gitignore after move

With the cpu include paths moved, the gitignore paths need updating.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Tom Rix <tom@bumblecow.com>
14 years agoFixup native builds on powerpc
Kumar Gala [Wed, 28 Apr 2010 07:52:02 +0000 (02:52 -0500)]
Fixup native builds on powerpc

When we changed ARCH from ppc to powerpc we need to treat HOSTARCH the
same way.  We use HOSTARCH == ARCH to determine if a build is native.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agocmd_usb.c: show cmd usage if no args given
Serge Ziryukin [Sun, 25 Apr 2010 18:32:36 +0000 (21:32 +0300)]
cmd_usb.c: show cmd usage if no args given

Signed-off-by: Serge Ziryukin <ftrvxmtrx@gmail.com>
14 years agopowerpc: Consolidate bootcount_{store|load} for PowerPC
Stefan Roese [Wed, 28 Apr 2010 08:47:36 +0000 (10:47 +0200)]
powerpc: Consolidate bootcount_{store|load} for PowerPC

This patch consolidates bootcount_{store|load} for PowerPC by
implementing a common version in arch/powerpc/lib/bootcount.c. This
code is now used by all PowerPC variants that currently have these
functions implemented.

The functions now use the proper IO-accessor functions to read/write the
values.

This code also supports two different bootcount versions:

a) Use 2 separate words (2 * 32bit) to store the bootcounter
b) Use only 1 word (2 * 16bit) to store the bootcounter

Version b) was already used by MPC5xxx.

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
          for 83xx parts
Cc: Michael Zaidman <michael.zaidman@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Anatolij Gustschin <agust@denx.de>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Wolfgang Denk [Thu, 6 May 2010 21:21:00 +0000 (23:21 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

14 years agodrivers/*/Makefile: fix conditional compile rule.
Ender.Dai [Thu, 22 Apr 2010 07:24:25 +0000 (15:24 +0800)]
drivers/*/Makefile: fix conditional compile rule.

Fix conditional compile rule for twl4030.c and videomodes.c.

Signed-off-by: Ender.Dai <ender.dai@gmail.com>
14 years agoMove test for unnecessary memmove to memmove_wd()
Larry Johnson [Tue, 20 Apr 2010 12:09:43 +0000 (08:09 -0400)]
Move test for unnecessary memmove to memmove_wd()

Signed-off-by: Larry Johnson <lrj@acm.org>
14 years agocompiler.h: add uint typedef
Mike Frysinger [Tue, 20 Apr 2010 09:49:30 +0000 (05:49 -0400)]
compiler.h: add uint typedef

Recent crc changes started using the "uint" type in headers that are used
on the build system.  This subsequently broke mingw targets as they do not
provide such a type.  So add this basic typedef to compiler.h so that we
do not have to worry about this breaking again in the future.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agocommand.c: Enable auto tab for the editenv command
Trübenbach, Ralf [Wed, 14 Apr 2010 09:15:16 +0000 (11:15 +0200)]
command.c: Enable auto tab for the editenv command

Enable the auto completion (with TAB) of the environment variable name
after the editenv command.

Signed-off-by: Ralf Trübenbach <ralf.truebenbach@men.de>
14 years ago74xx_7xx: CPCI750: Add ECC support on esd CPCI-CPU/750 board
Reinhard Arlt [Tue, 13 Apr 2010 07:59:09 +0000 (09:59 +0200)]
74xx_7xx: CPCI750: Add ECC support on esd CPCI-CPU/750 board

Add ECC support for DDR RAM for MV64360 on esd CPCI-CPU/750 board.

This patch also adds the "pldver" command to display the CPLD
revision.

Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agosc520: Fix minor DRAM Controller Setup bug
Graeme Russ [Fri, 23 Apr 2010 14:06:00 +0000 (00:06 +1000)]
sc520: Fix minor DRAM Controller Setup bug

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agosc520: Update to new AMD Copyright
Graeme Russ [Fri, 23 Apr 2010 14:05:59 +0000 (00:05 +1000)]
sc520: Update to new AMD Copyright

AMD recently changed the licensing of the RAM sizing code to the
GPLv2 (or at your option any later version)

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoeNET: Implement eNET Watchdog
Graeme Russ [Fri, 23 Apr 2010 14:05:58 +0000 (00:05 +1000)]
eNET: Implement eNET Watchdog

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoeNET: Use SC520 MMCR to reset eNET board
Graeme Russ [Fri, 23 Apr 2010 14:05:57 +0000 (00:05 +1000)]
eNET: Use SC520 MMCR to reset eNET board

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoeNET: Add PC/AT compatibility setup function
Graeme Russ [Fri, 23 Apr 2010 14:05:56 +0000 (00:05 +1000)]
eNET: Add PC/AT compatibility setup function

The eNET uses the sc520 software timers rather than the PC/AT clones

Set all interrupts and timers up to be PC/AT compatible

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoeNET: Add support for onboard RTL8100B (RTL8139) chips
Graeme Russ [Fri, 23 Apr 2010 14:05:55 +0000 (00:05 +1000)]
eNET: Add support for onboard RTL8100B (RTL8139) chips

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agosc520: Board Specific PCI Init
Graeme Russ [Fri, 23 Apr 2010 14:05:54 +0000 (00:05 +1000)]
sc520: Board Specific PCI Init

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agosc520: Move PCI defines to PCI include file
Graeme Russ [Fri, 23 Apr 2010 14:05:53 +0000 (00:05 +1000)]
sc520: Move PCI defines to PCI include file

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoeNET: Fix CONFIG_SYS_HZ to be 1000
Graeme Russ [Fri, 23 Apr 2010 14:05:52 +0000 (00:05 +1000)]
eNET: Fix CONFIG_SYS_HZ to be 1000

The clock interupt has always been 1kHz as per timer_init() in
/arch/i386/cpu/sc520/sc520_timer.c

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoeNET: Fix Flash Write
Graeme Russ [Fri, 23 Apr 2010 14:05:51 +0000 (00:05 +1000)]
eNET: Fix Flash Write

Onboard AMD Flash chip does not support buffered writes

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agosc520: Allow boards to override udelay
Graeme Russ [Fri, 23 Apr 2010 14:05:50 +0000 (00:05 +1000)]
sc520: Allow boards to override udelay

If the board has a high precision mico-second timer, it maked sense to use
it instead of the on-chip one

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: Fix support for booting bzImage
Graeme Russ [Fri, 23 Apr 2010 14:05:49 +0000 (00:05 +1000)]
x86: Fix support for booting bzImage

Add support for newer (up to 2.6.33) kernels

Add zboot command which takes the address of a bzImage as its first
argument and (optionally) the size of the bzImage as the second argument
(the second argument is needed for older kernels which do not include
the bzImage size in the header)

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: Provide weak PC/AT compatibility setup function
Graeme Russ [Fri, 23 Apr 2010 14:05:48 +0000 (00:05 +1000)]
x86: Provide weak PC/AT compatibility setup function

It is possibly to setup x86 boards to use non-PC/AT configurations. For
example, the sc520 is an x86 CPU with PC/AT and non-PC/AT peripherals.
This function allows the board to set itself up for maximum PC/AT
compatibility just before booting the Linux kernel (the Linux kernel
'just works' if everything is PC/AT compliant)

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: Use CONFIG_SERIAL_MULTI
Graeme Russ [Fri, 23 Apr 2010 14:05:47 +0000 (00:05 +1000)]
x86: Use CONFIG_SERIAL_MULTI

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoSERIAL: Enable port-mapped access
Graeme Russ [Fri, 23 Apr 2010 14:05:46 +0000 (00:05 +1000)]
SERIAL: Enable port-mapped access

The x86 architecture exclusively uses Port-Mapped I/O (inb/outb) to access
the 16550 UARTs. This patch mimics how Linux selects between Memory-Mapped
and Port-Mapped I/O. This allows x86 boards to use CONFIG_SERIAL_MUTLI and
drop the custom serial port driver

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: Fix copying of Real-Mode code into RAM
Graeme Russ [Fri, 23 Apr 2010 14:05:45 +0000 (00:05 +1000)]
x86: Fix copying of Real-Mode code into RAM

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: Pass relocation offset into Global Data
Graeme Russ [Fri, 23 Apr 2010 14:05:44 +0000 (00:05 +1000)]
x86: Pass relocation offset into Global Data

In order to locate the 16-bit BIOS code, we need to know the reloaction
offset.

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: Move GDT to a safe location in RAM
Graeme Russ [Fri, 23 Apr 2010 14:05:43 +0000 (00:05 +1000)]
x86: Move GDT to a safe location in RAM

Currently, the GDT is either located in FLASH or in the non-relocated
U-Boot image in RAM. Both of these locations are unsafe as those
locations can be erased during a U-Boot update. Move the GDT into the
highest available memory location and relocate U-Boot to just below it

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: Add RAM bootstrap functionality
Graeme Russ [Fri, 23 Apr 2010 14:05:42 +0000 (00:05 +1000)]
x86: Add RAM bootstrap functionality

Add a parameter to the 32-bit entry to indicate if entry is from Real
Mode or not. If entry is from Real Mode, execute the destructive 'sizer'
routine to determine memory size as we are booting cold and running in
Flash. If not entering from Real Mode, we are executing a U-Boot image
from RAM and therefore the memory size is already known (and running
'sizer' will destroy the running image)

There are now two 32-bit entry points. The first is the 'in RAM' entry
point which exists at the start of the U-Boot binary image. As such,
you can load u-boot.bin in RAM and jump directly to the load address
without needing to calculate any offsets. The second entry point is
used by the real-to-protected mode switch

This patch also changes TEXT_BASE to 0x6000000 (in RAM). You can load
the resulting image at 0x6000000 and simple go 0x6000000 from the u-boot
prompt

Hopefully a later patch will completely elliminate any dependency on
TEXT_BASE like a relocatable linux kernel (perfect world)

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: Split sc520 memory sizing versus reporting
Graeme Russ [Fri, 23 Apr 2010 14:05:41 +0000 (00:05 +1000)]
x86: Split sc520 memory sizing versus reporting

This patch allows the low-level assembler boot-strap to obtain the RAM
size without calling the destructive 'sizer' routine. This allows
boot-strapping from a U-Boot image loaded in RAM

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: Fix sc520 memory size reporting
Graeme Russ [Fri, 23 Apr 2010 14:05:40 +0000 (00:05 +1000)]
x86: Fix sc520 memory size reporting

There is an error in how the assembler version of the sc520 memory size
reporting code works. As a result, it will only ever report at most the
size of one bank of RAM

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: Fix do_go_exec()
Graeme Russ [Fri, 23 Apr 2010 14:05:39 +0000 (00:05 +1000)]
x86: Fix do_go_exec()

This was broken a long time ago by a49864593e083a5d0779fb9ca98e5a0f2053183d
which munged the NIOS and x86 do_go_exec()

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: Add register dump to crash handlers
Graeme Russ [Fri, 23 Apr 2010 14:05:38 +0000 (00:05 +1000)]
x86: Add register dump to crash handlers

Shamelessly steal the Linux x86 crash handling code and shove it into
U-Boot (cool - it fits). Be sure to include suitable attribution to
Linus

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: Fix MMCR Access
Graeme Russ [Fri, 23 Apr 2010 14:05:37 +0000 (00:05 +1000)]
x86: Fix MMCR Access

Change sc520 MMCR Access to use memory accessor functions

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: #ifdef out getenv_IPaddr()
Graeme Russ [Fri, 23 Apr 2010 14:05:36 +0000 (00:05 +1000)]
x86: #ifdef out getenv_IPaddr()

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agox86: Add unaligned.h
Graeme Russ [Fri, 23 Apr 2010 14:05:35 +0000 (00:05 +1000)]
x86: Add unaligned.h

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoPOST: Added ECC memory test for mpc83xx.
Michael Zaidman [Wed, 7 Apr 2010 15:30:08 +0000 (18:30 +0300)]
POST: Added ECC memory test for mpc83xx.

Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com>
Fixed minor coding style issue.
Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agocmd_onenand.c: moved to standard subcommand handling
Frans Meulenbroeks [Sat, 27 Mar 2010 16:14:36 +0000 (17:14 +0100)]
cmd_onenand.c: moved to standard subcommand handling

On the fly also fixed the following things:
- write help talked about a parameter oob, but that one was not used, so
  removed it from the help message.
- the test command also allowed a force subcommand but didn't use it.
  eliminated the code.
- do_onenand made static
- do_onenand contained
int blocksize;
...
mtd = &onenand_mtd;
this = mtd->priv;
blocksize = (1 << this->erase_shift);
  As blocksize was not used the last two statements were unneeded so
  removed them.
  The first statement (mtd = ....) assigns to a global. Not sure if it
  is needed, and since I could not test this, left the line for now

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
14 years agoppc: unused memory region too close to current stack pointer
Norbert van Bolhuis [Fri, 19 Mar 2010 14:34:25 +0000 (15:34 +0100)]
ppc: unused memory region too close to current stack pointer

This avoids a possible overwrite of the (end of) ramdisk by u-boot.
The unused memory region for ppc boot currently starts 1k below the
do_bootm->bootm_start->arch_lmb_reserve stack ptr. This isn't enough since
do_bootm->do_bootm_linux->boot_relocate_fdt calls printf which may
very well use more than 1k stack space.

Signed-off-by: Norbert van Bolhuis <nvbolhuis@aimvalley.nl>
14 years agoallow print_size to print large numbers on 32-bit systems
Timur Tabi [Tue, 13 Apr 2010 18:16:03 +0000 (13:16 -0500)]
allow print_size to print large numbers on 32-bit systems

Modify print_size() so that it can accept numbers larger than 4GB on 32-bit
systems.

Add support for display terabyte, petabyte, and exabyte sizes.  Change the
output to use International Electrotechnical Commission binary prefix standard.

Signed-off-by: Timur Tabi <timur@freescale.com>
14 years agofix print_size printing fractional gigabyte numbers on 32-bit platforms
Timur Tabi [Tue, 13 Apr 2010 18:16:02 +0000 (13:16 -0500)]
fix print_size printing fractional gigabyte numbers on 32-bit platforms

In print_size(), the math that calculates the fractional remainder of a number
used the same integer size as a physical address.  However, the "10 *" factor
of the algorithm means that a large number (e.g. 1.5GB) can overflow the
integer if we're running on a 32-bit system.  Therefore, we need to
disassociate this function from the size of a physical address.

Signed-off-by: Timur Tabi <timur@freescale.com>
14 years agoBlackfin: TWI/I2C: implement multibus support
Mike Frysinger [Wed, 5 May 2010 07:20:30 +0000 (03:20 -0400)]
Blackfin: TWI/I2C: implement multibus support

In order to do this cleanly, the register accesses have to be converted to
a C struct (base pointer), so do that in the process.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoconfigs: remove unused CONFIG_COMMAND_HISTORY
Kim Phillips [Wed, 14 Apr 2010 02:11:53 +0000 (21:11 -0500)]
configs: remove unused CONFIG_COMMAND_HISTORY

$ git grep CONFIG_COMMAND_HISTORY
CHANGELOG:    CONFIG_COMMAND_HISTORY
include/configs/AP1000.h:#define CONFIG_COMMAND_HISTORY 1
include/configs/keymile-common.h:#define CONFIG_COMMAND_HISTORY         1
include/configs/manroland/common.h:#define CONFIG_COMMAND_HISTORY               1
$

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Acked-by: Heiko Schocher <hs@denx.de>
14 years agomvsmr: fix link error
Anatolij Gustschin [Tue, 13 Apr 2010 12:47:32 +0000 (14:47 +0200)]
mvsmr: fix link error

MVSMR board support doesn't link since recent rework
of U-Boot directory structure. Fix it now.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Fixed merge conflict
Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Tue, 4 May 2010 20:57:37 +0000 (22:57 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-net

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Tue, 4 May 2010 20:49:15 +0000 (22:49 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

14 years agoBlackfin: bfin_mac: hook up new write_hwaddr function
Mike Frysinger [Tue, 27 Apr 2010 18:15:28 +0000 (14:15 -0400)]
Blackfin: bfin_mac: hook up new write_hwaddr function

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agonet: ethoc: add write_hwaddr support
Thomas Chou [Tue, 27 Apr 2010 12:20:27 +0000 (20:20 +0800)]
net: ethoc: add write_hwaddr support

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agonet: altera_tse: add write_hwaddr support
Thomas Chou [Tue, 27 Apr 2010 12:15:10 +0000 (20:15 +0800)]
net: altera_tse: add write_hwaddr support

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agonet: fec_mxc: add write_hwaddr support
Heiko Schocher [Tue, 27 Apr 2010 05:43:52 +0000 (07:43 +0200)]
net: fec_mxc: add write_hwaddr support

tested on the magnesium board.

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agonet:kirkwood_egiga.c: MAC addresses programming using write_hwaddr
Prafulla Wadaskar [Tue, 6 Apr 2010 16:51:33 +0000 (22:21 +0530)]
net:kirkwood_egiga.c: MAC addresses programming using write_hwaddr

Added a new function kwgbe_write_hwaddr for programming egiga
controller's hardware address.
This function will be called for each egiga port being used

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agoProgram net device MAC addresses after initializing
Ben Warren [Mon, 26 Apr 2010 18:11:46 +0000 (11:11 -0700)]
Program net device MAC addresses after initializing

Add a new function to the eth_device struct for programming a network
controller's hardware address.

After all network devices have been initialized and the proper MAC address
for each has been determined, make a device driver call to program the
address into the device.  Only device instances with valid unicast addresses
will be programmed.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Acked-by: Detlev Zundel <dzu@denx.de>
Tested-by: Prafulla Wadaskar <prafulla@marvell.com>
Tested-by: Heiko Schocher <hs@denx.de>
Tested-by: Thomas Chou <thomas@wytron.com.tw>
14 years agonet: add altera triple speeds ethernet mac driver
Thomas Chou [Tue, 20 Apr 2010 04:49:52 +0000 (12:49 +0800)]
net: add altera triple speeds ethernet mac driver

This driver supports the Altera triple speeds 10/100/1000 ethernet
mac.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agonet: add opencore 10/100 ethernet mac driver
Thomas Chou [Thu, 15 Apr 2010 14:32:38 +0000 (22:32 +0800)]
net: add opencore 10/100 ethernet mac driver

This patch ports the opencore 10/100 ethernet mac driver ethoc.c
from linux kernel to u-boot.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agosmc911x driver frame alignment patch
Valentin Yakovenkov [Fri, 23 Apr 2010 05:40:23 +0000 (09:40 +0400)]
smc911x driver frame alignment patch

SMSC911x chips have alignment function to allow frame payload data
(which comes after 14-bytes ethernet header) to be aligned at some
boundary when reading it from fifo (usually - 4 bytes boundary).
This is done by inserting fake zeros bytes BEFORE actual frame data when
reading from SMSC's fifo.
This function controlled by RX_CFG register. There are bits that
represents amount of fake bytes to be inserted.

Linux uses alignment of 4 bytes. Ethernet frame header is 14 bytes long,
so we need to add 2 fake bytes to get payload data aligned at 4-bytes
boundary.
Linux driver does this by adding IP_ALIGNMENT constant (defined at
skb.h) when calculating fifo data length. All network subsystem of Linux
uses this constant too when calculating different offsets.

But u-boot does not use any packet data alignment, so we don't need to
add anything when calculating fifo data length.
Moreover, driver zeros the RX_CFG register just one line up, so chip
does not insert any fake data at the beginig. So calculated data length
is always bigger by 1 word.

It seems that at almost every packet read we get an underflow condition
at fifo and possible corruption of data. Especially at continuous
transfers, such as tftp.

Just after removing this magic addition, I've got tftp transfer speed as
it aught to be at 100Mbps. It was really slow before.

It seems that fifo underflow occurs only when using byte packing on
32-bit blackfin bus (may be because of very small delay between reads).

Signed-off-by: Valentin Yakovenkov <yakovenkov@niistt.ru>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agonet: Kirkwood_egiga.c bugfixes for rx path
Prafulla Wadaskar [Tue, 6 Apr 2010 16:03:08 +0000 (21:33 +0530)]
net: Kirkwood_egiga.c bugfixes for rx path

Cosmetic changes: Few comments updated
Functionality: Rx packet frame size is programming should
be done when port is in disabled state. this is corrected

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agofec_mxc.c: Fix MX27 FEC MAC validity check
Eric Jarrige [Thu, 15 Apr 2010 22:03:19 +0000 (00:03 +0200)]
fec_mxc.c: Fix MX27 FEC MAC validity check

Fix MX27 FEC logic to check validity of the MAC address in fuse.
Only null (empty fuse) or invalid MAC address was retrieved from mx27 fuses before this change.

Signed-off-by: Eric Jarrige <jorasse@armadeus.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agotsec: Wait for both RX and TX to stop
Andy Fleming [Mon, 19 Apr 2010 19:54:49 +0000 (14:54 -0500)]
tsec: Wait for both RX and TX to stop

When gracefully stopping the controller, the driver was continuing if
*either* RX or TX had stopped.  We need to wait for both, or the
controller could get into an invalid state.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agonet: dm9000x: use standard I/O accessors
Mike Frysinger [Wed, 14 Apr 2010 20:29:06 +0000 (16:29 -0400)]
net: dm9000x: use standard I/O accessors

The current dm9000x driver accesses its memory mapped registers directly
instead of using the standard I/O accessors.  This can cause problems on
Blackfin systems as the accesses can get out of order.  So convert the
direct volatile dereferences to use the normal in/out macros.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agompc512x_fec: Move PHY initialization from probe into init routine.
Detlev Zundel [Thu, 8 Apr 2010 09:49:59 +0000 (11:49 +0200)]
mpc512x_fec: Move PHY initialization from probe into init routine.

This saves the autonegotation delay when not using ethernet in U-Boot

Signed-off-by: Detlev Zundel <dzu@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agofec_mxc don't use internal eeprom on MX25
John Rigby [Thu, 8 Apr 2010 05:29:40 +0000 (23:29 -0600)]
fec_mxc don't use internal eeprom on MX25

Avoid using the internal eeprom on MX25 like MX51 already does.

Signed-off-by: John Rigby <jcrigby@gmail.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agofix lockup in mcfmii/mii_discover_phy() in case communication fails
Wolfgang Wegner [Tue, 6 Apr 2010 09:13:02 +0000 (11:13 +0200)]
fix lockup in mcfmii/mii_discover_phy() in case communication fails

Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years ago83xx: UEC: Added support for bitBang MII driver access to PHYs
Richard Retanubun [Wed, 17 Jun 2009 20:00:41 +0000 (16:00 -0400)]
83xx: UEC: Added support for bitBang MII driver access to PHYs

This patch enabled support for having PHYs on bitBang MII and uec MII
operating at the same time. Modeled after the MPC8360ADS implementation.

Added the ability to specify which ethernet interfaces have bitbang SMI
on the board header file.

Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years ago./net/net.c - make Microsoft dns servers happy with random_port() numbers
Robin Getz [Mon, 8 Mar 2010 19:07:00 +0000 (14:07 -0500)]
./net/net.c - make Microsoft dns servers happy with random_port() numbers

For some reason, (which I can't find any documentation on), if U-Boot
gives a port number higher than 17500 to a Microsoft DNS server, the
server will reply to port 17500, and U-Boot will ignore things (since
that isn't the port it asked the DNS server to reply to).

This fixes that by ensuring the random port number is less than 17500.

Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agoRemove unused "local_crc32" function.
Detlev Zundel [Thu, 1 Apr 2010 12:16:41 +0000 (14:16 +0200)]
Remove unused "local_crc32" function.

For code archeologists, this is a nice example of copy and paste history.

Signed-off-by: Detlev Zundel <dzu@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agonet: Trivial coding style issue with empty for statement
Detlev Zundel [Wed, 31 Mar 2010 15:56:08 +0000 (17:56 +0200)]
net: Trivial coding style issue with empty for statement

Signed-off-by: Detlev Zundel <dzu@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agonet: Kirkwood_egiga.c: fixed build warnings
Prafulla Wadaskar [Wed, 3 Mar 2010 09:57:21 +0000 (15:27 +0530)]
net: Kirkwood_egiga.c: fixed build warnings

This patch fixes following build warnings for kirkwood_egiga.c

kirkwood_egiga.c: In function "kwgbe_init":
kirkwood_egiga.c:448: warning: dereferencing type-punned pointer will break strict-aliasing rules
kirkwood_egiga.c: In function "kwgbe_recv":
kirkwood_egiga.c:609: warning: dereferencing type-punned pointer will break strict-aliasing rules

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agoMerge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Wolfgang Denk [Fri, 30 Apr 2010 22:44:42 +0000 (00:44 +0200)]
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Fri, 30 Apr 2010 22:42:22 +0000 (00:42 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

14 years agopm9263 converted to at91 soc access
Asen Dimov [Mon, 19 Apr 2010 11:18:43 +0000 (14:18 +0300)]
pm9263 converted to at91 soc access

Signed-off-by: Asen Dimov <dimov@ronetix.at>
14 years agoat91: define matrix registers bit fields
Asen Dimov [Mon, 19 Apr 2010 11:17:22 +0000 (14:17 +0300)]
at91: define matrix registers bit fields

Signed-off-by: Asen Dimov <dimov@ronetix.at>
14 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>
14 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>
14 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
configurations.

Signed-off-by: Stefano Babic <sbabic@denx.de>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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

References:
http://www.globalscaletechnologies.com/t-guruplugdetails.aspx
http://plugcomputer.org

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

Signed-off-by: Siddarth Gore <gores@marvell.com>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 years agopm9263: remove CONFIG_CMD_AUTOSCRIPT
Asen Dimov [Wed, 7 Apr 2010 09:33:11 +0000 (12:33 +0300)]
pm9263: remove CONFIG_CMD_AUTOSCRIPT

Signed-off-by: Asen Dimov <dimov@ronetix.at>
14 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>
14 years agopm9261: remove CONFIG_CMD_AUTOSCRIPT
Asen Dimov [Tue, 6 Apr 2010 13:17:34 +0000 (16:17 +0300)]
pm9261: remove CONFIG_CMD_AUTOSCRIPT

Signed-off-by: Asen Dimov <dimov@ronetix.at>
14 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>
14 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>
14 years agoppc4xx: Fix APC405 build breakage
Stefan Roese [Wed, 28 Apr 2010 09:09:59 +0000 (11:09 +0200)]
ppc4xx: Fix APC405 build breakage

This patch fixes APC405 build, by defining CONFIG_PPC4XX_I2C. This is
needed since the move of the PPC4xx I2C driver into the drivers/i2c
directory.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Matthias Fuchs <matthias.fuchs@esd.eu>