oweals/u-boot.git
16 years agoMerge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master
Wolfgang Denk [Sat, 5 Jul 2008 23:15:17 +0000 (01:15 +0200)]
Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master

Conflicts:

board/amirix/ap1000/serial.c
board/exbitgen/exbitgen.c
board/exbitgen/flash.c
board/ml2/serial.c
board/xilinx/ml300/serial.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoUpdate CHANGELOG
Wolfgang Denk [Fri, 4 Jul 2008 18:11:49 +0000 (20:11 +0200)]
Update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCCM/SCM boards: fix out of tree building
Wolfgang Denk [Fri, 4 Jul 2008 18:07:35 +0000 (20:07 +0200)]
CCM/SCM boards: fix out of tree building

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoSCM board: fix build errors.
Wolfgang Denk [Thu, 3 Jul 2008 21:22:27 +0000 (23:22 +0200)]
SCM board: fix build errors.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoIAD210 board: fix ``"ALIGN" redefined'' warning.
Wolfgang Denk [Thu, 3 Jul 2008 21:06:36 +0000 (23:06 +0200)]
IAD210 board: fix ``"ALIGN" redefined'' warning.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCCM board: fix build errors.
Wolfgang Denk [Thu, 3 Jul 2008 21:00:24 +0000 (23:00 +0200)]
CCM board: fix build errors.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agosacsng board: fix warnings "suggest explicit braces to avoid ambiguous 'else'"
Wolfgang Denk [Thu, 3 Jul 2008 20:39:21 +0000 (22:39 +0200)]
sacsng board: fix warnings "suggest explicit braces to avoid ambiguous 'else'"

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCleanup: fix "expected specifier-qualifier-list before 'phys_size_t'" errors
Wolfgang Denk [Thu, 3 Jul 2008 20:34:08 +0000 (22:34 +0200)]
Cleanup: fix "expected specifier-qualifier-list before 'phys_size_t'" errors

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agolmb: fix "implicit declaration of function 'lmb_free'" warning
Wolfgang Denk [Thu, 3 Jul 2008 20:04:17 +0000 (22:04 +0200)]
lmb: fix "implicit declaration of function 'lmb_free'" warning

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCleanup: remove redundant deleting on *~ files
Wolfgang Denk [Wed, 2 Jul 2008 21:53:23 +0000 (23:53 +0200)]
Cleanup: remove redundant deleting on *~ files

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCleanup out-or-tree building for some boards (.depend)
Wolfgang Denk [Wed, 2 Jul 2008 21:49:18 +0000 (23:49 +0200)]
Cleanup out-or-tree building for some boards (.depend)

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCleanup: fix out-of-tree building for some boards
Wolfgang Denk [Wed, 2 Jul 2008 21:38:50 +0000 (23:38 +0200)]
Cleanup: fix out-of-tree building for some boards

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCleanup: replace hard-wired $(AR) 'crv' settings by $(ARFLAGS)
Wolfgang Denk [Wed, 2 Jul 2008 21:00:14 +0000 (23:00 +0200)]
Cleanup: replace hard-wired $(AR) 'crv' settings by $(ARFLAGS)

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agofdt: Fix typo in variable name.
Detlev Zundel [Fri, 20 Jun 2008 20:26:24 +0000 (22:26 +0200)]
fdt: Fix typo in variable name.

Signed-off-by: Detlev Zundel <dzu@denx.de>
16 years agoAdd logos for RRvision board
Gary Jennejohn [Thu, 19 Jun 2008 09:11:19 +0000 (11:11 +0200)]
Add logos for RRvision board

Signed-off-by: Gary Jennejohn <garyj@denx.de>
16 years agompc8260: add fdt_fixup_ethernet support
Esben Haabendal [Wed, 18 Jun 2008 09:03:57 +0000 (11:03 +0200)]
mpc8260: add fdt_fixup_ethernet support

Add support for updating mac-address and local-mac-address in fdt for
all MPC8260 targets.

Signed-off-by: Esben Haabendal <eha@doredevelopment.dk>
16 years agocmd_nvedit.c: clean up syntax highlighting
Steven A. Falco [Thu, 12 Jun 2008 17:24:42 +0000 (13:24 -0400)]
cmd_nvedit.c: clean up syntax highlighting

My text-editor (vim) has a bit of trouble syntax-highlighting the
cmd_nvedit.c file, because it apparently does not parse C
ifdef/else/endif. The following patch does not change the behavior of
the code at all, but does allow the editor to properly
syntax-highlight the file.

Signed-off-by: Steve Falco <sfalco@harris.com>
16 years agoMake setenv() return status
Steven A. Falco [Thu, 12 Jun 2008 17:22:12 +0000 (13:22 -0400)]
Make setenv() return status

Currently, the setenv function does not return an error code.
This patch allows to test for errors.

Signed-off-by: Steve Falco <sfalco@harris.com>
16 years agoPPC: Added fls, fls64, __ilog2_u64, and ffs64 to bitops
Kumar Gala [Wed, 11 Jun 2008 15:14:06 +0000 (10:14 -0500)]
PPC: Added fls, fls64, __ilog2_u64, and ffs64 to bitops

fls64, __ilog2_u64, ffs64 are variants that work on an u64,
and fls is used to implement them.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoi.MX31: Cleanup comments in lowlevel_init.S.
Magnus Lilja [Mon, 9 Jun 2008 20:58:48 +0000 (22:58 +0200)]
i.MX31: Cleanup comments in lowlevel_init.S.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
16 years agoMove conditional compilation of MPC8XXX SPI driver to Makefile
Ben Warren [Mon, 9 Jun 2008 06:28:33 +0000 (23:28 -0700)]
Move conditional compilation of MPC8XXX SPI driver to Makefile

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoi.MX31: fixed CTRL-C detection
Juergen Kilb [Sun, 8 Jun 2008 15:59:53 +0000 (17:59 +0200)]
i.MX31: fixed CTRL-C detection

The Register URXD contains status information in bits [15..8].
With status bit 15 set, CTRL-C was reported as 0x8003 instead
of 0x03. Therefore CTRL-C was not detected.
To solve this, bits [15..8] were masked out now.

Signed-off-by: Juergen Kilb <J.Kilb@gmx.de>
Acked-by: Felix Radensky <felix@embedded-sol.com>
16 years agoadd SHA256 support
Jean-Christophe PLAGNIOL-VILLARD [Sat, 7 Jun 2008 10:29:52 +0000 (12:29 +0200)]
add SHA256 support

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Francesco Albanese <Francesco.Albanese@swisscom.com>
16 years agoDelay FIT format check on sector based devices
Marian Balakowicz [Fri, 6 Jun 2008 21:07:40 +0000 (23:07 +0200)]
Delay FIT format check on sector based devices

Global FIT image operations like format check cannot be performed on
a first sector data, defer them to the point when whole FIT image was
uploaded to a system RAM.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Partial ('cmd_nand' case) Acked-by: Grant Erickson <gerickson@nuovations.com>
NAND and DOC bits Acked-by: Scott Wood <scottwood@freescale.com>

16 years agosata: wait for device updating signature to host
Dave Liu [Tue, 3 Jun 2008 09:38:19 +0000 (17:38 +0800)]
sata: wait for device updating signature to host

The driver need wait for the device updating signature to host.
If we don't wait for it, the driver can not detect the device(disk)
when the system powers up.

Signed-off-by: Dave Liu <daveliu@freescale.com>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Detlev Zundel [Mon, 30 Jun 2008 13:35:34 +0000 (15:35 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx

16 years agoppc4xx: Fix 460EX errata with CPU lockup upon high AHB traffic
Stefan Roese [Sat, 28 Jun 2008 12:56:17 +0000 (14:56 +0200)]
ppc4xx: Fix 460EX errata with CPU lockup upon high AHB traffic

This patch implements a fix provided by AMCC so that the lockup upon
simultanious traffic on AHB USB OTG, USB 2.0 and SATA doesn't occur
anymore:

Set SDR0_AHB_CFG[A2P_INCR4] (bit 24) and clear SDR0_AHB_CFG[A2P_PROT2]
(bit 25) for a new 460EX errata regarding concurrent use of AHB USB OTG,
USB 2.0 host and SATA.

This errata is not officially available yet. I'll update the comment
to add the errata number later.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoserial_pl010.c: add watchdog support
Stuart Wood [Mon, 2 Jun 2008 20:42:19 +0000 (16:42 -0400)]
serial_pl010.c: add watchdog support

Signed-off-by: Stuart Wood <stuart.wood@labxtechnologies.com>
16 years agojffs2_1pass.c: add watchdog support
Stuart Wood [Mon, 2 Jun 2008 20:40:08 +0000 (16:40 -0400)]
jffs2_1pass.c: add watchdog support

Signed-off-by: Stuart Wood <stuart.wood@labxtechnologies.com>
16 years agoConfigure DSP POST; add watchdog reset to diag command
Sascha Laue [Fri, 30 May 2008 07:48:14 +0000 (09:48 +0200)]
Configure DSP POST; add watchdog reset to diag command

Signed-off-by: Sascha Laue <sascha.laue@liebherr.com>
16 years agoAdd sata sil3114 support
Tor Krill [Thu, 29 May 2008 08:40:17 +0000 (10:40 +0200)]
Add sata sil3114 support

Signed-off-by: Tor Krill <tor@excito.com>
16 years agoCoding Style Cleanup
Wolfgang Denk [Sat, 28 Jun 2008 21:34:37 +0000 (23:34 +0200)]
Coding Style Cleanup

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoUpdate CHANGELOG
Wolfgang Denk [Sat, 28 Jun 2008 21:16:01 +0000 (23:16 +0200)]
Update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoARM: Add support for Lyrtech SFF-SDR board (ARM926EJS)
Hugo Villeneuve [Wed, 21 May 2008 17:58:41 +0000 (13:58 -0400)]
ARM: Add support for Lyrtech SFF-SDR board (ARM926EJS)

This patch adds support for the Lyrtech SFF-SDR board,
based on the TI DaVinci architecture (ARM926EJS).

Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMMC: Consolidate MMC/SD command definitions
Haavard Skinnemoen [Thu, 22 May 2008 09:09:59 +0000 (11:09 +0200)]
MMC: Consolidate MMC/SD command definitions

This moves the MMC and SD Card command definitions from
include/asm/arch/mmc.h into include/mmc.h. These definitions are
given by the MMC and SD Card standards, not by any particular
architecture.

There's a lot more room for consolidation in the MMC drivers which
I'm hoping to get done eventually, but this patch is a start.

Compile-tested for all avr32 boards as well as lpc2292sodimm and
lubbock. This should cover all three mmc drivers in the tree.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
16 years agoUse better Ethernet timings for apollon board
Kyungmin Park [Wed, 21 May 2008 05:38:08 +0000 (14:38 +0900)]
Use better Ethernet timings for apollon board

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
16 years agoResize device tree to allow space for board changes and the chosen node
Andy Fleming [Mon, 16 Jun 2008 18:58:56 +0000 (13:58 -0500)]
Resize device tree to allow space for board changes and the chosen node

Current code requires that a compiled device tree have space added to the end to
leave room for extra nodes added by board code (and the chosen node).  This
requires that device tree creators anticipate how much space U-Boot will add to
the tree, which is absurd.  Ideally, the code would resize and/or relocate the
tree when it needed more space, but this would require a systemic change to the
fdt code, which is non-trivial.  Instead, we resize the tree inside
boot_relocate_fdt, reserving either the remainder of the bootmap (in the case
where the fdt is inside the bootmap), or adding CFG_FDT_PAD bytes to the size.

Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years agoFix an underflow bug in __lmb_alloc_base
Andy Fleming [Mon, 16 Jun 2008 18:58:55 +0000 (13:58 -0500)]
Fix an underflow bug in __lmb_alloc_base

__lmb_alloc_base can underflow if it fails to find free space.  This was fixed
in linux with commit d9024df02ffe74d723d97d552f86de3b34beb8cc.  This patch
merely updates __lmb_alloc_base to resemble the current version in Linux.

Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years agoAdd lmb_free
Andy Fleming [Mon, 16 Jun 2008 18:58:54 +0000 (13:58 -0500)]
Add lmb_free

lmb_free allows us to unreserve some memory so we can use lmb_alloc_base or
lmb_reserve to temporarily reserve some memory.

Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years agoAdd ALIGN() macro
Andy Fleming [Mon, 16 Jun 2008 18:58:53 +0000 (13:58 -0500)]
Add ALIGN() macro

ALIGN() returns the smallest aligned value greater than the passed
in address or size.  Taken from Linux.

Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years agoppc4xx: Fix compilation problems with phys_size_t
Stefan Roese [Tue, 24 Jun 2008 15:15:22 +0000 (17:15 +0200)]
ppc4xx: Fix compilation problems with phys_size_t

This patch includes <asm/types.h> before <asm/u-boot.h> in some 4xx
board specific files where it has been missing.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoConditionally add -fno-stack-protector to CFLAGS
Haavard Skinnemoen [Mon, 19 May 2008 10:26:38 +0000 (12:26 +0200)]
Conditionally add -fno-stack-protector to CFLAGS

When compile-testing on powerpc, I get errors like this:

net/nfs.c:422: undefined reference to `__stack_chk_fail_local'

This seems to be because -fstack-protector is on by default, so
let's explicitly disable it on all architectures that support the
option.

The Ubuntu toolchain is affected by this problem, and according to
Mike Frysinger, Gentoo has been running with SSP enabled for years.
More and more distros are turning SSP on by default, so this problem
is likely to get worse in the future.

Also, powerpc just happens to be one of the arches I do
compile-testing on. There may be other arches affected by this too.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
16 years agopcmcia/ti_pci1410a: Move compile condition to the Makefile
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 May 2008 17:09:52 +0000 (19:09 +0200)]
pcmcia/ti_pci1410a: Move compile condition to the Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agopxa_pcmcia: Move compile condition to the Makefile
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 May 2008 17:09:51 +0000 (19:09 +0200)]
pxa_pcmcia: Move compile condition to the Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agomarabun_pcmcia: Move compile condition to the Makefile
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 May 2008 17:09:50 +0000 (19:09 +0200)]
marabun_pcmcia: Move compile condition to the Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoppc4xx: Fix problem in gpio_config()
Stefan Roese [Mon, 23 Jun 2008 09:15:09 +0000 (11:15 +0200)]
ppc4xx: Fix problem in gpio_config()

As pointed out by Guennadi Liakhovetski (thanks), pin2 is already shifted
left by one. So the additional shift is bogus.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agofdt: Fix typo in variable name.
Detlev Zundel [Fri, 20 Jun 2008 20:24:05 +0000 (22:24 +0200)]
fdt: Fix typo in variable name.

Signed-off-by: Detlev Zundel <dzu@denx.de>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
Wolfgang Denk [Thu, 19 Jun 2008 20:58:36 +0000 (22:58 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-cfi-flash

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Wolfgang Denk [Thu, 19 Jun 2008 20:57:58 +0000 (22:57 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-nand-flash
Wolfgang Denk [Thu, 19 Jun 2008 20:57:06 +0000 (22:57 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-nand-flash

16 years agoMPC8360ERDK: adapt NAND interface for the re-written FSL NAND UPM driver
Wolfgang Grandegger [Thu, 5 Jun 2008 11:02:30 +0000 (13:02 +0200)]
MPC8360ERDK: adapt NAND interface for the re-written FSL NAND UPM driver

This patch is based on the following patch sent a few minutes ago:
"NAND FSL UPM: driver re-write using the hwcontrol callback"
It is untested, of course. Anton, could you please give it a try.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Anton Vorontsov <avorontsov@ru.mvista.com>
16 years agoFix 4xx build issue
Anatolij Gustschin [Thu, 12 Jun 2008 10:40:11 +0000 (12:40 +0200)]
Fix 4xx build issue

Building for 4xx doesn't work since commit 4dbdb768:

In file included from 4xx_pcie.c:28:
include/asm/processor.h:971: error: expected ')' before 'ver'
make[1]: *** [4xx_pcie.o] Error 1

This patch fixes the problem.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
16 years agocfi-flash: Fix problem in flash_toggle(), busy was not detected reliably
Stefan Roese [Mon, 16 Jun 2008 08:40:02 +0000 (10:40 +0200)]
cfi-flash: Fix problem in flash_toggle(), busy was not detected reliably

This patch simplifies flash_toggle() (AMD commandset), which is used to
detect if a FLASH device is still busy with erase/program operations. On
800MHz Canyonlands/Glacier boards (460EX/GT) the current implementation
did not detect the busy state reliably, resulting in non erased sectors
etc. This patch now simplifies this function by "just" comparing the
complete data-word instead of ANDing it with the command-word (0x40)
before the compatison. It is done the same way in the Linux implementation
chip_ready() in cfi_cmdset_0002.c.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoNAND: Add missing declaration to non-redundant saveenv().
Philip Balister [Mon, 16 Jun 2008 12:58:07 +0000 (08:58 -0400)]
NAND: Add missing declaration to non-redundant saveenv().

Signed-off-by: Scott Wood <scottwood@freescale.com>
16 years agoMPC8360ERDK: adapt NAND interface for the re-written FSL NAND UPM driver
Wolfgang Grandegger [Mon, 2 Jun 2008 13:09:55 +0000 (15:09 +0200)]
MPC8360ERDK: adapt NAND interface for the re-written FSL NAND UPM driver

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
16 years agoppc4xx: Canyonlands: Disable the RTC M41T62 square wave output
Stefan Roese [Tue, 10 Jun 2008 13:34:11 +0000 (15:34 +0200)]
ppc4xx: Canyonlands: Disable the RTC M41T62 square wave output

This patch disables the square wave output of the M41T62 RTC used on
Canyonlands & Glacier. Here the explanation:

The serial real-time clock part used in the design is an
STMicro M41T62. This part has a full-time 32KHz square wave
output that is connected to the TmrClk input to the
processor. The default state for this square wave output is
enabled so the output runs continuously when the board is
powered normally and also from the battery. The TmrClk input
to the processor goes to ground when the power is removed
from the board/processor, and therefore the running square
wave output is driving ground which drains the battery quickly.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoFix build issue with string.h and linux/string.h
Andy Fleming [Wed, 11 Jun 2008 23:10:20 +0000 (18:10 -0500)]
Fix build issue with string.h and linux/string.h

This commit:
commit 338cc038461a6c7709c5b86fd9a240209338a1ae
Author: Wolfgang Denk <wd@denx.de>
Date:   Fri Jun 6 14:28:14 2008 +0200

    tools/mkimage: fix compiler warnings on some systems.

Broke building on some systems, because the host's string.h was interfering
with u-boot's linux/string.h.  It doesn't look like we need the u-boot one if
we're building for the host, so now we only include when building inside
u-boot.

Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years agoChange initdram() return type to phys_size_t
Becky Bruce [Mon, 9 Jun 2008 21:03:40 +0000 (16:03 -0500)]
Change initdram() return type to phys_size_t

This patch changes the return type of initdram() from long int to phys_size_t.
This is required for a couple of reasons: long int limits the amount of dram
to 2GB, and u-boot in general is moving over to phys_size_t to represent the
size of physical memory.  phys_size_t is defined as an unsigned long on almost
all current platforms.

This patch *only* changes the return type of the initdram function (in
include/common.h, as well as in each board's implementation of initdram).  It
does not actually modify the code inside the function on any of the platforms;
platforms which wish to support more than 2GB of DRAM will need to modify
their initdram() function code.

Build tested with MAKEALL for ppc, arm, mips, mips-el. Booted on powerpc
MPC8641HPCN.

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
16 years agoChange lmb to use phys_size_t/phys_addr_t
Becky Bruce [Tue, 10 Jun 2008 01:37:18 +0000 (20:37 -0500)]
Change lmb to use phys_size_t/phys_addr_t

This updates the lmb code to use phys_size_t
and phys_addr_t instead of unsigned long.  Other code
which interacts with this code, like getenv_bootm_size()
is also updated.

Booted on MPC8641HPCN, build-tested ppc, arm, mips.

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
16 years agoChange print_size to take phys_size_t
Becky Bruce [Tue, 10 Jun 2008 01:37:17 +0000 (20:37 -0500)]
Change print_size to take phys_size_t

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
16 years agoChange bd/gd memsize/ram_size to be phys_size_t.
Becky Bruce [Tue, 10 Jun 2008 01:37:16 +0000 (20:37 -0500)]
Change bd/gd memsize/ram_size to be phys_size_t.

Currently, both are defined as an unsigned long, but
should be phys_size_t. This should result in no real change,
since phys_size_t is currently an unsigned long for all the
default configs.  Also add print_lnum to cmd_bdinfo to deal
with the potentially wider memsize.

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-sh
Wolfgang Denk [Wed, 11 Jun 2008 20:54:47 +0000 (22:54 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-sh

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mips
Wolfgang Denk [Wed, 11 Jun 2008 20:48:09 +0000 (22:48 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mips

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-fdt
Wolfgang Denk [Wed, 11 Jun 2008 20:30:47 +0000 (22:30 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-fdt

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
Wolfgang Denk [Wed, 11 Jun 2008 20:24:46 +0000 (22:24 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-cfi-flash

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-nand-flash
Wolfgang Denk [Wed, 11 Jun 2008 20:23:09 +0000 (22:23 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-nand-flash

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-net
Wolfgang Denk [Wed, 11 Jun 2008 20:17:42 +0000 (22:17 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-net

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Wolfgang Denk [Wed, 11 Jun 2008 20:13:07 +0000 (22:13 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Wolfgang Denk [Wed, 11 Jun 2008 19:33:16 +0000 (21:33 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mpc85xx

Conflicts:

include/asm-ppc/fsl_lbc.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Wolfgang Denk [Wed, 11 Jun 2008 19:27:31 +0000 (21:27 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mpc83xx

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
Wolfgang Denk [Wed, 11 Jun 2008 19:23:16 +0000 (21:23 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mpc86xx

16 years agoFSL LAW: Add new interface to use the last free LAW
Kumar Gala [Tue, 10 Jun 2008 21:16:02 +0000 (16:16 -0500)]
FSL LAW: Add new interface to use the last free LAW

LAWs have the concept of priority so its useful to be able to allocate
the lowest (highest number) priority.  We will end up using this with the
new DDR code.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years ago85xx/86xx: Move to dynamic mgmt of LAWs
Kumar Gala [Wed, 11 Jun 2008 05:51:45 +0000 (00:51 -0500)]
85xx/86xx: Move to dynamic mgmt of LAWs

With the new LAW interface (set_next_law) we can move to letting the
system allocate which LAWs are used for what purpose.  This makes life
a bit easier going forward with the new DDR code.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Acked-by: Jon Loeliger <jdl@freescale.com>
Acked-by: Becky Bruce <becky.bruce@freescale.com>
16 years agoFSL LAW: Keep track of LAW allocations
Kumar Gala [Wed, 11 Jun 2008 05:44:10 +0000 (00:44 -0500)]
FSL LAW: Keep track of LAW allocations

Make it so we keep track of which LAWs have allocated and provide
a function (set_next_law) which can allocate a LAW for us if one is
free.

In the future we will move to doing more "dynamic" LAW allocation
since the majority of users dont really care about what LAW number
they are at.

Also, add CONFIG_MPC8540 or CONFIG_MPC8560 to those boards which needed them

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years ago85xx: remove dummy board_early_init_f
Kumar Gala [Tue, 10 Jun 2008 03:31:57 +0000 (22:31 -0500)]
85xx: remove dummy board_early_init_f

A number of board ports have empty version of board_early_init_f
for no reason since we control its via CONFIG_BOARD_EARLY_INIT_F.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoMPC8544DS: Update config.h
Kumar Gala [Mon, 9 Jun 2008 23:55:38 +0000 (18:55 -0500)]
MPC8544DS: Update config.h

* Enable flash progress
* remove CLEAR_LAW0 since we dont really use it

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years ago85xx: Remove unused and unconfigured memory test code.
Kumar Gala [Mon, 9 Jun 2008 18:37:24 +0000 (13:37 -0500)]
85xx: Remove unused and unconfigured memory test code.

Remove unused and unconfigured DDR test code from FSL 85xx boards.
Besides, other common code exists.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoSocrates: Added FPGA base address update in FDT.
Sergei Poselenov [Fri, 6 Jun 2008 13:42:45 +0000 (15:42 +0200)]
Socrates: Added FPGA base address update in FDT.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agoSocrates: NAND support added. Changed the U-Boot base address and
Sergei Poselenov [Fri, 6 Jun 2008 13:42:44 +0000 (15:42 +0200)]
Socrates: NAND support added. Changed the U-Boot base address and

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agoNAND: Added support for 128-bit OOB, adapted
Sergei Poselenov [Fri, 6 Jun 2008 13:42:43 +0000 (15:42 +0200)]
NAND: Added support for 128-bit OOB, adapted

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agoSocrates: added missed file with UPMA configuration data.
Sergei Poselenov [Fri, 6 Jun 2008 13:42:42 +0000 (15:42 +0200)]
Socrates: added missed file with UPMA configuration data.

Signed-of-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agoSocrates: Added FPGA mapping. LAWs and TLBs cleanup.
Sergei Poselenov [Fri, 6 Jun 2008 13:42:41 +0000 (15:42 +0200)]
Socrates: Added FPGA mapping. LAWs and TLBs cleanup.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agoAdded the upmconfig() function for 85xx.
Sergei Poselenov [Fri, 6 Jun 2008 13:42:40 +0000 (15:42 +0200)]
Added the upmconfig() function for 85xx.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years agoSocrates: config file cleanup.
Sergei Poselenov [Fri, 6 Jun 2008 13:42:39 +0000 (15:42 +0200)]
Socrates: config file cleanup.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
16 years agoTQM85xx: Change memory map to support Flash memory > 128 MiB
Wolfgang Grandegger [Thu, 5 Jun 2008 11:12:10 +0000 (13:12 +0200)]
TQM85xx: Change memory map to support Flash memory > 128 MiB

Some TQM85xx boards could be equipped with up to 1 GiB (NOR) Flash
memory. The current memory map only supports up to 128 MiB Flash.
This patch adds the configuration option CONFIG_TQM_BIGFLASH. If
set, up to 1 GiB flash is supported. To achieve this, the memory
map has to be adjusted in great parts (for example the CCSRBAR is
moved from 0xE0000000 to 0xA0000000).

If you want to boot Linux with CONFIG_TQM_BIGFLASH set, the new
memory map also has to be considered in the kernel (changed
CCSRBAR address, changed PCI IO base address, ...). Please use
an appropriate Flat Device Tree blob (tqm8548.dtb).

Signed-off-by: Martin Krause <martin.krause@tqs.de>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
16 years agoTQM85xx: NAND support via local bus UPMB
Wolfgang Grandegger [Thu, 5 Jun 2008 11:12:09 +0000 (13:12 +0200)]
TQM85xx: NAND support via local bus UPMB

This patch adds support for NAND FLASH on the TQM8548. It is disabled by
default and can be enabled for the TQM8548 modules. It is now based on
the re-written FSL NAND UPM driver. A patch has been posted earlier today
with the subject:

"NAND FSL UPM: driver re-write using the hwcontrol callback"

Note that the R/B pin is not supported by that module requiring to use
the specified maximum delay time.

Note: With NAND support enabled the size of the U-Boot image exceeds
256 KB and TEXT_BASE must therefore be set to 0xfff80000 in config.mk,
doubling the image size :-(.

Signed-off-by: Thomas Waehner <thomas.waehner@tqs.de>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
16 years agoTQM8548: PCI express support
Wolfgang Grandegger [Thu, 5 Jun 2008 11:12:08 +0000 (13:12 +0200)]
TQM8548: PCI express support

This patch adds support for PCI express cards. The board support
now uses common FSL PCI init code, for both, PCI and PCIe on all
TQM85xx modules.

Signed-off-by: Thomas Waehner <thomas.waehner@tqs.de>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
16 years agoTQM8548: Basic support for the TQM8548 modules
Wolfgang Grandegger [Thu, 5 Jun 2008 11:12:07 +0000 (13:12 +0200)]
TQM8548: Basic support for the TQM8548 modules

This patch adds basic support for the TQM8548 module from TQ-Components
(http://www.tqc.de/) including DDR2 SDRAM initialisation and support for
eTSEC 3 and 4

Furthermore Flash buffer write has been enabled to speed up output to
the Flash by approx. a factor of 10.

Signed-off-by: Thomas Waehner <thomas.waehner@tqs.de>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
16 years agoTQM85xx: Support for Flat Device Tree
Wolfgang Grandegger [Thu, 5 Jun 2008 11:12:06 +0000 (13:12 +0200)]
TQM85xx: Support for Flat Device Tree

This patch adds support for Linux kernels using the Flat Device Tree.
It also re-defines the default environment settings for booting Linux
with the FDT blob.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
16 years agoTQM85xx: Support for Intel 82527 compatible CAN controller
Wolfgang Grandegger [Thu, 5 Jun 2008 11:12:05 +0000 (13:12 +0200)]
TQM85xx: Support for Intel 82527 compatible CAN controller

This patch adds initialization of the UPMC RAM to support up to two
Intel 82527 compatible CAN controller on the TQM85xx modules.

Signed-off-by: Thomas Waehner <thomas.waehner@tqs.de>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
16 years agoTQM85xx: Bugfix in the SDRAM initialisation
Wolfgang Grandegger [Thu, 5 Jun 2008 11:12:04 +0000 (13:12 +0200)]
TQM85xx: Bugfix in the SDRAM initialisation

The CS0_BNDS register is now set according to the detected
memory size.

Signed-off-by Martin Krause <martin.krause@tqs.de>

16 years agoTQM85xx: Fix chip select configuration for second FLASH bank
Wolfgang Grandegger [Thu, 5 Jun 2008 11:12:03 +0000 (13:12 +0200)]
TQM85xx: Fix chip select configuration for second FLASH bank

This patch fixes the re-calculation of the automatic chip select
configuration for boards with two populated FLASH banks.

Signed-off-by: Martin Krause <martin.krause@tqs.de>
16 years agoTQM85xx: Support for Spansion 'N' type flashes added
Wolfgang Grandegger [Thu, 5 Jun 2008 11:12:02 +0000 (13:12 +0200)]
TQM85xx: Support for Spansion 'N' type flashes added

The 'N' type Spansion flashes (S29GLxxxN series) have bigger sectors,
than the formerly used 'M' types (S29GLxxxM series), so the flash layout
needs to be changed -> new start address of the environment. The macro
definition CONFIG_TQM_FLASH_N_TYPE is undefined by default and must be
defined for boards with 'N' type flashes.

Signed-off-by: Martin Krause <martin.krause@tqs.de>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
16 years agoTQM85xx: Fix CPM port pin configuration
Wolfgang Grandegger [Thu, 5 Jun 2008 11:12:01 +0000 (13:12 +0200)]
TQM85xx: Fix CPM port pin configuration

Do not configure port pins PD30/PD31 as SCC1 TxD/RxD except for the TQM8560
board. On the other TQM85xx boards (TQM8541 and TQM8555) SCC1 is not used
as serial interface anyway. Worse, on some board variants configuring the
pins for SCC1 leads to short circuits (for example on the TQM8541-BG).

Signed-off-by: Martin Krause <martin.krause@tqs.de>
16 years agoTQM85xx: Various coding style fixes
Wolfgang Grandegger [Thu, 5 Jun 2008 11:12:00 +0000 (13:12 +0200)]
TQM85xx: Various coding style fixes

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
16 years agolibfdt: Move the working_fdt pointer to cmd_fdt.c
Gerald Van Baren [Wed, 11 Jun 2008 02:15:58 +0000 (22:15 -0400)]
libfdt: Move the working_fdt pointer to cmd_fdt.c

The working_fdt pointer was declared in common/fdt_support.c but was
not used there.  Move it to common/cmd_fdt.c where it is used (it is
also used in lib_ppc/bootm.c).

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
16 years agofdt: unshadow global working fdt variable
Kim Phillips [Tue, 10 Jun 2008 16:06:17 +0000 (11:06 -0500)]
fdt: unshadow global working fdt variable

differentiate with local variables of the same name by renaming the
global 'fdt' variable 'working_fdt'.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agosocrates: Fix PCI clk fix patch
Andy Fleming [Tue, 10 Jun 2008 23:49:34 +0000 (18:49 -0500)]
socrates: Fix PCI clk fix patch

The submitted patch seems to have been more up-to-date, but an older patch was
already in the repository.  This patch encompasses the differences

Taken entirely from Sergei Poselenov <sposelenov@emcraft.com>

Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years agoNAND FSL UPM: driver re-write using the hwcontrol callback
Wolfgang Grandegger [Thu, 5 Jun 2008 11:02:29 +0000 (13:02 +0200)]
NAND FSL UPM: driver re-write using the hwcontrol callback

This is a re-write of the NAND FSL UPM driver using the more universal
hwcontrol callback (instead of the cmdfunc callback). Here is a brief
list of furher modifications:

- For the time being, the UPM setup writing the UPM array has been
  removed from the driver and must now be done by the board specific
  code.

- The bus width definition in "struct fsl_upm_nand" is now in bits to
  comply with the corresponding Linux driver and 8, 16 and 32 bit
  accesses are supported.

- chip->dev_read is only set if fun->dev_ready != NULL, which is
  required for boards not connecting the R/B pin.

- A few issue have been fixed with MxMR bit manipulation like in the
  corresponding Linux driver.

Note: I think the "io_addr" field of "struct fsl_upm" could be removed
      as well, because the address is already determined by
      "nand->IO_ADDR_[RW]", but I'm not 100% sure.

This patch has been tested on a TQM8548 modules with the NAND chip
Micron MT29F8G08FABWP.

This patch is based on the following patches posted to this list a few
minutes ago:

  PPC: add accessor macros to clear and set bits in one shot
  83xx/85xx/86xx: add more MxMR local bus definitions

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Anton Vorontsov <avorontsov@ru.mvista.com>
16 years agoMPC85xx: Beautify boot output of L2 cache configuration
Wolfgang Grandegger [Thu, 5 Jun 2008 11:11:59 +0000 (13:11 +0200)]
MPC85xx: Beautify boot output of L2 cache configuration

The boot output is now aligned poperly with other boot output
lines, e.g.:

  FLASH: 128 MB
  L2:    512 KB enabled

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>