]> git.dujemihanovic.xyz Git - u-boot.git/log
u-boot.git
16 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Tue, 9 Dec 2008 21:30:22 +0000 (22:30 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Tue, 9 Dec 2008 21:30:11 +0000 (22:30 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

16 years agoUSB: descriptor handling
Stefan Althoefer [Sun, 7 Dec 2008 18:39:11 +0000 (19:39 +0100)]
USB: descriptor handling

Hi,

I found a bug when working with the u-boot USB subsystem on IXP425 processor
(big endian Xscale aka ARMv5).
I recognized that the second usb_endpoint_descriptor of the attached memory
stick was corrupted.

The reason for this are the packed structures below (either u-boot and
u-boot-usb):

--------------
/* Endpoint descriptor */
struct usb_endpoint_descriptor {
unsigned char  bLength;
unsigned char  bDescriptorType;
unsigned char  bEndpointAddress;
unsigned char  bmAttributes;
unsigned short wMaxPacketSize;
unsigned char  bInterval;
unsigned char  bRefresh;
unsigned char  bSynchAddress;

} __attribute__ ((packed));
/* Interface descriptor */
struct usb_interface_descriptor {
unsigned char  bLength;
unsigned char  bDescriptorType;
unsigned char  bInterfaceNumber;
unsigned char  bAlternateSetting;
unsigned char  bNumEndpoints;
unsigned char  bInterfaceClass;
unsigned char  bInterfaceSubClass;
unsigned char  bInterfaceProtocol;
unsigned char  iInterface;

unsigned char  no_of_ep;
unsigned char  num_altsetting;
unsigned char  act_altsetting;
struct usb_endpoint_descriptor ep_desc[USB_MAXENDPOINTS];
} __attribute__ ((packed));
------------

As usb_endpoint_descriptor is only 7byte in length, the start of all
odd ep_desc[] structures is not word aligned. This makes wMaxPacketSize
of these structures also not word aligned.

ARMv5 Architecture however does not support non-aligned multibyte
data type (see A2.8 of ARM Architecture Reference Manual).

Signed-off-by: Stefan Althoefer <stefan.althoefer@web.de>
Signed-off-by: Remy Böhmer <linux@bohmer.net>
16 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Tue, 9 Dec 2008 20:16:38 +0000 (21:16 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

16 years agodrivers/fsl_pci_init: Fix compile warning
Kumar Gala [Tue, 9 Dec 2008 16:27:33 +0000 (10:27 -0600)]
drivers/fsl_pci_init: Fix compile warning

fsl_pci_init.c: In function 'fsl_pci_setup_inbound_windows':
fsl_pci_init.c:122: warning: comparison is always true due to limited range of data type

The check only makes sense if we are CONFIG_PHYS_64BIT

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agousbtty/omap: update to current API
Jean-Christophe PLAGNIOL-VILLARD [Sun, 7 Dec 2008 08:45:35 +0000 (09:45 +0100)]
usbtty/omap: update to current API

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Remy Böhmer <linux@bohmer.net>
16 years agovideo: fix FADS823 and RRvision compiling issues
Anatolij Gustschin [Tue, 9 Dec 2008 16:52:05 +0000 (17:52 +0100)]
video: fix FADS823 and RRvision compiling issues

Since commit 561858ee building for FADS823 and RRvision
doesn't work. Let's include version.h and timestamp.h
unconditionally to fix the problem.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
16 years agoMerge branch 'master' of git://git.denx.de/u-boot-at91
Wolfgang Denk [Tue, 9 Dec 2008 00:06:14 +0000 (01:06 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-at91

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Tue, 9 Dec 2008 00:00:24 +0000 (01:00 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-net

16 years agoSection name should be ".data", not "data"
Trent Piepho [Thu, 13 Nov 2008 01:29:48 +0000 (17:29 -0800)]
Section name should be ".data", not "data"

Signed-off-by: Trent Piepho <tpiepho@freescale.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMAKEALL: Automatically use parallel builds
Wolfgang Denk [Mon, 8 Dec 2008 23:39:08 +0000 (00:39 +0100)]
MAKEALL: Automatically use parallel builds

Add logic to the MAKEALL script to determine the number of CPU cores
on the system, and run a parallel build if there is more than one.
Usually this significantrly accelerates builds.

Allow to manually adjust the number of parallel make jobs by using
the "BUILD_NCPUS" environment variable.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agovxworks.h: Fix build problem introduced by commits 29a4c24d/e9084b23
Wolfgang Denk [Mon, 8 Dec 2008 23:24:30 +0000 (00:24 +0100)]
vxworks.h: Fix build problem introduced by commits 29a4c24d/e9084b23

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoavr32/bootm: remove unused variable 'ret'
Jean-Christophe PLAGNIOL-VILLARD [Tue, 11 Nov 2008 05:08:59 +0000 (06:08 +0100)]
avr32/bootm: remove unused variable 'ret'

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
16 years agoRemove unneeded CONFIG_SHELL references
Peter Tyser [Wed, 12 Nov 2008 19:06:48 +0000 (13:06 -0600)]
Remove unneeded CONFIG_SHELL references

Make should be using the bash shell by default which makes
CONFIG_SHELL unnecessary

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
16 years agoUse bash for default GNU Make shell application
Peter Tyser [Wed, 12 Nov 2008 18:33:20 +0000 (12:33 -0600)]
Use bash for default GNU Make shell application

Some Make script commands rely on bash-specific features like brace
expansion, so default to bash for the SHELL variable with a fallback
to the standard sh shell

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
16 years agojffs2: rename devices_init () in common/jffs2.c
Heiko Schocher [Wed, 12 Nov 2008 08:50:45 +0000 (09:50 +0100)]
jffs2: rename devices_init () in common/jffs2.c

rename devices_init () in common/jffs2.c to
jffs2_devices_init (), because there is also a
devices_init () in common/devices.c.

Signed-off-by: Heiko Schocher <hs@denx.de>
16 years agoSPARC: Fixed compiler error introduced by commit c160a9544743
Daniel Hellstrom [Mon, 10 Nov 2008 12:46:20 +0000 (12:46 +0000)]
SPARC: Fixed compiler error introduced by commit c160a9544743

This patch fixes a build error for the SPARC platform. It was
introduced by commit c160a9544743e80e8889edb2275538e7764ce334.

Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
16 years agomgsuvd add the board-specific part of the HDLC driver
Gary Jennejohn [Sun, 9 Nov 2008 11:50:59 +0000 (12:50 +0100)]
mgsuvd add the board-specific part of the HDLC driver

Signed-off-by: Gary Jennejohn <garyj@denx.de>
16 years agomgcoge add the board-specific part of the HDLC driver
Gary Jennejohn [Sun, 9 Nov 2008 11:45:03 +0000 (12:45 +0100)]
mgcoge add the board-specific part of the HDLC driver

Signed-off-by: Gary Jennejohn <garyj@denx.de>
16 years agokeymile add the common parts of the HDLC driver
Gary Jennejohn [Sun, 9 Nov 2008 11:36:15 +0000 (12:36 +0100)]
keymile add the common parts of the HDLC driver

This implements the ICN protocol used across the backplane and is
needed by all the keymile boards.

Signed-off-by: Gary Jennejohn <garyj@denx.de>
16 years agodrivers/bios_emulator: Move conditional compilation to Makefile
Jean-Christophe PLAGNIOL-VILLARD [Fri, 7 Nov 2008 21:46:22 +0000 (22:46 +0100)]
drivers/bios_emulator: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agocommon/cmd_ide.c: Corrected endian order printing for compact flash serial number.
Richard Retanubun [Thu, 6 Nov 2008 19:01:51 +0000 (14:01 -0500)]
common/cmd_ide.c: Corrected endian order printing for compact flash serial number.

Corrected endian order printing for compact flash serial number.

Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com>
16 years agoIOMUX: Add console multiplexing support.
Gary Jennejohn [Thu, 6 Nov 2008 14:04:23 +0000 (15:04 +0100)]
IOMUX: Add console multiplexing support.

Modifications to support console multiplexing.  This is controlled using
CONFIG_SYS_CONSOLE_MUX in the board configuration file.

This allows a user to specify multiple console devices in the environment
with a command like this: setenv stdin serial,nc.  As a result, the user can
enter text on both the serial and netconsole interfaces.

All devices - stdin, stdout and stderr - can be set in this manner.

1) common/iomux.c and include/iomux.h contain the environment setting
implementation.
2) doc/README.iomux contains a somewhat more detailed description.
3) The implementation in (1) is called from common/cmd_nvedit.c to
handle setenv and from common/console.c to handle initialization of
input/output devices at boot time.
4) common/console.c also contains the code needed to poll multiple console
devices for input and send output to all devices registered for output.
5) include/common.h includes iomux.h and common/Makefile generates iomux.o
when CONFIG_SYS_CONSOLE_MUX is set.

Signed-off-by: Gary Jennejohn <garyj@denx.de>
16 years agostrings: use puts() rather than printf()
Mike Frysinger [Tue, 4 Nov 2008 21:03:46 +0000 (16:03 -0500)]
strings: use puts() rather than printf()

When running `strings` on really long strings, the stack tends to get
smashed due to printf().  Switch to puts() instead since we're only passing
the data through.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
16 years agoUse new CONFIG_SYS_VXWORKS parameters for Netstal boards
Niklaus Giger [Mon, 3 Nov 2008 21:16:18 +0000 (22:16 +0100)]
Use new CONFIG_SYS_VXWORKS parameters for Netstal boards

Signed-off-by: Niklaus Giger <niklaus.giger@member.fsf.org>
16 years agocmd_elf.c: Cleanup bootvx and handle new CONFIG_SYS_VXWORKS parameters
Niklaus Giger [Mon, 3 Nov 2008 21:15:34 +0000 (22:15 +0100)]
cmd_elf.c: Cleanup bootvx and handle new CONFIG_SYS_VXWORKS parameters

- fix size too small by one in sprintf
- changed old (pre 2004) device name ibmEmac to emac
- boot device may be overriden in board config
- servername may be defined in board config
- additional parameters may be defined in board config
- fixed some line wrappings
- replaced  redundant MAX define by max

Signed-off-by: Niklaus Giger <niklaus.giger@member.fsf.org>
16 years agoAdd vxworks.h to handle CONFIG_SYS_VXWORKS parameters
Niklaus Giger [Mon, 3 Nov 2008 21:14:36 +0000 (22:14 +0100)]
Add vxworks.h to handle CONFIG_SYS_VXWORKS parameters

Signed-off-by: Niklaus Giger <niklaus.giger@member.fsf.org>
16 years agoREADME: Document CONFIG_SYS parameters for vxworks
Niklaus Giger [Mon, 3 Nov 2008 21:13:47 +0000 (22:13 +0100)]
README: Document CONFIG_SYS parameters for vxworks

Signed-off-by: Niklaus Giger <niklaus.giger@member.fsf.org>
16 years agolcd: Let the board code show board-specific info cleanup
Peter Tyser [Fri, 31 Oct 2008 16:12:38 +0000 (11:12 -0500)]
lcd: Let the board code show board-specific info cleanup

remove unneeded version.h from lcd.c

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoUpdate U-Boot's build timestamp on every compile
Peter Tyser [Mon, 3 Nov 2008 15:30:59 +0000 (09:30 -0600)]
Update U-Boot's build timestamp on every compile

Use the GNU 'date' command to auto-generate a new U-Boot
timestamp on every compile.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
16 years agoRemove redundant armv4 flag from arm926ejs compile flags
Remy Bohmer [Thu, 4 Dec 2008 21:25:57 +0000 (22:25 +0100)]
Remove redundant armv4 flag from arm926ejs compile flags

Currently the arm926ejs tree has the armv4 option set during compilation.
This flag does not belong here because a arm926 CPU is always a armv5 CPU.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
16 years agoat91: Choose environment variables location within make config target
Nicolas Ferre [Sat, 6 Dec 2008 12:11:14 +0000 (13:11 +0100)]
at91: Choose environment variables location within make config target

This patch adds the possiblity to choose the media where the environment will
be located. This allow to choose this fundamental configuration without editing
config files.

Documentation file added.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Stelian Pop <stelian@popies.net>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agolwmon, tqm8xx: Fix build errors
Anatolij Gustschin [Mon, 3 Nov 2008 14:30:34 +0000 (15:30 +0100)]
lwmon, tqm8xx: Fix build errors

Commit 6b59e03e0237a40a2305ea385defdfd92000978b
lcd: Let the board code show board-specific info

introduced some bugs which prevent U-Boot building
for lwmon board if CONFIG_LCD_INFO_BELOW_LOGO will
be defined in the board configuration.

Also "LCD enabled" building for TQM823L doesn't work
since this commit.

This patch fixes above-mentioned issues.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
16 years agoignore .gdb_history files
Mike Frysinger [Sun, 2 Nov 2008 05:18:18 +0000 (01:18 -0400)]
ignore .gdb_history files

When using gdb, history files will often get generated.  So ignore them.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
16 years agoFPGA: move fpga drivers to drivers/fpga
Jean-Christophe PLAGNIOL-VILLARD [Fri, 31 Oct 2008 11:26:55 +0000 (12:26 +0100)]
FPGA: move fpga drivers to drivers/fpga

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agonet: Fix TftpStart() ip:filename bug
Peter Tyser [Mon, 1 Dec 2008 22:29:38 +0000 (16:29 -0600)]
net: Fix TftpStart() ip:filename bug

The TftpStart() function modifies the 'BootFile'
string when 'BootFile' contains both an IP address
and filename (eg 1.2.3.4:/path/file). This causes
subsequent calls to TftpStart to incorrectly parse
the TFTP filename and server IP address to use.
For example:

=> tftp 0x100000 10.52.0.62:/home/ptyser/non_existant
Speed: 100, half duplex
Using eTSEC1 device
TFTP from server 10.52.0.62; our IP address is 10.52.253.79
                 ^^^^^^^^^^ CORRECT
Filename '/home/ptyser/non_existant'.
          ^^^^^^^^^^^^^^^^^^^^^^^^^ CORRECT
Load address: 0x100000
Loading: *
TFTP error: 'File not found' (1)
Starting again

eTSEC2: No link.
Speed: 100, half duplex
Using eTSEC1 device
TFTP from server 10.52.0.33; our IP address is 10.52.253.79
                 ^^^^^^^^^^ WRONG
Filename '10.52.0.62'.
          ^^^^^^^^^^ WRONG
Load address: 0x100000
Loading: *
TFTP error: 'File not found' (1)
Starting again

TftpStart() was modified to not modify the 'BootFile' string.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agonet: Add additional IP fragmentation check
Peter Tyser [Mon, 1 Dec 2008 22:26:21 +0000 (16:26 -0600)]
net: Add additional IP fragmentation check

Ignore IP packets which have the "more fragments" flag bit
set.  This flag indicates the IP packet is fragmented and
must be ignored by U-Boot.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agonet: Define IP flag field values
Peter Tyser [Mon, 1 Dec 2008 22:26:20 +0000 (16:26 -0600)]
net: Define IP flag field values

These defines were pulled from the "Add simple
IP/UDP fragmentation support" patch from Frank
Haverkamp <haver@vnet.ibm.com>.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agonet: tsec: Fix Marvell 88E1121R phy init
Anatolij Gustschin [Tue, 2 Dec 2008 09:31:04 +0000 (10:31 +0100)]
net: tsec: Fix Marvell 88E1121R phy init

This patch tries to ensure that phy interrupt pin
won't be asserted after booting. We experienced
following issues with current 88E1121R phy init:

Marvell 88E1121R phy can be hardware-configured
to share MDC/MDIO and interrupt pins for both ports
P0 and P1 (e.g. as configured on socrates board).
Port 0 interrupt pin will be shared by both ports
in such configuration. After booting Linux and
configuring eth0 interface, port 0 phy interrupts
are enabled. After rebooting without proper eth0
interface shutdown port 0 phy interrupts remain
enabled so any change on port 0 (link status, etc.)
cause assertion of the interrupt. Now booting Linux
and configuring eth1 interface will cause permanent
phy interrupt storm as the registered phy 1 interrupt
handler doesn't acknowledge phy 0 interrupts. This
of course should be fixed in Linux driver too.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agonet: Fix download command parsing
Peter Tyser [Tue, 2 Dec 2008 18:59:51 +0000 (12:59 -0600)]
net: Fix download command parsing

When CONFIG_SYS_HUSH_PARSER is defined network download
commands with 1 argument in the format 'tftp "/path/file"'
do not work as expected. The hush command parser strips
the quotes from "/path/file" which causes the network
commands to interpret "/path/file" as an address
instead of the intended filename.

The previous check for a leading quote in netboot_common()
was replaced with a check which ensures only valid
numbers are treated as addresses.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoMerge branch 'master' of git://git.denx.de/u-boot-at91
Wolfgang Denk [Thu, 4 Dec 2008 23:27:19 +0000 (00:27 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-at91

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Thu, 4 Dec 2008 23:24:32 +0000 (00:24 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Thu, 4 Dec 2008 23:17:16 +0000 (00:17 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Thu, 4 Dec 2008 23:16:21 +0000 (00:16 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

16 years agoRemove non-ascii characters from fat code
Remy Bohmer [Thu, 27 Nov 2008 21:30:27 +0000 (22:30 +0100)]
Remove non-ascii characters from fat code

This code contains some non-ascii characters in comment lines and code.
Most editors do not display those characters properly and editing those
files results always in diffs at these places which are usually not required
to be changed at all. This is error prone.

So, remove those weird characters and replace them by normal C-style
equivalents for which the proper defines were already in the header.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
16 years ago85xx: fix the wrong DDR settings for MPC8572DS
Dave Liu [Fri, 28 Nov 2008 12:16:58 +0000 (20:16 +0800)]
85xx: fix the wrong DDR settings for MPC8572DS

The default DDR freq is 400MHz or 800M data rate,
the old settings is pure wrong for the default case.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
16 years ago85xx: init gd as early as possible
Kumar Gala [Mon, 24 Nov 2008 16:29:26 +0000 (10:29 -0600)]
85xx: init gd as early as possible

Moved up the initialization of GD so C code like set_tlb() can use
gd->flags to determine if we've relocated or not in the future.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Andy Fleming <afleming@freescale.com>
16 years ago85xx: Fix relocation of CCSRBAR
Kumar Gala [Mon, 24 Nov 2008 16:29:25 +0000 (10:29 -0600)]
85xx: Fix relocation of CCSRBAR

If the virtual address for CCSRBAR is the same after relocation but
the physical address is changing we'd end up having two TLB entries with
the same VA.  Instead we new us the new CCSRBAR virt address + 4k as a
temp virt address to access the old CCSRBAR to relocate it.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Andy Fleming <afleming@freescale.com>
16 years agoFSL: Moved BR_PHYS_ADDR for localbus to common header
Kumar Gala [Mon, 24 Nov 2008 16:25:14 +0000 (10:25 -0600)]
FSL: Moved BR_PHYS_ADDR for localbus to common header

The BR_PHYS_ADDR macro is useful on all machines that have local bus
which is pretty much all 83xx/85xx/86xx chips.

Additionally most 85xx & 86xx will need it if they want to support
36-bit physical addresses.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Andy Fleming <afleming@freescale.com>
16 years ago85xx: Add PORDEVSR_PCI1 define
Peter Tyser [Mon, 1 Dec 2008 19:47:12 +0000 (13:47 -0600)]
85xx: Add PORDEVSR_PCI1 define

Add define used to determine if PCI1 interface is in PCI or PCIX mode.

Convert users of the old PORDEVSR_PCI constant to use MPC85xx_PORDEVSR_PCI1

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years agodrivers/fsl_pci_init: Fix inbound window mapping bug
Becky Bruce [Sat, 22 Nov 2008 01:24:22 +0000 (19:24 -0600)]
drivers/fsl_pci_init: Fix inbound window mapping bug

The current code will cause the creation of a 4GB window
starting at 0 if we have more than 4GB of RAM installed,
which overlaps with PCI_MEM space and causes pci_bus_to_phys()
to return erroneous information. Limit the size to 4GB - 1;
which causes the code to create one 2GB and one 1GB window
instead.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Andy Fleming <afleming@freescale.com>
16 years agoRemoved unused CONFIG_L1_INIT_RAM symbol.
Jon Loeliger [Thu, 20 Nov 2008 21:36:48 +0000 (15:36 -0600)]
Removed unused CONFIG_L1_INIT_RAM symbol.

Prevent further viral propogation of the unused
symbol CONFIG_L1_INIT_RAM by just removing it.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
16 years agofsl ddr skip interleaving if not supported.
Ed Swarthout [Wed, 29 Oct 2008 14:21:44 +0000 (09:21 -0500)]
fsl ddr skip interleaving if not supported.

Removed while(1) hang if memctl_intlv_ctl is set wrong.
Remove embedded tabs from strings.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Andy Fleming <afleming@freescale.com>
16 years ago85xx: socrates: fix DDR SDRAM tlb entry configuration
Anatolij Gustschin [Thu, 13 Nov 2008 17:08:57 +0000 (18:08 +0100)]
85xx: socrates: fix DDR SDRAM tlb entry configuration

since commit be0bd8234b9777ecd63c4c686f72af070d886517
tlb entry for socrates DDR SDRAM will be reconfigured
by setup_ddr_tlbs() from initdram() causing an
inconsistency with previously configured DDR SDRAM tlb
entry from tlb_table:

socrates>l2cam 7 9
IDX  PID      EPN  SIZE V TS           RPN U0-U3 WIMGE UUUSSS
  7 : 00 00000000 256MB V  0 -> 0_00000000  0000 -I-G- ---RWX
  8 : 00 00000000 256MB V  0 -> 0_00000000  0000 ----- ---RWX
  9 : 00 10000000 256MB V  0 -> 0_10000000  0000 ----- ---RWX

This patch makes the presence of the DDR SDRAM tlb entry in
the tlb_table dependent on CONFIG_SPD_EEPROM to avoid this
inconsistency.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Andy Fleming <afleming@freescale.com>
16 years ago85xx: Add CPU 2 errata workaround to all 8548 boards
Peter Tyser [Tue, 11 Nov 2008 16:17:10 +0000 (10:17 -0600)]
85xx: Add CPU 2 errata workaround to all 8548 boards

All mpc8548-based boards should implement the suggested workaround
to CPU 2 errata. Without the workaround, its possible for the
8548's core to hang while executing a msync or mbar 0 instruction
and a snoopable transaction from an I/O master tagged to make
quick forward progress is present.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Andy Fleming <afleming@freescale.com>
16 years ago85xx: the DDR tlb is missed for the !CONFIG_SPD_EEPROM case
Dave Liu [Tue, 28 Oct 2008 09:53:45 +0000 (17:53 +0800)]
85xx: the DDR tlb is missed for the !CONFIG_SPD_EEPROM case

we need TLB entry for DDR at !SPD case.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
16 years ago85xx: remove the unused ddr_enable_ecc in the board file
Dave Liu [Tue, 28 Oct 2008 09:53:38 +0000 (17:53 +0800)]
85xx: remove the unused ddr_enable_ecc in the board file

The DDR controller of 8548/8544/8568/8572/8536 processors
have the ECC data init feature, and the new DDR code is
using the feature, and we don't need the way with DMA to
init memory any more.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
16 years agoat91rm9200dk: Fix typo
Jean-Christophe PLAGNIOL-VILLARD [Sun, 30 Nov 2008 18:36:53 +0000 (19:36 +0100)]
at91rm9200dk: Fix typo

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoAT91: remove non supported board AT91RM9200DF macro
Jean-Christophe PLAGNIOL-VILLARD [Sun, 30 Nov 2008 18:36:50 +0000 (19:36 +0100)]
AT91: remove non supported board AT91RM9200DF macro

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agomtd/dataflash.c: fix a problem with the last partition
Ilko Iliev [Tue, 2 Dec 2008 16:27:54 +0000 (17:27 +0100)]
mtd/dataflash.c: fix a problem with the last partition

This patch fix the problem that only the [NB_DATAFLASH_AREA - 1] dataflash
partition can be defined to use the area to the end of dataflash size.
Now it is possible to have only one dataflash partition from 0 to the end
of of dataflash size.

Signed-off-by: Ilko Iliev <iliev@ronetix.at>
16 years agofix some coding style violations.
Ilko Iliev [Tue, 2 Dec 2008 16:20:17 +0000 (17:20 +0100)]
fix some coding style violations.

This patch fix some coding style violations.

Signed-off-by: Ilko Iliev <iliev@ronetix.at>
16 years agoOneNAND: Add missing mtd info struct before calling onenand_erase()
Stefan Roese [Thu, 27 Nov 2008 13:11:37 +0000 (14:11 +0100)]
OneNAND: Add missing mtd info struct before calling onenand_erase()

Without this patch "saveenv" crashes when MTD partitions are enabled (e.g.
for use in UBI) via CONFIG_MTD_PARTITIONS.

Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Scott Wood <scottwood@freescale.com>
16 years agompc8641: Fix error in README
Becky Bruce [Thu, 20 Nov 2008 22:43:52 +0000 (16:43 -0600)]
mpc8641: Fix error in README

I made some updates to the code that didn't make it into the
README - fix this

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
16 years agoRemoved unused CONFIG_L1_INIT_RAM symbol.
Jon Loeliger [Thu, 20 Nov 2008 18:01:02 +0000 (12:01 -0600)]
Removed unused CONFIG_L1_INIT_RAM symbol.

Prevent further viral propogation of the unused
symbol CONFIG_L1_INIT_RAM by just removing it.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
16 years ago86xx: Fix non-64-bit compilation problems.
Jon Loeliger [Thu, 20 Nov 2008 20:02:56 +0000 (14:02 -0600)]
86xx: Fix non-64-bit compilation problems.

Introducing 64-bit (36-bit) support for the MPC8641HPCN
failed to accomodate the other two 86xx boards.
Introduce definitions for CONFIG_SYS_CCSRBAR_PHYS_{LOW,HIGH}
CONFIG_SYS_CCSR_DEFAULT_DBAT{U,L} and CONFIG_SYS_CCSR_DEFAULT_IBAT{U,L}
with nominal 32-bit values.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Acked-by: Becky Bruce <becky.bruce@freescale.com>
16 years agoRemove obsolete command (apply afte USB style patch, 80 chars strict)
Michael Trimarchi [Wed, 26 Nov 2008 16:40:37 +0000 (17:40 +0100)]
Remove obsolete command (apply afte USB style patch, 80 chars strict)

Remove USB obsolete commmand

Signed-off-by: Michael Trimarchi <trimarchi@gandalf.sssup.it>
Signed-off-by: Remy Böhmer <linux@bohmer.net>
16 years agoUSB style patch, 80 chars strict
Michael Trimarchi [Wed, 26 Nov 2008 16:41:34 +0000 (17:41 +0100)]
USB style patch, 80 chars strict

USB Code style patch

Signed-off-by: Michael Trimarchi <trimarchi@gandalf.sssup.it>
Signed-off-by: Remy Böhmer <linux@bohmer.net>
16 years agodrivers/usb: Move conditional compilation to Makefile
Jean-Christophe PLAGNIOL-VILLARD [Fri, 7 Nov 2008 21:46:21 +0000 (22:46 +0100)]
drivers/usb: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Remy Böhmer <linux@bohmer.net>
16 years agoNAND: Fix misplaced return statement in nand_{read,write}_skip_bad().
Scott Wood [Tue, 25 Nov 2008 16:47:02 +0000 (10:47 -0600)]
NAND: Fix misplaced return statement in nand_{read,write}_skip_bad().

This caused the operation to be needlessly repeated if there were
no bad blocks and no errors.

Signed-off-by: Valeriy Glushkov <gvv@lstec.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
16 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Tue, 25 Nov 2008 11:04:41 +0000 (12:04 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Tue, 25 Nov 2008 10:47:41 +0000 (11:47 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Tue, 25 Nov 2008 10:45:34 +0000 (11:45 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-ubi
Wolfgang Denk [Tue, 25 Nov 2008 10:40:57 +0000 (11:40 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ubi

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Tue, 25 Nov 2008 10:32:10 +0000 (11:32 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

16 years agoppc4xx: ml300 remove Xilinx BSP from ml300 folder
Michal Simek [Mon, 24 Nov 2008 11:09:50 +0000 (12:09 +0100)]
ppc4xx: ml300 remove Xilinx BSP from ml300 folder

This BSP should be outside u-boot source tree.
The second reason is that xilinx ppc405 was moved to generic platform.

Signed-off-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Remove unused features
Matthias Fuchs [Mon, 24 Nov 2008 14:11:10 +0000 (15:11 +0100)]
ppc4xx: Remove unused features

This patch disables some unused features from the PCI405 configuration
to keep U-Boot image size below 192k.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Use correct io accessors for PCI405
Matthias Fuchs [Mon, 24 Nov 2008 14:11:09 +0000 (15:11 +0100)]
ppc4xx: Use correct io accessors for PCI405

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Remove unused code from PCI405 code
Matthias Fuchs [Mon, 24 Nov 2008 14:11:08 +0000 (15:11 +0100)]
ppc4xx: Remove unused code from PCI405 code

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoAT91RM9200DK: fix broken boot from NOR flash
Wolfgang Denk [Mon, 24 Nov 2008 20:50:59 +0000 (21:50 +0100)]
AT91RM9200DK: fix broken boot from NOR flash

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoat91rm9200: fix broken boot from nor flash
Jens Scharsig [Tue, 18 Nov 2008 09:48:46 +0000 (10:48 +0100)]
at91rm9200: fix broken boot from nor flash

This patch fix the broken boot from NOR Flash on AT91RM9200 boards, if
CONFIG_AT91RM9200 is defined and nor preloader is used.

Signed-off-by: Jens Scharsig <esw@bus-elektronik.de>
16 years agoUBI: Add proof-of-concept CFI flash support
Piotr Ziecik [Mon, 17 Nov 2008 14:58:00 +0000 (15:58 +0100)]
UBI: Add proof-of-concept CFI flash support

With this patch UBI can be used on CFI flash chips.

Signed-off-by: Piotr Ziecik <kosmo@semihalf.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agomtd: Remove a printf() from add_mtd_device().
Piotr Ziecik [Mon, 17 Nov 2008 14:57:59 +0000 (15:57 +0100)]
mtd: Remove a printf() from add_mtd_device().

Remove a printf() from add_mtd_device(), which produces spurious output.

Signed-off-by: Piotr Ziecik <kosmo@semihalf.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agocfi-mtd: Add cfi-mtd driver.
Piotr Ziecik [Mon, 17 Nov 2008 14:57:58 +0000 (15:57 +0100)]
cfi-mtd: Add cfi-mtd driver.

Add cfi-mtd driver, which exports CFI flash to MTD layer.
This allows CFI flash devices to be used from MTD layer.

Building of the new driver is controlled by CONFIG_FLASH_CFI_MTD
option. Initialization is done by calling cfi_mtd_init() from
flash_init().

Signed-off-by: Piotr Ziecik <kosmo@semihalf.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agocfi_flash: Add interface for flash verbosity control
Piotr Ziecik [Mon, 17 Nov 2008 14:49:32 +0000 (15:49 +0100)]
cfi_flash: Add interface for flash verbosity control

Add interface for flash verbosity control. It allows
to disable output from low-level flash API. It is useful
when calling these low-level functions from context other
than flash commands (for example the MTD/CFI interface
implmentation).

Signed-off-by: Piotr Ziecik <kosmo@semihalf.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agocfi_flash: Export flash_sector_size() function.
Piotr Ziecik [Thu, 20 Nov 2008 14:17:38 +0000 (15:17 +0100)]
cfi_flash: Export flash_sector_size() function.

Export flash_sector_size() function from drivers/mtd/cfi_flash.c,
so that it can be used in the upcoming cfi-mtd driver.

Signed-off-by: Piotr Ziecik <kosmo@semihalf.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agocfi_flash: Make all flash access functions weak
Stefan Roese [Mon, 17 Nov 2008 13:45:22 +0000 (14:45 +0100)]
cfi_flash: Make all flash access functions weak

This patch defines all flash access functions as weak so that
they can be overridden by board specific versions.

This will be used by the upcoming VCTH board support where the NOR
FLASH unfortunately can't be accessed memory-mapped. Special
accessor functions are needed here.

To enable this weak functions you need to define
CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS in your board config header.
Otherwise the "old" default functions will be used resulting
in smaller code.

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
16 years agoUBI: Change parsing of size in commands to default to hex
Stefan Roese [Mon, 24 Nov 2008 07:31:16 +0000 (08:31 +0100)]
UBI: Change parsing of size in commands to default to hex

Currently the size parameters of the UBI commands (e.g. "ubi write") are
decoded as decimal instead of hex as default. This patch now interprets
all these values consistantly as hex, as all other standard U-Boot commands
do.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: ML2 shouldn't include the 4xx EMAC driver
Stefan Roese [Fri, 21 Nov 2008 12:06:06 +0000 (13:06 +0100)]
ppc4xx: ML2 shouldn't include the 4xx EMAC driver

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: katmai: Change default config
Yuri Tikhonov [Fri, 14 Nov 2008 13:19:19 +0000 (16:19 +0300)]
ppc4xx: katmai: Change default config

 This patch enables support for EXT2, and increases the
CONFIG_SYS_BOOTMAPSZ size for the default configuration
of the katmai boards to use them as the RAID-reference
AMCC setups.

 EXT2 enabling allows one to boot kernels from the EXT2
formatted Compact Flash cards.

 CONFIG_SYS_BOOTMAPSZ increasing allows one to boot the
Linux kernels, which use PAGE_SIZE of 256KB. Otherwise,
the memory area with DTB file (which is placed at the
end of the bootmap area) will turn out to be overlapped
with the BSS segment of the 256KB kernel, and zeroed
in early_init() of Linux.

 Actually, increasing of the bootmap size could be done
via setting of the bootm_size U-Boot variable, but it looks
like the current U-Boot implementation have some bootm_size-
related functionality lost. In many places through the U-Boot
code the CONFIG_SYS_BOOTMAPSZ definition is used directly
(instead of trying to read the corresponding value from the
environment). The same is truth for the boot_jump_linux()
function in lib_ppc/bootm.c, where U-Boot transfers control
to Linux passing the CONFIG_SYS_BOOTMAPSZ (not bootm_size)
value to the booting kernel.

Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Changed 460EX/GT OCM TLB and internal SRAM initialization
Dave Mitchell [Thu, 20 Nov 2008 20:09:50 +0000 (14:09 -0600)]
ppc4xx: Changed 460EX/GT OCM TLB and internal SRAM initialization

Expanded OCM TLB to allow access to 64K OCM as well as 256K of
internal SRAM.

Adjusted internal SRAM initialization to match updated user
manual recommendation.

OCM & ISRAM are now mapped as follows:
        physical        virtual         size
ISRAM   0x4_0000_0000   0xE300_0000     256k
OCM     0x4_0004_0000   0xE304_0000     64k

A single TLB was used for this mapping.

Signed-off-by: Dave Mitchell <dmitch71@gmail.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Added ppc4xx-isram.h for internal SRAM and L2 cache DCRs
Dave Mitchell [Thu, 20 Nov 2008 20:00:49 +0000 (14:00 -0600)]
ppc4xx: Added ppc4xx-isram.h for internal SRAM and L2 cache DCRs

Added include/asm-ppc/ppc4xx-isram.h and moved internal SRAM and
L2 cache DCRs from ppc440.h to this new header.

Also converted these DCR defines from lowercase to uppercase and
modified referencing modules to use them.

Signed-off-by: Dave Mitchell <dmitch71@gmail.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Delete unused definitions for SDR0_DDRCFG from ppc4xx.h
Steven A. Falco [Thu, 20 Nov 2008 19:37:57 +0000 (14:37 -0500)]
ppc4xx: Delete unused definitions for SDR0_DDRCFG from ppc4xx.h

The definitions of bits in SDR_CFG are incorrect, and not used within
U-Boot.  Therefore, they can be removed.

The naming of the sdr_ddrdl/sdr_cfg registers do not follow conventions,
and are unused, so they can be removed too.

A definition for SDR0_DDRCFG is added.

Signed-off-by: Steven A. Falco <sfalco@harris.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoARM: OMAP: Convert IO macros
Dirk Behme [Mon, 10 Nov 2008 19:15:25 +0000 (20:15 +0100)]
ARM: OMAP: Convert IO macros

Convert IO macros to readx/writex.

Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
16 years agolib_arm: do_bootm_linux() - correct a small mistake
Ilko Iliev [Sun, 9 Nov 2008 14:53:14 +0000 (15:53 +0100)]
lib_arm: do_bootm_linux() - correct a small mistake

This patch corrects a small bug in the "if" condition:
the parameter "flag" is 0 and the "if" condition is always true.
The result is - the boom command doesn't start the kernel.
Affected targets: all arm based.

Signed-off-by: Ilko Iliev <iliev@ronetix.at>
16 years agoAT91: Enable PLLB for USB
Stelian Pop [Sat, 8 Nov 2008 23:14:46 +0000 (00:14 +0100)]
AT91: Enable PLLB for USB

At least some (old ?) versions of the AT91Bootstrap do not set up the
PLLB correctly to 48 MHz in order to make USB host function correctly.

This patch sets up the PLLB to the same values Linux uses, and makes USB
work ok on the following CPUs:
- AT91CAP9
- AT91SAM9260
- AT91SAM9263

This patch also defines CONFIG_USB_STORAGE and CONFIG_CMD_FAT for all
the relevant AT91CAP9/AT91SAM9 atmel boards.

Signed-off-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoAT91: Use AT91_CPU_CLOCK in displays
Stelian Pop [Fri, 7 Nov 2008 12:55:14 +0000 (13:55 +0100)]
AT91: Use AT91_CPU_CLOCK in displays

Introduce AT91_CPU_CLOCK and use it for displaying the CPU
speed in the LCD driver.

Also make AT91_MAIN_CLOCK and AT91_MASTER_CLOCK reflect the
corresponding board clocks.

Signed-off-by: Stelian Pop <stelian@popies.net>
16 years agoppc4xx: Clear all potentially pending exceptions in MCSR
Stefan Roese [Thu, 20 Nov 2008 10:46:20 +0000 (11:46 +0100)]
ppc4xx: Clear all potentially pending exceptions in MCSR

This is needed on Canyonlands which still has an exception pending
while running relocate_code(). This leads to a failure after trap_init()
is moved to the top of board_init_r().

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agopowerpc: 83xx: add missing TIMING_CFG1_CASLAT_* defines
Heiko Schocher [Wed, 19 Nov 2008 09:10:30 +0000 (10:10 +0100)]
powerpc: 83xx: add missing TIMING_CFG1_CASLAT_* defines

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: Improve the performance of DDR memory
Howard Gregory [Tue, 4 Nov 2008 06:55:33 +0000 (14:55 +0800)]
mpc83xx: Improve the performance of DDR memory

modify the CAS timings. my understanding is that these
settings decrease various wait times in the DDR interface.
Because these wait times are in clock cycles, and the DDR
clock on the 8315 RDB runs slower than on some other 83xx
platforms, we can dial down these values without a problem,
thereby decreasing the latency of memory a little.

Signed-off-by: Howard Gregory <Greg.Howard@freescale.com>
Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agoARM: Add Apollon UBI support
Kyungmin Park [Fri, 24 Oct 2008 12:55:33 +0000 (14:55 +0200)]
ARM: Add Apollon UBI support

To enable UBI on Apollon you need to uncomment the CONFIG_SYS_USE_UBI
macro.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Stefan Roese <sr@denx.de>