platform/kernel/u-boot.git
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Wolfgang Denk [Wed, 26 Dec 2007 23:35:03 +0000 (00:35 +0100)]
Merge branch 'master' of git://denx.de/git/u-boot-mpc85xx

16 years agoMerge branch 'testing' of git://www.denx.de/git/u-boot-fdt
Wolfgang Denk [Wed, 26 Dec 2007 23:22:24 +0000 (00:22 +0100)]
Merge branch 'testing' of git://denx.de/git/u-boot-fdt

16 years agocfi_flash: Add manufacturer-specific fixups
Haavard Skinnemoen [Fri, 14 Dec 2007 14:36:18 +0000 (15:36 +0100)]
cfi_flash: Add manufacturer-specific fixups

Run fixups based on the JEDEC manufacturer ID independent of the
command set ID.

This changes current behaviour: Previously, geometry reversal for AMD
chips were done based on the command set ID, while they are now done
based on the JEDEC manufacturer and device ID.

Also add fixup for top-boot Atmel chips. A fixup is needed for
AT49BV6416(T) too, but since u-boot currently only reads the low byte
of the device ID, there's no way to tell it apart from AT49BV642D,
which should not have this fixup. Since AT49BV642D support is
necessary to get ATNGW100 board support into mainline, I've commented
out the fixup for now.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
16 years agocfi_flash: Add cmdset-specific init functions
Haavard Skinnemoen [Fri, 14 Dec 2007 14:36:17 +0000 (15:36 +0100)]
cfi_flash: Add cmdset-specific init functions

Move things like reading JEDEC IDs and fixing up geometry reversal
into separate functions. The geometry reversal fixup is now performed
by altering the qry structure directly, which makes the sector init
code slightly cleaner.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
16 years agocfi_flash: Read whole QRY structure in one go
Haavard Skinnemoen [Fri, 14 Dec 2007 14:36:16 +0000 (15:36 +0100)]
cfi_flash: Read whole QRY structure in one go

Read out the whole CFI Standard Query structure after successful cfi
identification. This allows subsequent code to access this information
directly without having to go through flash_read_uchar() and friends.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
16 years agocfi_flash: Use map_physmem() and unmap_physmem()
Haavard Skinnemoen [Thu, 13 Dec 2007 11:56:34 +0000 (12:56 +0100)]
cfi_flash: Use map_physmem() and unmap_physmem()

Use map_physmem() and unmap_physmem() to convert from physical to
virtual addresses. This gives the arch a chance to provide an uncached
mapping for flash accesses.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
16 years agoIntroduce map_physmem() and unmap_physmem()
Haavard Skinnemoen [Thu, 13 Dec 2007 11:56:33 +0000 (12:56 +0100)]
Introduce map_physmem() and unmap_physmem()

map_physmem() returns a virtual address which can be used to access a
given physical address without involving the cache. unmap_physmem()
should be called when the virtual address returned by map_physmem() is
no longer needed.

This patch adds a stub implementation which simply returns the
physical address cast to a uchar * for all architectures except AVR32,
which converts the physical address to an uncached virtual mapping.
unmap_physmem() is a no-op on all architectures, but if any
architecture needs to do such mappings through the TLB, this is the
hook where those TLB entries can be invalidated.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
16 years agocfi_flash: Introduce read and write accessors
Haavard Skinnemoen [Thu, 13 Dec 2007 11:56:32 +0000 (12:56 +0100)]
cfi_flash: Introduce read and write accessors

Introduce flash_read{8,16,32,64) and flash_write{8,16,32,64} and use
them to access the flash memory. This makes it clearer when the flash
is actually being accessed; merely dereferencing a volatile pointer
looks just like any other kind of access.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
16 years agoImplement __raw_{read,write}[bwl] on all architectures
Haavard Skinnemoen [Thu, 13 Dec 2007 11:56:31 +0000 (12:56 +0100)]
Implement __raw_{read,write}[bwl] on all architectures

This adds implementations of __raw_read[bwl] and __raw_write[bwl] to
m68k, ppc, nios and nios2. The m68k and ppc implementations were taken
from Linux.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
16 years agocfi_flash: Reorder functions and eliminate extra prototypes
Haavard Skinnemoen [Sat, 6 Oct 2007 16:55:36 +0000 (18:55 +0200)]
cfi_flash: Reorder functions and eliminate extra prototypes

Reorder the functions in cfi_flash.c so that each function only uses
functions that have been defined before it. This allows the static
prototype declarations near the top to be eliminated and might allow
gcc to do a better job inlining functions.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
16 years agocfi_flash: Make some needlessly global functions static
Haavard Skinnemoen [Thu, 13 Dec 2007 11:56:29 +0000 (12:56 +0100)]
cfi_flash: Make some needlessly global functions static

Make functions not declared in any header file static.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
16 years agocfi_flash: Break long lines
Haavard Skinnemoen [Thu, 13 Dec 2007 11:56:28 +0000 (12:56 +0100)]
cfi_flash: Break long lines

This patch tries to keep all lines in the cfi_flash driver below 80
columns. There are a few lines left which don't fit this requirement
because I couldn't find any trivial way to break them (i.e. it would
take some restructuring, which I intend to do in a later patch.)

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
16 years agoCFI: synchronize command offsets with Linux CFI driver
Bartlomiej Sieka [Tue, 11 Dec 2007 12:59:57 +0000 (13:59 +0100)]
CFI: synchronize command offsets with Linux CFI driver

Fixes non-working CFI Flash on the Inka4x0 board.

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
16 years agoHandle MPC85xx PCIe reset errata (PCI-Ex 38)
Kumar Gala [Fri, 7 Dec 2007 18:17:34 +0000 (12:17 -0600)]
Handle MPC85xx PCIe reset errata (PCI-Ex 38)

On the MPC85xx boards that have PCIe enable the PCIe errata fix.
(MPC8544DS, MPC8548CDS, MPC8568MDS).

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoUpdate Freescale MPC85xx ADS/CDS/MDS board config
Kumar Gala [Fri, 7 Dec 2007 18:04:30 +0000 (12:04 -0600)]
Update Freescale MPC85xx ADS/CDS/MDS board config

* Enabled CONFIG_CMD_ELF

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoHandle Asynchronous DDR clock on 85xx
Kumar Gala [Fri, 7 Dec 2007 10:59:26 +0000 (04:59 -0600)]
Handle Asynchronous DDR clock on 85xx

The MPC8572 introduces the concept of an asynchronous DDR clock with
regards to the platform clock.

Introduce get_ddr_freq() to report the DDR freq regardless of sync/async
mode.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoUpdate Freescale MPC85xx ADS/CDS/MDS board config
Kumar Gala [Thu, 29 Nov 2007 16:34:28 +0000 (10:34 -0600)]
Update Freescale MPC85xx ADS/CDS/MDS board config

* Removed some misc environment setup
* Enabled CONFIG_CMDLINE_EDITING

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoMove the MPC8541/MPC8555/MPC8548 CDS board under board/freescale.
Kumar Gala [Thu, 29 Nov 2007 16:47:44 +0000 (10:47 -0600)]
Move the MPC8541/MPC8555/MPC8548 CDS board under board/freescale.

Minor path corrections needed to ensure buildability.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoMove the MPC8540 ADS board under board/freescale.
Kumar Gala [Thu, 29 Nov 2007 16:16:18 +0000 (10:16 -0600)]
Move the MPC8540 ADS board under board/freescale.

Minor path corrections needed to ensure buildability.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoMove the MPC8560 ADS board under board/freescale.
Kumar Gala [Thu, 29 Nov 2007 16:14:50 +0000 (10:14 -0600)]
Move the MPC8560 ADS board under board/freescale.

Minor path corrections needed to ensure buildability.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoMove the MPC8568 MDS board under board/freescale.
Kumar Gala [Thu, 29 Nov 2007 16:13:47 +0000 (10:13 -0600)]
Move the MPC8568 MDS board under board/freescale.

Minor path corrections needed to ensure buildability.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoUse standard LAWAR_TRGT_IF_* defines for LAW setup on 85xx
Kumar Gala [Thu, 29 Nov 2007 08:18:59 +0000 (02:18 -0600)]
Use standard LAWAR_TRGT_IF_* defines for LAW setup on 85xx

We already had defines for LAWAR_TRGT_IF_* that we should use
rather than creating new ones.  Also, added some missing defines for
PCIE targets.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoStop using immap_t on 85xx
Kumar Gala [Thu, 29 Nov 2007 08:10:09 +0000 (02:10 -0600)]
Stop using immap_t on 85xx

In the future the offsets to various blocks may not be in same location.
Move to using CFG_MPC85xx_*_ADDR as the base of the registers
instead of getting it via &immap.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoRemove CONFIG_OF_FLAT_TREE related code from mpc85xx since we now use libfdt
Kumar Gala [Thu, 29 Nov 2007 07:23:09 +0000 (01:23 -0600)]
Remove CONFIG_OF_FLAT_TREE related code from mpc85xx since we now use libfdt

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoUpdate MPC8568 MDS to use libfdt
Kumar Gala [Thu, 29 Nov 2007 07:06:19 +0000 (01:06 -0600)]
Update MPC8568 MDS to use libfdt

Updated the MPC8568 MDS config to use libfdt and assume use of aliases for
ethernet, pci, and serial for the various fixups that are done.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoAdd PCI Express support on MPC8568MDS
Haiying Wang [Wed, 14 Nov 2007 20:52:06 +0000 (15:52 -0500)]
Add PCI Express support on MPC8568MDS

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoUpdate MPC85xx CDS to use libfdt
Kumar Gala [Thu, 29 Nov 2007 06:11:44 +0000 (00:11 -0600)]
Update MPC85xx CDS to use libfdt

Updated the MPC85xx CDS config to use libfdt and assume use of aliases for
ethernet, pci, and serial for the various fixups that are done.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoUpdate MPC8540 ADS to use libfdt
Kumar Gala [Thu, 29 Nov 2007 04:54:27 +0000 (22:54 -0600)]
Update MPC8540 ADS to use libfdt

Updated the MPC8540 ADS config to use libfdt and assume use of aliases for
ethernet, pci, and serial for the various fixups that are done.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoUpdate MPC8560 ADS to use libfdt
Kumar Gala [Thu, 29 Nov 2007 04:40:31 +0000 (22:40 -0600)]
Update MPC8560 ADS to use libfdt

Updated the MPC8560 ADS config to use libfdt and assume use of aliases for
ethernet, pci, and serial for the various fixups that are done.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoStop using immap_t for cpm offset on 85xx
Kumar Gala [Wed, 28 Nov 2007 06:36:33 +0000 (00:36 -0600)]
Stop using immap_t for cpm offset on 85xx

In the future the offsets to various blocks may not be in same location.
Move to using CFG_MPC85xx_CPM_ADDR as the base of the CPM registers
instead of getting it via &immap->im_cpm.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoStop using immap_t for guts offset on 85xx
Kumar Gala [Wed, 28 Nov 2007 05:25:02 +0000 (23:25 -0600)]
Stop using immap_t for guts offset on 85xx

In the future the offsets to various blocks may not be in same location.
Move to using CFG_MPC85xx_GUTS_ADDR as the base of the guts registers
instead of getting it via &immap->im_gur.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoUpdate MPC8544 DS config
Kumar Gala [Wed, 28 Nov 2007 04:42:34 +0000 (22:42 -0600)]
Update MPC8544 DS config

* Removed HAS_ETH2/HAS_ETH3 - MPC8544 only has TSEC1/2
* Removed some misc environment setup
* Moved to using fdtfile & fdtaddr as fdt env var names
* Enabled CONFIG_CMDLINE_EDITING

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoUpdate MPC8544DS to use libfdt
Kumar Gala [Mon, 26 Nov 2007 23:12:24 +0000 (17:12 -0600)]
Update MPC8544DS to use libfdt

Updated the MPC8544DS config to use libfdt and assume use of aliases for
ethernet, pci, and serial for the various fixups that are done.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoAdd libfdt based ft_cpu_setup for mpc85xx
Kumar Gala [Thu, 29 Nov 2007 06:15:30 +0000 (00:15 -0600)]
Add libfdt based ft_cpu_setup for mpc85xx

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoCFI: Coding style cleanup
Stefan Roese [Sat, 8 Dec 2007 07:25:09 +0000 (08:25 +0100)]
CFI: Coding style cleanup

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoCFI: support JEDEC flash roms in CFI-flash framework
Michael Schwingen [Fri, 7 Dec 2007 22:35:02 +0000 (23:35 +0100)]
CFI: support JEDEC flash roms in CFI-flash framework

The following patch adds support for non-CFI flash ROMS, by hooking into the
CFI flash code and using most of its code, as recently discussed here in the
thread "Mixing CFI and non-CFI flashs".

Signed-off-by: Michael Schwingen <michael@schwingen.org>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoConditionally compile fdt_fixup_ethernet()
Gerald Van Baren [Thu, 29 Nov 2007 02:24:50 +0000 (21:24 -0500)]
Conditionally compile fdt_fixup_ethernet()

Fix compiler warnings: On boards that don't have ethernets defined,
don't compile fdt_fixup_ethernet().

16 years agoConvert boards that set memory node to use fdt_fixup_memory()
Kumar Gala [Wed, 28 Nov 2007 03:59:46 +0000 (21:59 -0600)]
Convert boards that set memory node to use fdt_fixup_memory()

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoAdded fdt_fixup_stdout that uses aliases to set linux,stdout-path
Kumar Gala [Mon, 26 Nov 2007 23:06:15 +0000 (17:06 -0600)]
Added fdt_fixup_stdout that uses aliases to set linux,stdout-path

We use a combination of the serialN alias and CONFIG_CONS_INDEX to
determine which serial alias we should set linux,stdout-path to.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoAdd common memory fixup function
Kumar Gala [Mon, 26 Nov 2007 20:57:45 +0000 (14:57 -0600)]
Add common memory fixup function

Add the function fdt_fixup_memory() to fixup the /memory node of the fdt

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoConditionally compile fdt_support.c
Kumar Gala [Mon, 26 Nov 2007 17:19:12 +0000 (11:19 -0600)]
Conditionally compile fdt_support.c

Modify common/Makefile to conditionally compile fdt_support.c based
on CONFIG_OF_LIBFDT.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoFix build breakage due to libfdt import
Kumar Gala [Mon, 26 Nov 2007 16:41:40 +0000 (10:41 -0600)]
Fix build breakage due to libfdt import

The IDS8247 got lost in the update and need an API update
do to rename of functions in libfdt.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoAdd spaces around the = in the fdt print format.
Gerald Van Baren [Sat, 24 Nov 2007 00:43:20 +0000 (19:43 -0500)]
Add spaces around the = in the fdt print format.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
16 years agoRelease v1.3.1
Wolfgang Denk [Thu, 6 Dec 2007 09:21:19 +0000 (10:21 +0100)]
Release v1.3.1

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoADS5121 Board: fix compile problem.
Wolfgang Denk [Thu, 6 Dec 2007 09:21:03 +0000 (10:21 +0100)]
ADS5121 Board: fix compile problem.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoPrepare for 1.3.1-rc1
Wolfgang Denk [Sun, 2 Dec 2007 23:15:28 +0000 (00:15 +0100)]
Prepare for 1.3.1-rc1

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge commit '3deca9d'
Wolfgang Denk [Mon, 26 Nov 2007 21:57:53 +0000 (22:57 +0100)]
Merge commit '3deca9d'

Conflicts:

Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCleanup coding style; update CHANGELOG
Wolfgang Denk [Mon, 26 Nov 2007 18:18:21 +0000 (19:18 +0100)]
Cleanup coding style; update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge commit '87ddedd'
Wolfgang Denk [Mon, 26 Nov 2007 18:15:04 +0000 (19:15 +0100)]
Merge commit '87ddedd'

16 years agoMAKEALL: add missing 512x boards in ppc
Jean-Christophe PLAGNIOL-VILLARD [Sun, 25 Nov 2007 21:39:25 +0000 (22:39 +0100)]
MAKEALL: add missing 512x boards in ppc

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoMakefile : fix tags ctags etags with new drivers organization
Jean-Christophe PLAGNIOL-VILLARD [Sun, 25 Nov 2007 17:45:47 +0000 (18:45 +0100)]
Makefile : fix tags ctags etags with new drivers organization

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoMakefile : fix tags ctags etags with new drivers organization
Jean-Christophe PLAGNIOL-VILLARD [Sun, 25 Nov 2007 17:45:47 +0000 (18:45 +0100)]
Makefile : fix tags ctags etags with new drivers organization

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agodrivers/mtd : move mtd drivers to drivers/mtd
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 20:26:56 +0000 (21:26 +0100)]
drivers/mtd : move mtd drivers to drivers/mtd

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agodrivers/misc : move misc drivers to drivers/misc
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 20:17:55 +0000 (21:17 +0100)]
drivers/misc : move misc drivers to drivers/misc

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agodrivers/block : move block drivers to drivers/block
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 20:13:59 +0000 (21:13 +0100)]
drivers/block : move block drivers to drivers/block

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agodrivers/rtc : move rtc drivers to drivers/rtc
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 19:59:50 +0000 (20:59 +0100)]
drivers/rtc : move rtc drivers to drivers/rtc

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agodrivers/hwmon : move hardware monitor drviers to drivers/hwmon
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 19:14:44 +0000 (20:14 +0100)]
drivers/hwmon : move hardware monitor drviers to drivers/hwmon

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agodrivers/input : move input drivers to drivers/input
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 18:46:45 +0000 (19:46 +0100)]
drivers/input : move input drivers to drivers/input

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agodrivers/usb : move usb drivers to drivers/usb
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 18:40:11 +0000 (19:40 +0100)]
drivers/usb : move usb drivers to drivers/usb

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agodrivers/serial : move serial drivers to drivers/serial
Jean-Christophe PLAGNIOL-VILLARD [Sat, 24 Nov 2007 18:33:38 +0000 (19:33 +0100)]
drivers/serial : move serial drivers to drivers/serial

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agodrivers/net : move net drivers to drivers/net
Jean-Christophe PLAGNIOL-VILLARD [Wed, 21 Nov 2007 20:19:24 +0000 (21:19 +0100)]
drivers/net : move net drivers to drivers/net

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agodrivers/video : move video drivers to drivers/video
Jean-Christophe PLAGNIOL-VILLARD [Tue, 20 Nov 2007 19:41:48 +0000 (20:41 +0100)]
drivers/video : move video drivers to drivers/video

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agodrivers/pcmcia : move pcmcia drivers to drivers/pcmcia
Jean-Christophe PLAGNIOL-VILLARD [Tue, 20 Nov 2007 19:33:09 +0000 (20:33 +0100)]
drivers/pcmcia : move pcmcia drivers to drivers/pcmcia

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agodrivers/pci : move pci drivers to drivers/pci
Jean-Christophe PLAGNIOL-VILLARD [Tue, 20 Nov 2007 19:28:09 +0000 (20:28 +0100)]
drivers/pci : move pci drivers to drivers/pci

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoMerge branch 'testing' of git://www.denx.de/git/u-boot-fdt
Wolfgang Denk [Thu, 22 Nov 2007 23:55:23 +0000 (00:55 +0100)]
Merge branch 'testing' of git://denx.de/git/u-boot-fdt

16 years agoFix fdt printing for updated libfdt
Gerald Van Baren [Thu, 22 Nov 2007 22:23:23 +0000 (17:23 -0500)]
Fix fdt printing for updated libfdt

Also improve printing (adopt dtc v1 "c style" hex format), whitespace cleanup.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
16 years agoAdd additional fdt fixup helper functions
Kumar Gala [Wed, 21 Nov 2007 19:30:15 +0000 (13:30 -0600)]
Add additional fdt fixup helper functions

Added the following fdt fixup helpers:
 * do_fixup_by_prop{_u32} - Find matching nodes by property name/value
 * do_fixup_by_compat{_u32} - Find matching nodes by compat

The _u32 variants work the same only the property they are setting
is know to be a 32-bit integer instead of a byte buffer.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoAdd fdt_fixup_ethernet helper to set mac addresses
Kumar Gala [Wed, 21 Nov 2007 17:11:03 +0000 (11:11 -0600)]
Add fdt_fixup_ethernet helper to set mac addresses

Added a fixup helper that uses aliases to set mac addresses
in the device tree based on the bd_t

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoFix warnings from import of libfdt
Kumar Gala [Wed, 21 Nov 2007 20:07:46 +0000 (14:07 -0600)]
Fix warnings from import of libfdt

cmd_fdt.c: In function fdt_print:
cmd_fdt.c:586: warning: assignment discards qualifiers from pointer target type
cmd_fdt.c:613: warning: assignment discards qualifiers from pointer target type
cmd_fdt.c:635: warning: assignment discards qualifiers from pointer target type
cmd_fdt.c:636: warning: assignment discards qualifiers from pointer target type

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoUpdate libfdt from device tree compiler (dtc)
Kumar Gala [Wed, 24 Oct 2007 16:04:22 +0000 (11:04 -0500)]
Update libfdt from device tree compiler (dtc)

Update libfdt to commit 8eaf5e358366017aa2e846c5038d1aa19958314e from
the device tree compiler (dtc) project.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoMove do_fixup* for libfdt into common code
Kumar Gala [Sun, 4 Nov 2007 00:46:28 +0000 (19:46 -0500)]
Move do_fixup* for libfdt into common code

Moved the generic fixup handling code out of cpu/mpc5xxx and cpu/mpc8260
into common/fdt_support.c and renamed:

do_fixup() -> do_fixup_by_path()
do_fixup_u32()  -> do_fixup_by_path_u32()

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoMake no options to fdt print default to '/'
Kumar Gala [Thu, 25 Oct 2007 21:15:07 +0000 (16:15 -0500)]
Make no options to fdt print default to '/'

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoRemoved some nonused fdt functions and moved fdt_find_and_setprop out of libfdt
Kumar Gala [Wed, 24 Oct 2007 15:21:57 +0000 (10:21 -0500)]
Removed some nonused fdt functions and moved fdt_find_and_setprop out of libfdt

Removed:
fdt_node_is_compatible
fdt_find_node_by_type
fdt_find_compatible_node

To ease merge of newer libfdt as we aren't using them anywhere at this time.

Also moved fdt_find_and_setprop out of libfdt into fdt_support.c for the same
reason.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years ago[BUILD] Remove libraries when updating autoconf.mk
Grant Likely [Wed, 21 Nov 2007 16:19:37 +0000 (09:19 -0700)]
[BUILD] Remove libraries when updating autoconf.mk

Fix library problems caused by conditional compilation.  Using
autoconf.mk to decide which files to compile has caused a problem when
changing configuration from one board to another without clearing out
the library (*.a) files.

It used to be that the linker was always passed the same list of .o
files when building the .a files.  However, that is not longer true
with conditional compilation.  Now, a different board config will have
a different file list passed to the linker.  The problem occurs when
a library has already been built and the board config is changed.

Since the linker will update instead of replace a preexisting library,
then if the file list changes to remove some object files the old
objects will still exist in the library.

The solution is to remove all old library files when autoconf.mk is
made.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
16 years ago[BUILD] conditionally compile libfdt/*.c in libfdt/Makefile
Kumar Gala [Wed, 21 Nov 2007 14:49:50 +0000 (08:49 -0600)]
[BUILD] conditionally compile libfdt/*.c in libfdt/Makefile

Modify libfdt/Makefile to conditionally compile the *.c files based
on the board config.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years ago[BUILD] conditionally compile common/cmd_*.c in common/Makefile
Grant Likely [Mon, 24 Sep 2007 15:05:31 +0000 (09:05 -0600)]
[BUILD] conditionally compile common/cmd_*.c in common/Makefile

Modify common/Makefile to conditionally compile the cmd_*.c files based
on the board config.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
16 years ago[BUILD] Generate include/autoconf.mk from board config files
Grant Likely [Mon, 24 Sep 2007 15:05:31 +0000 (09:05 -0600)]
[BUILD] Generate include/autoconf.mk from board config files

Use cpp and sed to postprocess config.h and import the defined values
into include/autoconf.mk.  autoconf.mk is then included by config.mk to
give 'make' access to the board configuration.

Doing this enables conditional compilation at the Makefile level instead
of by wrapping every .c file with #ifdef/#endif wrappers.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
16 years agodrivers/i2c : move i2c drivers to drivers/i2c
Jean-Christophe PLAGNIOL-VILLARD [Tue, 20 Nov 2007 19:14:18 +0000 (20:14 +0100)]
drivers/i2c : move i2c drivers to drivers/i2c

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoMerge branch 'origin' into kconfig-for-1.3.1
Grant Likely [Tue, 20 Nov 2007 15:19:56 +0000 (08:19 -0700)]
Merge branch 'origin' into kconfig-for-1.3.1

16 years agoPrepare for 1.3.0 release.
Wolfgang Denk [Mon, 19 Nov 2007 21:20:24 +0000 (22:20 +0100)]
Prepare for 1.3.0 release.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMove CONFIG_QE out of CONFIG_PCI wrap for MPC8568MDS
Haiying Wang [Mon, 19 Nov 2007 15:02:13 +0000 (10:02 -0500)]
Move CONFIG_QE out of CONFIG_PCI wrap for MPC8568MDS

CONFIG_QE shouldn't be in the wrap of CONFIG_PCI, fix it.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
16 years ago[MIPS] board/gth2/lowlevel_init.S: Fix a build warning
Shinya Kuribayashi [Mon, 19 Nov 2007 02:14:16 +0000 (11:14 +0900)]
[MIPS] board/gth2/lowlevel_init.S: Fix a build warning

lowlevel_init.S: Assembler messages:
lowlevel_init.S:413: Warning: Pretending global symbol used as branch target is local.

Looking at codes, the `memtest' and `clearmem' are intentional mixed
use of `global symbols' and `label' for debugging purpose. To make it
build, just disable global-symbols-use for now. As a result `memtest'
still remains as unused, but leave it be...

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
16 years agoFix build problems with mp2usb board
Wolfgang Denk [Mon, 19 Nov 2007 11:59:14 +0000 (12:59 +0100)]
Fix build problems with mp2usb board

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agos3c24x0: Fix usb_ohci.c missing in Makefile
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 Nov 2007 17:36:11 +0000 (18:36 +0100)]
s3c24x0: Fix usb_ohci.c missing in Makefile
and usb_ohci.c warning differ in signedness

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agopb1x00 board: Fix u16 status declaration when PCMCIA is defined
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 Nov 2007 11:55:02 +0000 (12:55 +0100)]
pb1x00 board: Fix u16 status declaration when PCMCIA is defined

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoFix compiler warnings for ARM systems.
Wolfgang Denk [Sun, 18 Nov 2007 16:11:09 +0000 (17:11 +0100)]
Fix compiler warnings for ARM systems.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoFix compiler warnings for PPC systems. Update CHANGELOG.
Wolfgang Denk [Sun, 18 Nov 2007 15:36:27 +0000 (16:36 +0100)]
Fix compiler warnings for PPC systems. Update CHANGELOG.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoFix warning differ in signedness in net/net.c and net/nfs.c
Jean-Christophe PLAGNIOL-VILLARD [Sat, 17 Nov 2007 10:31:10 +0000 (11:31 +0100)]
Fix warning differ in signedness in net/net.c and net/nfs.c

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mips
Wolfgang Denk [Sun, 18 Nov 2007 00:26:14 +0000 (01:26 +0100)]
Merge branch 'master' of git://denx.de/git/u-boot-mips

16 years agogth2.c: Fix a warning on gth2 build.
Shinya Kuribayashi [Sat, 17 Nov 2007 11:42:45 +0000 (20:42 +0900)]
gth2.c: Fix a warning on gth2 build.

gth2.c: In function 'misc_init_r':
gth2.c:434: warning: pointer targets in passing argument 2 of 'setenv' differ in signedness

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoFix warning differ in signedness in common/cmd_scsi.c
Stefan Roese [Sat, 17 Nov 2007 06:58:25 +0000 (07:58 +0100)]
Fix warning differ in signedness in common/cmd_scsi.c

Signed-off-by: Stefan Roese <sr@denx.de>
16 years ago[MIPS] cpu/mips/config.mk: Fix GNU assembler minor version picker
Shinya Kuribayashi [Sat, 17 Nov 2007 11:05:26 +0000 (20:05 +0900)]
[MIPS] cpu/mips/config.mk: Fix GNU assembler minor version picker

Current trick to pick up GNU assembler minor version does not work with the
latest binutils (2007-03-01 or later) due to ${PKGVERSION} now default to
"(GNU Binutils) ".

  $ sde-as --version |grep "GNU assembler"
  GNU assembler 2.15.94 mipssde-6.02.02-20050602
  $ sde-as --version |grep "GNU assembler" |awk '{print $3}'
  2.15.94
  $ sde-as --version |grep "GNU assembler" |awk '{print $3}' |awk -F. '{print $2}'
  15
  $

  $ mips-linux-as --version |grep "GNU assembler"
  GNU assembler (GNU Binutils) 2.18
  $ mips-linux-as --version |grep "GNU assembler" |awk '{print $3}'
  (GNU
  $ mips-linux-as --version |grep "GNU assembler" |awk '{print $3}' |awk -F. '{print $2}'
  (no output)
  $

As a result of above, you'll see many noises with such binutils:

  make -C cpu/mips/
  /bin/sh: line 0: [: : integer expression expected
  /bin/sh: line 0: [: : integer expression expected
  make[1]: Entering directory `/home/skuribay/devel/u-boot.git/cpu/mips'
  mips-linux-gcc  -D__ASSEMBLY__ -g  -Os   -D__KERNEL__ -DTEXT_BASE=0xB0000000  -I/home/skuribay/devel/u-boot.git/include -fno-builtin -ffreestanding -nostdinc -isystem /home/skuribay/devel/buildroot/build_mips/staging_dir/usr/bin/../lib/gcc/mips-linux-uclibc/4.2.1/include -pipe  -DCONFIG_MIPS -D__MIPS__ -G 0 -mabicalls -fpic -pipe -msoft-float -march=4kc -mtune=4kc -EB -c -o incaip_wdt.o incaip_wdt.S
  /bin/sh: line 0: [: : integer expression expected
  mips-linux-gcc  -D__ASSEMBLY__ -g  -Os   -D__KERNEL__ -DTEXT_BASE=0xB0000000  -I/home/skuribay/devel/u-boot.git/include -fno-builtin -ffreestanding -nostdinc -isystem /home/skuribay/devel/buildroot/build_mips/staging_dir/usr/bin/../lib/gcc/mips-linux-uclibc/4.2.1/include -pipe  -DCONFIG_MIPS -D__MIPS__ -G 0 -mabicalls -fpic -pipe -msoft-float -march=4kc -mtune=4kc -EB -c -o cache.o cache.S
  /bin/sh: line 0: [: : integer expression expected
  mips-linux-gcc -g  -Os   -D__KERNEL__ -DTEXT_BASE=0xB0000000  -I/home/skuribay/devel/u-boot.git/include -fno-builtin -ffreestanding -nostdinc -isystem /home/skuribay/devel/buildroot/build_mips/staging_dir/usr/bin/../lib/gcc/mips-linux-uclibc/4.2.1/include -pipe  -DCONFIG_MIPS -D__MIPS__ -G 0 -mabicalls -fpic -pipe -msoft-float -march=4kc -mtune=4kc -EB -Wall -Wstrict-prototypes -c -o asc_serial.o asc_serial.c
  /bin/sh: line 0: [: : integer expression expected

This patch simplifies the trick and makes it work with both versions of gas.
I also replace an expensive `awk (or gawk)' with `cut'.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] Remove useless instructions for initializing $gp.
Shinya Kuribayashi [Sat, 17 Nov 2007 11:05:26 +0000 (20:05 +0900)]
[MIPS] Remove useless instructions for initializing $gp.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] MIPS 4K core: Coding style cleanups
Shinya Kuribayashi [Sat, 27 Oct 2007 06:27:06 +0000 (15:27 +0900)]
[MIPS] MIPS 4K core: Coding style cleanups

No logical changes.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] gth2.c: Fix a warning on gth2 build.
Shinya Kuribayashi [Sat, 17 Nov 2007 11:05:20 +0000 (20:05 +0900)]
[MIPS] gth2.c: Fix a warning on gth2 build.

gth2.c: In function 'misc_init_r':
gth2.c:434: warning: pointer targets in passing argument 2 of 'setenv' differ in signedness

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] au1x00_eth.c: Fixed a warning on pb1000 build.
Shinya Kuribayashi [Sat, 27 Oct 2007 06:22:33 +0000 (15:22 +0900)]
[MIPS] au1x00_eth.c: Fixed a warning on pb1000 build.

au1x00_eth.c: In function 'au1x00_miiphy_write':
au1x00_eth.c:139: warning: 'return' with no value, in function returning non-void

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] au1x00_eth.c: Fix au1x00_miiphy_{read,write} build error
Shinya Kuribayashi [Sat, 27 Oct 2007 06:00:25 +0000 (15:00 +0900)]
[MIPS] au1x00_eth.c: Fix au1x00_miiphy_{read,write} build error

au1x00_eth.c: In function 'au1x00_enet_initialize':
au1x00_eth.c:246: error: 'au1x00_miiphy_read' undeclared (first use in this function)
au1x00_eth.c:246: error: (Each undeclared identifier is reported only once
au1x00_eth.c:246: error: for each function it appears in.)
au1x00_eth.c:246: error: 'au1x00_miiphy_write' undeclared (first use in this function)
au1x00_eth.c: In function 'au1x00_miiphy_write':
au1x00_eth.c:298: warning: 'return' with no value, in function returning non-void
make[1]: *** [au1x00_eth.o] Error 1

Fixed by moving these two functions forward.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoMAKEALL: Added missing pb1000 board
Shinya Kuribayashi [Sat, 27 Oct 2007 06:00:25 +0000 (15:00 +0900)]
MAKEALL: Added missing pb1000 board

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] pb1000: Replace obsolete memsetup.S with lowlevel_init.S
Shinya Kuribayashi [Sat, 27 Oct 2007 06:00:24 +0000 (15:00 +0900)]
[MIPS] pb1000: Replace obsolete memsetup.S with lowlevel_init.S

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] u-boot.lds: Cleanup __u_boot_cmd_{start,end}
Shinya Kuribayashi [Sat, 27 Oct 2007 06:00:24 +0000 (15:00 +0900)]
[MIPS] u-boot.lds: Cleanup __u_boot_cmd_{start,end}

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>