]> git.sur5r.net Git - u-boot/log
u-boot
15 years agoRemove last remanants of unused CONFIG_I2C_CMD_TREE
Peter Tyser [Mon, 20 Jul 2009 00:17:42 +0000 (19:17 -0500)]
Remove last remanants of unused CONFIG_I2C_CMD_TREE

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years agoubi: help message correction
Andrzej Wolski [Fri, 17 Jul 2009 20:26:54 +0000 (22:26 +0200)]
ubi: help message correction

Fix incorrect information about size units and correct typo.

Signed-off-by: Andrzej Wolski <awolski@poczta.fm>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Mon, 20 Jul 2009 20:55:29 +0000 (22:55 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Mon, 20 Jul 2009 20:52:31 +0000 (22:52 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

15 years agommc: set bus width to 1 and clock to minimum early during initialization
Ilya Yanok [Mon, 29 Jun 2009 13:53:16 +0000 (17:53 +0400)]
mmc: set bus width to 1 and clock to minimum early during initialization

We need to switch back to 1-bit before initialization or SD 2.0 cards
will fail to send SCR if we've switched to 4-bit already.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
15 years agoconfig.mk: Remove unused HPATH
Shinya Kuribayashi [Sat, 20 Jun 2009 10:14:33 +0000 (19:14 +0900)]
config.mk: Remove unused HPATH

This variable is not unused anywhere.

Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
15 years agodigsy mtc: Enable command line history.
Grzegorz Bernacki [Wed, 17 Jun 2009 14:20:14 +0000 (16:20 +0200)]
digsy mtc: Enable command line history.

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
15 years agocompiler.h: unify system ifdef cruft here
Mike Frysinger [Thu, 2 Jul 2009 23:23:25 +0000 (19:23 -0400)]
compiler.h: unify system ifdef cruft here

Shove a lot of the HOSTCC and related #ifdef checking crap into the new
compiler.h header so that we can keep all other headers nice and clean.

Also introduce custom uswap functions so we don't have to rely on the non
standard implementations that a host may (or may not in the case of OS X)
provide.  This allows mkimage to finally build cleanly on an OS X system.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agocommon: fix 'dummy' is used uninitialized in this function warning
Kim Phillips [Mon, 15 Jun 2009 16:50:40 +0000 (11:50 -0500)]
common: fix 'dummy' is used uninitialized in this function warning

fix this gcc 4.4 warning:

xyzModem.c: In function 'xyzModem_stream_open':
xyzModem.c:564: warning: 'dummy' is used uninitialized in this function

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
15 years agopush CROSS_COMPILE out to $(ARCH)_config.mk
Mike Frysinger [Mon, 15 Jun 2009 03:33:14 +0000 (23:33 -0400)]
push CROSS_COMPILE out to $(ARCH)_config.mk

Each arch should handle setting a proper default CROSS_COMPILE value in
their own config.mk file rather than having to maintain a large ugly list
in the Makefile.  By using conditional assignment, we don't have to worry
about the variable already being set (env/cmdline/etc...).

The common config.mk file takes care of exporting CROSS_COMPILE already,
and while a few variables (toolchain ones) utilize CROSS_COMPILE before
including the arch config.mk, they do so with deferred assignment.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agomalloc.h: protect it against multiple include
Jean-Christophe PLAGNIOL-VILLARD [Sat, 13 Jun 2009 10:55:37 +0000 (12:55 +0200)]
malloc.h: protect it against multiple include

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoFix boards broken after removal of legacy NAND and DoC support
Wolfgang Denk [Sun, 19 Jul 2009 17:37:24 +0000 (19:37 +0200)]
Fix boards broken after removal of legacy NAND and DoC support

Commit 2419169f removed support for legacy NAND and disk on chip but
missed to update the code for a few boards. This patch fixes the
resulting build issues.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agocmd_flash.c: fix fix compile error for boards with DataFlash
Wolfgang Denk [Sun, 19 Jul 2009 17:32:37 +0000 (19:32 +0200)]
cmd_flash.c: fix fix compile error for boards with DataFlash

Commit 5669ed45 ("cmd_flash.c: fix warning: unused variable
'addr_first'/'addr_last'") changed the #ifdef logic areound the
declaration of these variables and missed a combination of settings
of HAS_DATAFLASH with SYS_NO_FLASH; this patch fixes this.

Also spotted by Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agopcm030: fix out-of-tree building
Wolfgang Denk [Sun, 19 Jul 2009 10:05:15 +0000 (12:05 +0200)]
pcm030: fix out-of-tree building

Commit 0a87dd90 that was supposed to fix out-of-tree building for the
pcm030 board was unfortunately incomplete.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoCanyonlands SATA harddisk driver
Kazuaki Ichinohe [Fri, 12 Jun 2009 09:10:12 +0000 (18:10 +0900)]
Canyonlands SATA harddisk driver

This patch adds a SATA harddisk driver for the canyonlands.
This patch is kernel driver's porting.
This patch corresponded to not cmd_scsi but cmd_sata.
This patch divided an unused member with ifndef __U_BOOT__ in the structure.

[environment variable, boot script]
setenv bootargs root=/dev/sda7 rw
setenv bootargs ${bootargs} console=ttyS0,115200
ext2load sata 0:2 0x400000 /canyonlands/uImage
ext2load sata 0:2 0x800000 /canyonlands/canyonlands.dtb
fdt addr 0x800000 0x4000
bootm 0x400000 - 0x800000

If you drive SATA-2 disk on Canyonlands, you must change parts from
PI2PCIE212 to PI2PCIE2212 on U25. We confirmed to boot by using
following disks:

1.Vendor: Fujitsu  Type: MHW2040BS
2.Vendor: Fujitsu  Type: MHW2060BK
3.Vendor: HAGIWARA SYS-COM:HFD25S-032GT
4.Vendor: WesternDigital Type: WD3200BJKT (CONFIG_LBA48 required)
5.Vendor: WesternDigital Type: WD3200BEVT (CONFIG_LBA48 required)
6.Vendor: Hitachi  Type: HTS543232L9A300 (CONFIG_LBA48 required)
7.Vendor: Seagate  Type: ST31000333AS (CONFIG_LBA48 required)
8.Vendor: Transcend  Type: TS32GSSD25S-M
9.Vendor: MTRON  Type: MSD-SATA1525-016

Signed-off-by: Kazuaki Ichinohe <kazuichi at fsi.co.jp>
15 years agoAdd support for the Tundra TSI148 VME-bridge
Reinhard Arlt [Wed, 10 Jun 2009 17:09:40 +0000 (19:09 +0200)]
Add support for the Tundra TSI148 VME-bridge

From: Reinhard Arlt <reinhard.arlt@esd-electronics.com>

This patch adds support for the Tundra TSI148 VME-bridge. It's used on
the upcoming esd VME8349 board.

Signed-off-by: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoBlackfin: bf537-{minotaur,srv1}: do not hardcode CONFIG_ETHADDR
Mike Frysinger [Thu, 16 Jul 2009 23:05:30 +0000 (19:05 -0400)]
Blackfin: bf537-{minotaur,srv1}: do not hardcode CONFIG_ETHADDR

MAC addresses should not be hardcoded in boards to avoid random link level
conflicts.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: bf533-stamp: back down SCLK a bit
Mike Frysinger [Fri, 10 Jul 2009 14:42:06 +0000 (10:42 -0400)]
Blackfin: bf533-stamp: back down SCLK a bit

While the 1.0 and 1.2 spin of the bf533-stamp boards can handle the higher
SCLK speeds just fine, the 1.1 spin cannot due to the bugs introduced with
the shortened SDRAM traces.  So lower the SCLK speed down to a value that
all three can handle.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: split cpu COBJS into multilines
Mike Frysinger [Fri, 10 Jul 2009 00:56:56 +0000 (20:56 -0400)]
Blackfin: split cpu COBJS into multilines

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: add os log functions
Mike Frysinger [Thu, 9 Jul 2009 05:15:05 +0000 (01:15 -0400)]
Blackfin: add os log functions

Part of the mini Blackfin ABI with operating systems is that they can use
0x4f0-0x4f8 to pass log buffers to/from bootloaders.  So add support to
U-Boot for reading the log buffer.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agompc83xx: convert all remaining boards over to 83XX_GENERIC_PCI
Kim Phillips [Sat, 18 Jul 2009 23:42:13 +0000 (18:42 -0500)]
mpc83xx: convert all remaining boards over to 83XX_GENERIC_PCI

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
15 years agoPATI board: fix compiler warnings
Wolfgang Denk [Sat, 18 Jul 2009 23:15:52 +0000 (01:15 +0200)]
PATI board: fix compiler warnings

Fix these:
pati.c: In function 'checkboard':
pati.c:358: warning: pointer targets in passing argument 2 of 'getenv_r' differ in signedness
../common/flash.c: In function 'write_word':
../common/flash.c:824: warning: dereferencing type-punned pointer will break strict-aliasing rules
cmd_pati.c: In function 'do_pati':
cmd_pati.c:279: warning: 'value' may be used uninitialized in this function

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agompl: printing current stdio devices cleanup
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 10:14:56 +0000 (12:14 +0200)]
mpl: printing current stdio devices cleanup

Currently the mpl boards duplicate the code to print the current
devices from common/console.c; use stdio_print_current_devices()
instead

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Edited commit message.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoconsole: unify printing current devices
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 10:14:55 +0000 (12:14 +0200)]
console: unify printing current devices

Create stdio_print_current_devices() for this purpose

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Sat, 18 Jul 2009 22:38:23 +0000 (00:38 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

15 years agocmd_flash.c: fix warning: unused variable 'addr_first'/'addr_last'
Wolfgang Denk [Sat, 18 Jul 2009 21:18:14 +0000 (23:18 +0200)]
cmd_flash.c: fix warning: unused variable 'addr_first'/'addr_last'

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoOMAP3 Fix compiler warning for v7_flush_dcache_all
Tom Rix [Tue, 30 Jun 2009 20:04:13 +0000 (15:04 -0500)]
OMAP3 Fix compiler warning for v7_flush_dcache_all

On build of omap3 targets in MAKEALL, the *.ERR files have

cpu.c: In function 'cleanup_before_linux':
cpu.c:64: warning: implicit declaration of function 'v7_flush_dcache_all'
cpu.c:64: warning: implicit declaration of function 'get_device_type

The functions v7_flush_dcache_all and get_device_type are declared
in include/asm-arm/arch-omap3/sys_proto.h, so use this file to
declare the functions.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
15 years agoARM: make split_by_variant.sh output more useful
Wolfgang Denk [Sat, 18 Jul 2009 20:09:38 +0000 (22:09 +0200)]
ARM: make split_by_variant.sh output more useful

The board/armltd/integrator/split_by_variant.sh script used to print
"Configuring for integrator*p board..." no matter which board name
was being compiled. This made it difficult to match MAKEALL output to
board names. This patch fixes this.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoNAND: Part 2: Fix warning Please define CONFIG_SYS_64BIT_VSPRINTF...
Wolfgang Denk [Sat, 18 Jul 2009 19:52:24 +0000 (21:52 +0200)]
NAND: Part 2: Fix warning Please define CONFIG_SYS_64BIT_VSPRINTF...

Commit 8d2effea added a warning for configurations that use NAND
without defining the (then necessary) CONFIG_SYS_64BIT_VSPRINTF but
failed to fix the affected boards.

This patch covers the non-PPC boards that were missed in the previous
patch (commit 170c1972).

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoat91cap9adk: fix #ifdef/#endif pairing
Wolfgang Denk [Sat, 18 Jul 2009 18:46:38 +0000 (20:46 +0200)]
at91cap9adk: fix #ifdef/#endif pairing

The #ifdef/#endif pairing in this file was obviously messed up.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agopcm030: fix out-of-tree building
Wolfgang Denk [Sat, 18 Jul 2009 16:00:25 +0000 (18:00 +0200)]
pcm030: fix out-of-tree building

Commit c9969947, which added support for the pcm030 board
(aka phyCORE-MPC5200B-tiny), broke out-of-tree building.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoMPC837XERDB: fix warning: "CONFIG_SYS_MONITOR_LEN" redefined
Wolfgang Denk [Sat, 18 Jul 2009 14:36:11 +0000 (16:36 +0200)]
MPC837XERDB: fix warning: "CONFIG_SYS_MONITOR_LEN" redefined

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years ago8xxx: fix warning: implicit declaration of function 'uec_standard_init'
Wolfgang Denk [Sat, 18 Jul 2009 14:13:18 +0000 (16:13 +0200)]
8xxx: fix warning: implicit declaration of function 'uec_standard_init'

Commit 8e55258f created function uec_standard_init() to initialize
all UEC interfaces for 83xx and 85xx but failed to provide a
prototype for it.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoMIP405T: fix compile problem
Wolfgang Denk [Sat, 18 Jul 2009 13:46:02 +0000 (15:46 +0200)]
MIP405T: fix compile problem

The "stdio/device: rework function naming convention" patch
(commit 52cb4d4f) broke the MIP405T board; this patch fixes it.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoNAND: Fix warning Please define CONFIG_SYS_64BIT_VSPRINTF...
Wolfgang Denk [Sat, 18 Jul 2009 13:32:10 +0000 (15:32 +0200)]
NAND: Fix warning Please define CONFIG_SYS_64BIT_VSPRINTF...

Commit 8d2effea added a warning for configurations that use NAND
without defining the (then necessary) CONFIG_SYS_64BIT_VSPRINTF but
failed to fix the affected boards.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoCPCI750: fix compile problem
Wolfgang Denk [Sat, 18 Jul 2009 13:05:44 +0000 (15:05 +0200)]
CPCI750: fix compile problem

Commit bc0d3296 removed ppc_error_no.h from Marvell boards
but forgot to update board/esd/cpci750/mv_eth.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sat, 18 Jul 2009 12:59:40 +0000 (14:59 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Wolfgang Denk [Sat, 18 Jul 2009 12:59:05 +0000 (14:59 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

15 years agocmd_i2c: bugfix: add missing brace
Alessandro Rubini [Fri, 17 Jul 2009 12:42:11 +0000 (14:42 +0200)]
cmd_i2c: bugfix: add missing brace

The sub-command parser missed a brace, so "return 0;" is always
taken and no error message is diplayed if you say "i2c scan"
instead of "i2c probe", for example.

Proper brace is added. Also, a misleading and unneeded else
is removed.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com.it>
15 years agostdio/device: rework function naming convention
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 10:14:54 +0000 (12:14 +0200)]
stdio/device: rework function naming convention

So far the console API uses the following naming convention:

======Extract======
typedef struct device_t;

int device_register (device_t * dev);
int devices_init (void);
int device_deregister(char *devname);
struct list_head* device_get_list(void);
device_t* device_get_by_name(char* name);
device_t* device_clone(device_t *dev);
=======

which is too generic and confusing.

Instead of using device_XX and device_t we change this
into stdio_XX and stdio_dev

This will also allow to add later a generic device mechanism in order
to have support for multiple devices and driver instances.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Edited commit message.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoppc: Fix compile error for boards with CONFIG_DDR_ECC
Peter Tyser [Wed, 15 Jul 2009 05:01:08 +0000 (00:01 -0500)]
ppc: Fix compile error for boards with CONFIG_DDR_ECC

A bug was introduced by commit e94e460c6e8741f42dab6d8dd4b596ba5d9d79ae
which affected non-MPC83xx/85xx/86xx ppc boards which had CONFIG_DDR_ECC
defined and resulted in errors such as:

Configuring for canyonlands board...
fsl_dma.c:50:2: error: #error "Freescale DMA engine not supported on your
processor"
make[1]: *** No rule to make target `.depend', needed by `libdma.a'.  Stop.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years agoinclude/config_cmd_default.h cleanup
Prafulla Wadaskar [Thu, 16 Jul 2009 15:27:59 +0000 (20:57 +0530)]
include/config_cmd_default.h cleanup

arranged configurations in alphabetical order
CONFIG_CMD_FLASH moved under ifndef CONFIG_SYS_NO_FLASH

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Wolfgang Denk [Fri, 17 Jul 2009 21:05:41 +0000 (23:05 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-video

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-microblaze
Wolfgang Denk [Fri, 17 Jul 2009 21:04:07 +0000 (23:04 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-microblaze

15 years agosata: namespace curr_device variable
Mike Frysinger [Mon, 15 Jun 2009 01:35:22 +0000 (21:35 -0400)]
sata: namespace curr_device variable

The curr_device variable really should be namespaced with a "sata_" prefix
since it is only used by the sata code.  It also avoids random conflicts
with other pieces of code (like cmd_mmc):
common/libcommon.a(cmd_sata.o):(.data.curr_device+0x0):
multiple definition of `curr_device'
common/libcommon.a(cmd_mmc.o):(.data.curr_device+0x0): first defined here

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agocmd_mmc: make curr_device static
Mike Frysinger [Mon, 15 Jun 2009 01:35:21 +0000 (21:35 -0400)]
cmd_mmc: make curr_device static

The curr_device variable isn't used outside of cmd_mmc, so mark it static
to avoid conflicts with other pieces of code (like sata which also exports
a curr_device).  Otherwise we end up with stuff like:
common/libcommon.a(cmd_sata.o):(.data.curr_device+0x0):
multiple definition of `curr_device'
common/libcommon.a(cmd_mmc.o):(.data.curr_device+0x0): first defined here

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoenvcrc: add missing dependencies on env storage
Mike Frysinger [Mon, 15 Jun 2009 01:35:16 +0000 (21:35 -0400)]
envcrc: add missing dependencies on env storage

When the envcrc building was made conditional, it missed a bunch of env
storage types, so add all currently supported types.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoRemove legacy NAND and disk on chip references from boards.
Scott Wood [Fri, 17 Jul 2009 00:08:04 +0000 (19:08 -0500)]
Remove legacy NAND and disk on chip references from boards.

Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agoconfig.mk: Remove $(PCI_CLOCK) reference
Shinya Kuribayashi [Sat, 20 Jun 2009 10:10:14 +0000 (19:10 +0900)]
config.mk: Remove $(PCI_CLOCK) reference

The following commit introduced $(PCI_CLOCK) reference so that
we could tweak `PCI_66M' definition via an environment variable.

> commit f046ccd15c8bc9613bfd72916b761a127d36e5c6
> Author: Eran Liberty <liberty@freescale.com>
> Date:   Thu Jul 28 10:08:46 2005 -0500
>
>     * Patch by Eran Liberty
>       Add support for the Freescale MPC8349ADS board.

But I suggest a removal of it for the following reasons:

* In 2006, MPC8349ADS was merged into MPC8349EMDS port,
  and it seems that MPC8349EMDS port is PCI_66M free.

* OTOH, PCI_66M is used by MPC832XEMDS an MPC8360EMDS ports,
  but they don't need $(PCI_CLOCK) environment variable at all.
  PCI_66M is automatically configured via $(BOARD)_config names
  with the help of $(findstring _66_,$@).

* Unfortunately $(PCI_CLOCK) has been undocumented anywhere,
  so only a few people know the existence of it these days.

* Keep config.mk independent from $(BOARD) as much as possible.

Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
15 years agofix: missing autoconfig.mk from general Makefile
Jean-Christophe PLAGNIOL-VILLARD [Sat, 23 May 2009 19:42:36 +0000 (21:42 +0200)]
fix: missing autoconfig.mk from general Makefile

At the first run of make we generate the autoconf.mk and
autoconf.mk.dep if not already the case and we currently include only
to .dep

In order to use these autogenerated values we need to include it also
even if it's included in config.mk but it's done before their
generation

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoAdded support for splash screen positioning
Matthias Weisser [Thu, 9 Jul 2009 14:07:30 +0000 (16:07 +0200)]
Added support for splash screen positioning

This patch adds support splash image positioning by adding an
additional variable "splashpos" to the environment. Please see
README for details.

Signed-off-by: Matthias Weisser <matthias.weisser@graf-syteco.de>
Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
15 years agovideo: mb862xx: replace printf with puts
Anatolij Gustschin [Tue, 7 Jul 2009 11:11:36 +0000 (13:11 +0200)]
video: mb862xx: replace printf with puts

Signed-off-by: Anatolij Gustschin <agust@denx.de>
15 years agovideo: mb862xx: use macros instead of magic numbers
Anatolij Gustschin [Tue, 7 Jul 2009 11:27:07 +0000 (13:27 +0200)]
video: mb862xx: use macros instead of magic numbers

Signed-off-by: Anatolij Gustschin <agust@denx.de>
15 years agovideo: mb862xx: fix coding style and remove dead code
Anatolij Gustschin [Tue, 7 Jul 2009 11:24:08 +0000 (13:24 +0200)]
video: mb862xx: fix coding style and remove dead code

Signed-off-by: Anatolij Gustschin <agust@denx.de>
15 years agomicroblaze: Remove ignored return type for __arch__swab16 function
Michal Simek [Tue, 30 Jun 2009 10:03:50 +0000 (12:03 +0200)]
microblaze: Remove ignored return type for __arch__swab16 function

This change remove compilation warnings.

Signed-off-by: Michal Simek <monstr@monstr.eu>
15 years agomicroblaze: Removed unused variables
Michal Simek [Tue, 30 Jun 2009 10:02:45 +0000 (12:02 +0200)]
microblaze: Removed unused variables

Signed-off-by: Michal Simek <monstr@monstr.eu>
15 years agoRemove legacy NAND and disk on chip code.
Scott Wood [Wed, 1 Apr 2009 20:02:13 +0000 (15:02 -0500)]
Remove legacy NAND and disk on chip code.

Legacy NAND had been scheduled for removal.  Any boards that use this
were already not building in the previous release due to an #error.

The disk on chip code in common/cmd_doc.c relies on legacy NAND,
and it has also been removed.  There is newer disk on chip code
in drivers/mtd/nand; someone with access to hardware and sufficient
time and motivation can try to get that working, but for now disk
on chip is not supported.

Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agonand: Change NAND_MAX_OOBSIZE to 218 as needed for some 4k page devices
Stefan Roese [Thu, 4 Jun 2009 14:40:36 +0000 (16:40 +0200)]
nand: Change NAND_MAX_OOBSIZE to 218 as needed for some 4k page devices

This is needed for the MPC512x NAND driver (fsl_nfc_nand.c) which already
defines such a 4k plus 218 bytes ECC layout.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agonand: ndfc: Remove unnecessary #ifdef's
Stefan Roese [Thu, 16 Jul 2009 13:13:04 +0000 (15:13 +0200)]
nand: ndfc: Remove unnecessary #ifdef's

Now that the 4xx NAND driver ndfc is moved to the common NAND driver
directory we don't need this #ifdef's anymore.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agonand/ppc4xx: Move PPC4xx NAND driver to common NAND driver directory
Stefan Roese [Thu, 16 Jul 2009 13:12:48 +0000 (15:12 +0200)]
nand/ppc4xx: Move PPC4xx NAND driver to common NAND driver directory

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agonand: fixed failed reads on corrected ECC errors in nand_util.c
Valeriy Glushkov [Tue, 14 Jul 2009 10:51:10 +0000 (13:51 +0300)]
nand: fixed failed reads on corrected ECC errors in nand_util.c

Signed-off-by: Valeriy Glushkov <gvv@lstec.com>
Signed-off-by: Paulraj, Sandeep <s-paulraj@ti.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agoTypo fix: use CONFIG_SOC_DM644X, not CONFIG_SOC_DM646.
David Brownell [Mon, 13 Jul 2009 23:29:04 +0000 (16:29 -0700)]
Typo fix: use CONFIG_SOC_DM644X, not CONFIG_SOC_DM646.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agoMTD: OneNAND: Increase the environment size to 4KiB
Kyungmin Park [Sat, 11 Jul 2009 07:49:55 +0000 (16:49 +0900)]
MTD: OneNAND: Increase the environment size to 4KiB

Also use mtd operation instead of onenand functions

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agompc83xx: MPC837xEMDS: Use hwconfig instead of pci_external_arbiter variable
Anton Vorontsov [Tue, 9 Jun 2009 20:25:38 +0000 (00:25 +0400)]
mpc83xx: MPC837xEMDS: Use hwconfig instead of pci_external_arbiter variable

Since we have simple hwconfig interface now, we don't need
pci_external_arbiter variable any longer.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
15 years agompc83xx: MPC8315ERDB: Use hwconfig for board type selection
Anton Vorontsov [Tue, 9 Jun 2009 20:25:36 +0000 (00:25 +0400)]
mpc83xx: MPC8315ERDB: Use hwconfig for board type selection

This patch simply converts the board to the hwconfig infrastructure.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
15 years agompc83xx: MPC837XEMDS: Fixup eSDHC nodes in device tree
Anton Vorontsov [Tue, 9 Jun 2009 20:25:31 +0000 (00:25 +0400)]
mpc83xx: MPC837XEMDS: Fixup eSDHC nodes in device tree

fdt_fixup_esdhc() will either disable or enable eSDHC nodes, and
also will fixup clock-frequency property.

Plus, since DR USB and eSDHC are mutually exclusive, we should
only configure the eSDHC if asked through hwconfig.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
15 years agompc83xx: MPC837XERDB: Add support for FSL eSDHC
Anton Vorontsov [Tue, 9 Jun 2009 20:25:30 +0000 (00:25 +0400)]
mpc83xx: MPC837XERDB: Add support for FSL eSDHC

This patch adds support for eSDHC on MPC837XERDB boards. The WP
switch doesn't seem to work on RDB boards though, the WP pin is
always asserted (can see the pin state when it's in GPIO mode).

FSL DR USB and FSL eSDHC are mutually exclusive because of pins
multiplexing, so user should specify 'esdhc' or 'dr_usb' options
in the hwconfig environment variable to choose between the
devices.

p.s.
Now we're very close to a monitor len limit (196 bytes left using
gcc-4.2.0), so also increase the monitor len by one sector (64 KB).

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
15 years agofsl_esdhc: Add device tree fixups
Anton Vorontsov [Tue, 9 Jun 2009 20:25:29 +0000 (00:25 +0400)]
fsl_esdhc: Add device tree fixups

This patch implements fdt_fixup_esdhc() function that is used to fixup
the device tree.

The function adds status = "disabled" propery if esdhc pins muxed away,
otherwise it fixups clock-frequency for esdhc nodes.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
15 years agoAdd simple hwconfig infrastructure
Anton Vorontsov [Tue, 9 Jun 2009 20:25:27 +0000 (00:25 +0400)]
Add simple hwconfig infrastructure

This patch implements simple hwconfig infrastructure: an
interface for software knobs to control a hardware.

This is very simple implementation, i.e. it is implemented
via `hwconfig' environment variable. Later we could write
some "hwconfig <enable|disable|list>" commands, ncurses
interface for Award BIOS-like interface, and frame-buffer
interface for AMI GUI[1] BIOS-like interface with mouse
support[2].

Current implementation details/limitations:

1. Doesn't support options dependencies and mutual exclusion.
   We can implement this by integrating apt-get[3] into the
   u-boot. But I didn't bother yet.

2. Since we don't implement hwconfig command, i.e. we're working
   with the environement directly, there is no way to tell that
   toggling a particular option will need a reboot to take
   an effect. So, for now it's advised to always reboot the
   target after modifying hwconfig variable.

3. We support hwconfig options with arguments. For example,

   set hwconfig dr_usb:mode=peripheral,phy_type=ulpi

   That means:
   - dr_usb - enable Dual-Role USB controller;
   - dr_usb:mode=peripheral - USB in Function mode;
   - dr_usb:phy_type=ulpi - USB should work with ULPI PHYs;

The purpose of this simple implementation is to define some
internal API and then we can continue improving user experience
by adding more mature interface, like hwconfig command with
bells and whistles. Or not adding, if we feel that current
interface fits its needs.

[1] http://en.wikipedia.org/wiki/American_Megatrends
[2] Regarding ncurses and GUI with mouse support -- I'm just
    kidding.
[3] The comment regarding apt-get is also a joke, meaning that
    dependency tracking could be non-trivial. For example, for
    enabling HW feature X we may need to disable Y, and turn Z
    into reduced mode (like RMII-only interface for ethernet,
    no MII).

    It's quite trivial to implement simple cases though.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Thu, 16 Jul 2009 20:13:54 +0000 (22:13 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Thu, 16 Jul 2009 20:13:45 +0000 (22:13 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

15 years agoMerge branch 'asm-generic' of git://git.denx.de/u-boot-microblaze
Wolfgang Denk [Thu, 16 Jul 2009 19:53:15 +0000 (21:53 +0200)]
Merge branch 'asm-generic' of git://git.denx.de/u-boot-microblaze

15 years agoImprove U-Boot Porting Guide in the README
Jerry Van Baren [Thu, 16 Jul 2009 00:42:59 +0000 (20:42 -0400)]
Improve U-Boot Porting Guide in the README

Update for...
* BDI2000 -> BDI3000 (BDI2000 is obsolete).
* Add a line to read the doc/README.* files
* Fix coding standard violations

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
15 years agomtd: cfi - if defined, use MAX_FLASH_BANKS_DETECT for static declarations
Kim Phillips [Tue, 14 Jul 2009 21:00:24 +0000 (16:00 -0500)]
mtd: cfi - if defined, use MAX_FLASH_BANKS_DETECT for static declarations

a.k.a cfi_mtd.c does as cfi_flash.c does.  This also prevents
the TQM834x build from doing a:

cfi_mtd.c:36: error: variably modified 'cfi_mtd_info' at file scope
cfi_mtd.c:37: error: variably modified 'cfi_mtd_names' at file scope

using gcc 4.4.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agompc83xx: increase MONITOR_LEN to offset growing pains
Kim Phillips [Tue, 7 Jul 2009 23:04:21 +0000 (18:04 -0500)]
mpc83xx: increase MONITOR_LEN to offset growing pains

Saving the environment leads to overwriting u-boot itself,
bricking boards.  Increase u-boot's image size so the environment
base address doesn't end up overlapping u-boot text.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
15 years agousb: mpx8349itx: added support of loading images from USB storage (MPH/DR)
Valeriy Glushkov [Tue, 30 Jun 2009 12:48:41 +0000 (15:48 +0300)]
usb: mpx8349itx: added support of loading images from USB storage (MPH/DR)

Signed-off-by: Valeriy Glushkov <gvv@lstec.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
15 years agousb: mpc834x: added support of the MPH USB controller in addition to the DR one
Valeriy Glushkov [Tue, 30 Jun 2009 12:48:40 +0000 (15:48 +0300)]
usb: mpc834x: added support of the MPH USB controller in addition to the DR one

Signed-off-by: Valeriy Glushkov <gvv@lstec.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
15 years agompc83xx: set 64BIT_VSPRINTF for boards using nand_util
Kim Phillips [Mon, 15 Jun 2009 16:51:47 +0000 (11:51 -0500)]
mpc83xx: set 64BIT_VSPRINTF for boards using nand_util

When enabling NAND support for a board, one must also define
CONFIG_SYS_64BIT_VSPRINTF because this is needed in nand_util.c
for correct output.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Dave Liu <daveliu@freescale.com>
Cc: Ron Madrid <ron_madrid@sbcglobal.net>
Cc: Anton Vorontsov <avorontsov@ru.mvista.com>
15 years agompc5121ads: add JFFS2 and MTDPARTS support; adjust flash map
Wolfgang Denk [Sun, 14 Jun 2009 18:58:53 +0000 (20:58 +0200)]
mpc5121ads: add JFFS2 and MTDPARTS support; adjust flash map

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoaria: add JFFS2 and MTDPARTS support; adjust flash map
Wolfgang Denk [Sun, 14 Jun 2009 18:58:52 +0000 (20:58 +0200)]
aria: add JFFS2 and MTDPARTS support; adjust flash map

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoaria: enable NAND flash support
Wolfgang Denk [Sun, 14 Jun 2009 18:58:51 +0000 (20:58 +0200)]
aria: enable NAND flash support

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoMPC512x: fix typo in comment listing the NAND driver name
Wolfgang Denk [Sun, 14 Jun 2009 18:58:50 +0000 (20:58 +0200)]
MPC512x: fix typo in comment listing the NAND driver name

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
15 years agomecp5123: cleanup - remove dead code
Wolfgang Denk [Sun, 14 Jun 2009 18:58:49 +0000 (20:58 +0200)]
mecp5123: cleanup - remove dead code

Remove dead code that was obviously a left-over from copy & paste.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
15 years agoaria: adjust memory controller initialization
Wolfgang Denk [Sun, 14 Jun 2009 18:58:48 +0000 (20:58 +0200)]
aria: adjust memory controller initialization

Needed for Rev. 2 silicon at 400 MHz

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoMPC512x: factor out common code
Wolfgang Denk [Sun, 14 Jun 2009 18:58:47 +0000 (20:58 +0200)]
MPC512x: factor out common code

Now that we have 3 boards for the MPC512x it turns out that they all
use the very same fixed_sdram() code.

This patch factors out this common code into cpu/mpc512x/fixed_sdram.c
and adds a new header file, include/asm-ppc/mpc512x.h, with some
macros, inline functions and prototype definitions specific to MPC512x
systems.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
15 years agomecp5123: fix build error
Wolfgang Denk [Sun, 14 Jun 2009 18:58:46 +0000 (20:58 +0200)]
mecp5123: fix build error

The mecp5123 board did not compile because the MSCAN Clock Control
Registers were missing; these got added, but as an array instead
of 4 individual registers. Adapt the code so it builds.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
15 years agoMPC512x: Add MSCAN1...4 Clock Control Registers
Wolfgang Denk [Sun, 14 Jun 2009 18:58:45 +0000 (20:58 +0200)]
MPC512x: Add MSCAN1...4 Clock Control Registers

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
15 years agoMPC512x: enabling NAND support requires CONFIG_SYS_64BIT_VSPRINTF
Wolfgang Denk [Sun, 14 Jun 2009 18:58:44 +0000 (20:58 +0200)]
MPC512x: enabling NAND support requires CONFIG_SYS_64BIT_VSPRINTF

When enabling NAND support for a board, one must also define
CONFIG_SYS_64BIT_VSPRINTF because this is needed in nand_util.c
for correct output.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
15 years agoMerge branch 'master' of /home/wd/git/u-boot/master
Wolfgang Denk [Mon, 13 Jul 2009 22:00:04 +0000 (00:00 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master

15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Mon, 13 Jul 2009 21:45:10 +0000 (23:45 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Mon, 13 Jul 2009 21:45:02 +0000 (23:45 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Mon, 13 Jul 2009 21:38:29 +0000 (23:38 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Mon, 13 Jul 2009 21:38:27 +0000 (23:38 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Mon, 13 Jul 2009 21:37:59 +0000 (23:37 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Wolfgang Denk [Mon, 13 Jul 2009 21:37:55 +0000 (23:37 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Mon, 13 Jul 2009 21:34:33 +0000 (23:34 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Mon, 13 Jul 2009 21:34:30 +0000 (23:34 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Mon, 13 Jul 2009 21:33:20 +0000 (23:33 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Mon, 13 Jul 2009 21:33:16 +0000 (23:33 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Mon, 13 Jul 2009 21:32:08 +0000 (23:32 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians