]> git.sur5r.net Git - u-boot/log
u-boot
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 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 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

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

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

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

15 years agoissue write command to base for JEDEC flash
Po-Yu Chuang [Fri, 10 Jul 2009 10:03:57 +0000 (18:03 +0800)]
issue write command to base for JEDEC flash

For JEDEC flash, we should issue word programming command relative to
base address rather than sector base address. Original source makes
SST Flash fails to program sectors which are not on the 0x10000 boundaries.

e.g.
SST39LF040 uses addr1=0x5555 and addr2=0x2AAA, however, each sector
is 0x1000 bytes.

Thus, if we issue command to "sector base (0x41000) + offset(0x5555)",
it sends to 0x46555 and the chip fails to recognize that address.

This patch is tested with SST39LF040.

Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoversatile: update config and merge to cfi flash driver
Jean-Christophe PLAGNIOL-VILLARD [Sat, 2 May 2009 09:53:50 +0000 (11:53 +0200)]
versatile: update config and merge to cfi flash driver

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Pearse <peter.pearse@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
15 years agoversatile: specify the board type on the prompt
Jean-Christophe PLAGNIOL-VILLARD [Sat, 2 May 2009 09:53:49 +0000 (11:53 +0200)]
versatile: specify the board type on the prompt

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Pearse <peter.pearse@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
15 years agoat91: Introduction of at91sam9g10 SOC.
Sedji Gaouaou [Thu, 25 Jun 2009 15:04:15 +0000 (17:04 +0200)]
at91: Introduction of at91sam9g10 SOC.

AT91sam9g10 is an ARM 926ej-s SOC. It is an evolution of the at91sam9261 with a
faster clock speed: 266/133MHz.

Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
15 years agoat91: Introduction of at91sam9g45 SOC.
Sedji Gaouaou [Thu, 9 Jul 2009 08:16:29 +0000 (10:16 +0200)]
at91: Introduction of at91sam9g45 SOC.

AT91sam9g45 series is an ARM 926ej-s SOC family clocked at 400/133MHz.
It embeds USB high speed host and device, LCD, DDR2 RAM, and a full set of
peripherals.

The first board that embeds at91sam9g45 chip is the AT91SAM9G45-EKES.
On the board you can find 2 USART, USB high speed,
a 480*272 LG lcd, ethernet, gpio/joystick/buttons.

Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
15 years agopxa: fix CKEN_B register bits
Daniel Mack [Tue, 23 Jun 2009 15:30:05 +0000 (17:30 +0200)]
pxa: fix CKEN_B register bits

The current defition for CKEN_B register bits is nonsense. Adding 32 to
the shifted value is equal to '| (1 << 5)', and this bit is marked
'reserved' in the PXA docs.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
15 years agopxa: add clock for system bus 2 arbiter
Daniel Mack [Tue, 23 Jun 2009 15:30:04 +0000 (17:30 +0200)]
pxa: add clock for system bus 2 arbiter

This clock is needed for systems using the USB2 device unit or the 2d
graphics accelerator.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
15 years agoOMAP3 pandora: Fix CKE1 MUX setting to allow self-refresh
Grazvydas Ignotas [Tue, 7 Jul 2009 21:30:01 +0000 (00:30 +0300)]
OMAP3 pandora: Fix CKE1 MUX setting to allow self-refresh

Pandora is using both SDRC CSes. The MUX setting is needed
for the second CS clock signal to allow the 2 RAM parts to
be put in self-refresh correctly.

Based on similar patch for beagle and overo by
Jean Pihet and Steve Sakoman.

15 years agoOMAP3 pandora: setup pulls for various GPIOs
Grazvydas Ignotas [Tue, 7 Jul 2009 21:30:00 +0000 (00:30 +0300)]
OMAP3 pandora: setup pulls for various GPIOs

Set pullups or pulldowns for GPIOs which need them.
Disable them for others, which have external pulls.
Also make disabled pull setting consistent (some pins had
type set to "up" even if pull type selection was disabled).

15 years agoOMAP3 pandora: setup pin mux for pins used on rev3 boards
Grazvydas Ignotas [Tue, 7 Jul 2009 21:29:59 +0000 (00:29 +0300)]
OMAP3 pandora: setup pin mux for pins used on rev3 boards

Setup pin mux for GPIO pins connected on rev3 or later
boards. Also change NUB2 IRQ pin. This should not affect
older boards because they don't have any nubs (analog
controllers) attached to them.

15 years agoOMAP3 pandora: pin mux cleanup
Grazvydas Ignotas [Tue, 7 Jul 2009 21:29:58 +0000 (00:29 +0300)]
OMAP3 pandora: pin mux cleanup

Remove configuration of not unused pins, effectively
leaving them in safe mode.

15 years agoarm: Kirkwood: bugfix: UART1 bar correction
Prafulla Wadaskar [Mon, 6 Jul 2009 10:20:47 +0000 (15:50 +0530)]
arm: Kirkwood: bugfix: UART1 bar correction

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
15 years agousb: Fix compiler warning with gcc4.4
Kumar Gala [Tue, 7 Jul 2009 20:48:58 +0000 (15:48 -0500)]
usb: Fix compiler warning with gcc4.4

ehci-hcd.c: In function 'ehci_submit_root':
ehci-hcd.c:719: warning: value computed is not used
ehci-hcd.c:748: warning: value computed is not used

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agosh: Update pci config for Renesas r7780mp board
Nobuhiro Iwamatsu [Wed, 8 Jul 2009 02:42:19 +0000 (11:42 +0900)]
sh: Update pci config for Renesas r7780mp board

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
15 years agosh: Add support ESPT-GIGA borad
Nobuhiro Iwamatsu [Thu, 25 Jun 2009 07:31:26 +0000 (16:31 +0900)]
sh: Add support ESPT-GIGA borad

ESPT-Giga is SH7763-based reference board.
Board support is relatively sparse, presently supporting serial,
gigabit ethernet, USB host, and MTD.

More information (in Japanese) available at:
http://www.cente.jp/product/cente_hard/ESPT-Giga.html

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
15 years agoAdd ESD PCI vendor ID
Matthias Fuchs [Fri, 3 Jul 2009 14:06:37 +0000 (16:06 +0200)]
Add ESD PCI vendor ID

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
15 years agoapi_examples/Makefile: General cleanup
Peter Tyser [Mon, 22 Jun 2009 23:01:41 +0000 (18:01 -0500)]
api_examples/Makefile: General cleanup

* Remove symlinking of files located outside api_examples/

* Auto generate dependencies for files located outside api_examples/

* Update names of variables to be similar to those in tools/Makefile

* Fix out of tree build error
  Dependencies are calculated for all files in the SRCS variable.
  Previously, the SRCS variable contained files which were symlinked
  into the api_examples/ directory.  These symlinked files did not exist
  when dependencies were calculated when building out of tree.  This
  resulted in errors such as:
    make[1]: *** No rule to make target `/work/wd/tmp-ppc/api_examples/.depend', needed by `_depend'.  Stop.
    make[1]: Leaving directory `/home/wd/git/u-boot/work/api_examples'
    make: *** [depend] Error 2

  Since symlinked source files are no longer used, this bug no longer
  exists.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Rafal Jaworowski <raj@semihalf.com>
15 years agoapi_examples/Makefile: Get rid of unnecessary intermediate LIB target
Peter Tyser [Mon, 22 Jun 2009 23:01:40 +0000 (18:01 -0500)]
api_examples/Makefile: Get rid of unnecessary intermediate LIB target

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Rafal Jaworowski <raj@semihalf.com>
15 years agoapi_examples/Makefile: Combine ELF and BIN targets
Peter Tyser [Mon, 22 Jun 2009 23:01:39 +0000 (18:01 -0500)]
api_examples/Makefile: Combine ELF and BIN targets

Combining the two rules cleans up the Makefile a bit

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Rafal Jaworowski <raj@semihalf.com>
15 years agoapi_examples/Makefile: Split up variable declarations
Peter Tyser [Mon, 22 Jun 2009 23:01:38 +0000 (18:01 -0500)]
api_examples/Makefile: Split up variable declarations

This cleans up the Makefile a bit and simplifies future changes

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Rafal Jaworowski <raj@semihalf.com>
15 years agoremove _IO_BASE and KSEG1ADDR from board configuration files
Timur Tabi [Fri, 19 Jun 2009 19:10:52 +0000 (14:10 -0500)]
remove _IO_BASE and KSEG1ADDR from board configuration files

The KSEG1ADDR macro used to be necessary for the RTL8139 Ethernet
driver, but the code that used that macro was removed over a year
ago, so board configuration files no longer need to define it.

The _IO_BASE macro is also automatically defined to 0 if it isn't
already set, so there's no need to define that macro either in the
board configuration files.

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Acked-by: Andy Fleming <afleming@freescale.com>
Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
15 years agoboard support patch for phyCORE-MPC5200B-tiny
Jon Smirl [Sun, 14 Jun 2009 22:21:28 +0000 (18:21 -0400)]
board support patch for phyCORE-MPC5200B-tiny

Add support for the Phytec phyCORE-MPC5200B-tiny.
Code originally from Pengutronix.de.
Created CONFIG_SYS_ATA_CS_ON_TIMER01 define for when IDE CS is on
Timer 0/1

Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
15 years agokallsyms: fix escaping of NUL char in strings
Mike Frysinger [Mon, 15 Jun 2009 17:37:20 +0000 (13:37 -0400)]
kallsyms: fix escaping of NUL char in strings

The current kallsyms code is using \\0 to escape the backslash in the awk
code, but the shell too needs escaping.  This way we make sure gcc is
passed the \0.  Then gcc itself will consume this as an octal, so we have
to use 000 so gcc will create the final NUL.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: cm-bf561: add example settings for EXT-BF5xx-USB-ETH2 add-on
Harald Krapfenbauer [Fri, 26 Jun 2009 14:18:49 +0000 (10:18 -0400)]
Blackfin: cm-bf561: add example settings for EXT-BF5xx-USB-ETH2 add-on

The cm-bf561 module can easily hook up to the EXT-BF5xx-USB-ETH2 extender
board, so add a simple example of how to do that in the board config.

Signed-off-by: Harald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: blackstamp: update spi flash settings
Mike Frysinger [Thu, 25 Jun 2009 23:40:28 +0000 (19:40 -0400)]
Blackfin: blackstamp: update spi flash settings

The latest blackstamp boards can only run the SPI flash at 15MHz before
they start to crap out, so lower the max speeds accordingly.  The new SPI
flash also has different sector requirements, so update the environment
sizes as well.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: add cache_dump commands
Mike Frysinger [Mon, 6 Oct 2008 07:31:52 +0000 (03:31 -0400)]
Blackfin: add cache_dump commands

A few debug-type commands used to dump the raw icache/dcache data.  Useful
when trying to track down cache-related bugs.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoppc4xx: Set default PCI device ID for 405EP boards
Matthias Fuchs [Wed, 8 Jul 2009 13:31:57 +0000 (15:31 +0200)]
ppc4xx: Set default PCI device ID for 405EP boards

Current code only sets the PCI vendor id to 0x1014 and
leaved device id to 0x0000.

Ths patch ....
a) uses the correct PCI_VENDOR_ID_IBM macro for this
b) sets the default device ID as stated in the UM to 0x0156
   by using PCI_DEVICE_ID_IBM_405GP for this.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoppc4xx: Move 405EP pci code from cpu_init_f() to __pci_pre_init()
Matthias Fuchs [Wed, 8 Jul 2009 11:43:55 +0000 (13:43 +0200)]
ppc4xx: Move 405EP pci code from cpu_init_f() to __pci_pre_init()

This patch moves some basic PCI initialisation from the 4xx cpu_init_f()
to cpu/ppc4xx/4xx_pci.c.

The original cpu_init_f() function enabled the 405EP's internal arbiter
in all situations. Also the HCE bit in cpc0_pci is always set.
The first is not really wanted for PCI adapter designs and the latter
is a general bug for PCI adapter U-Boots. Because it enables
PCI configuration by the system CPU even when the PCI configuration has
not been setup by the 405EP. The one and only correct place is
in pci_405gp_init() (see "Set HCE bit" comment).

So for compatibility reasons the arbiter is still enabled in any case,
but from weak pci_pre_init() so that it can be replaced by board specific
code.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoppc4xx: Make is_pci_host() available for all 440 and 405 CPUs
Matthias Fuchs [Wed, 8 Jul 2009 11:43:23 +0000 (13:43 +0200)]
ppc4xx: Make is_pci_host() available for all 440 and 405 CPUs

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agousb: add Marvell Kirkwood ehci host controller driver
Prafulla Wadaskar [Mon, 29 Jun 2009 15:26:43 +0000 (20:56 +0530)]
usb: add Marvell Kirkwood ehci host controller driver

This driver is tested on Sheevaplug platform

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agompc83xx: USB: fix: access of ehci struct elements
Vivek Mahajan [Wed, 24 Jun 2009 04:38:40 +0000 (10:08 +0530)]
mpc83xx: USB: fix: access of ehci struct elements

It fixes the access to the 'ehci' struct elements for mpc83xx which
should have been taken care of in 4ef01010aa4799c759d75e67007fdd3a38c88c8a
Sorry about that.

Signed-off-by: Vivek Mahajan <vivek.mahajan@freescale.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agompc8xxx: USB: fix: access of ehci struct elements
Vivek Mahajan [Fri, 19 Jun 2009 12:26:00 +0000 (17:56 +0530)]
mpc8xxx: USB: fix: access of ehci struct elements

This patch fixes the access to the 'ehci' struct elements which should
have been taken care off in 4ef01010aa4799c759d75e67007fdd3a38c88c8a
Sorry about that.

Signed-off-by: Vivek Mahajan <vivek.mahajan@freescale.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agousb: musb: add timeout via CONFIG_MUSB_TIMEOUT
Bryan Wu [Tue, 16 Jun 2009 09:26:27 +0000 (05:26 -0400)]
usb: musb: add timeout via CONFIG_MUSB_TIMEOUT

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agousb: musb: drop old musb read/write prototypes
Mike Frysinger [Tue, 16 Jun 2009 09:26:25 +0000 (05:26 -0400)]
usb: musb: drop old musb read/write prototypes

These functions are no longer defined, so remove their prototypes.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agousb: fix CONFIG_SYS_MPC83xx_USB_ADDR not defined error
Kim Phillips [Mon, 15 Jun 2009 16:50:07 +0000 (11:50 -0500)]
usb: fix CONFIG_SYS_MPC83xx_USB_ADDR not defined error

fix a stray CONFIG_MPC83XX that escaped commit
0f898604945af4543c1525fc33b6bae621a3b805.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agoasm-generic: Consolidate errno.h to asm-generic/errno.h
Michal Simek [Tue, 30 Jun 2009 13:47:30 +0000 (23:47 +1000)]
asm-generic: Consolidate errno.h to asm-generic/errno.h

This patch use blackfin errno.h implementation which
correspond Linux kernel one.

MIPS implemetation is different that's why I keep it.

I removed ppc_error_no.h from Marvell boards which
was the same too.

I have got ack from ppc40x, blackfin, arm, coldfire and avr custodians.

Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Michal Simek <monstr@monstr.eu>
15 years agoCommand improvements for ubifs
Simon Kagstrom [Tue, 7 Jul 2009 14:01:02 +0000 (16:01 +0200)]
Command improvements for ubifs

Check that an argument is passed to ubifsmount and that addresses and
sizes are actually numbers for ubifsload. Also improve the instructions
a bit.

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoHandle VID header offset in ubi part command
Simon Kagstrom [Tue, 7 Jul 2009 14:59:46 +0000 (16:59 +0200)]
Handle VID header offset in ubi part command

The VID header offset is sometimes needed to initialize the UBI
partition. This patch adds it (optionally) to the command line
for the ubi part command.

(Lines have been properly wrapped since last version)

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoMAINTAINERS: fix sorting, remove duplicates.
Wolfgang Denk [Thu, 9 Jul 2009 07:56:16 +0000 (09:56 +0200)]
MAINTAINERS: fix sorting, remove duplicates.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Wed, 8 Jul 2009 20:01:54 +0000 (22:01 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians