oweals/u-boot.git
15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Wed, 22 Jul 2009 23:00:17 +0000 (01:00 +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 [Wed, 22 Jul 2009 22:59:37 +0000 (00:59 +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 [Wed, 22 Jul 2009 22:57:21 +0000 (00:57 +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 [Wed, 22 Jul 2009 22:57:18 +0000 (00:57 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Wed, 22 Jul 2009 22:52:30 +0000 (00:52 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Wed, 22 Jul 2009 22:52:25 +0000 (00:52 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

15 years agoMerge branch 'master' of /home/wd/git/u-boot/master/
Wolfgang Denk [Wed, 22 Jul 2009 22:48:20 +0000 (00:48 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master/

15 years agoarm, kirkwood: added kw_gpio_set_valid() in gpio.h
Heiko Schocher [Thu, 16 Jul 2009 07:58:31 +0000 (09:58 +0200)]
arm, kirkwood: added kw_gpio_set_valid() in gpio.h

Signed-off-by: Heiko Schocher <hs@denx.de>
15 years agoKirkwood: add Marvell Kirkwood gpio driver
Dieter Kiermaier [Mon, 29 Jun 2009 12:45:08 +0000 (14:45 +0200)]
Kirkwood: add Marvell Kirkwood gpio driver

Signed-off-by: Dieter Kiermaier <dk-arm-linux@gmx.de>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Tested-by: Heiko Schocher <hs@denx.de>
15 years agoarm, kirkwood: added KW_TWSI_BASE in kirkwood.h
Heiko Schocher [Thu, 16 Jul 2009 07:59:10 +0000 (09:59 +0200)]
arm, kirkwood: added KW_TWSI_BASE in kirkwood.h

Signed-off-by: Heiko Schocher <hs@denx.de>
15 years agoMarvell RD6281A Board support
Prafulla Wadaskar [Thu, 16 Jul 2009 15:32:24 +0000 (21:02 +0530)]
Marvell RD6281A Board support

This is Marvell's 88F6281_A0 based reference design board

This patch is tested for-
1. Boot from DRAM/NAND flash/NFS
2. File transfer using tftp and loadb
3. NAND flash read/write/erase

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoapi: Fix broken build on ARM.
Piotr Ziecik [Fri, 17 Jul 2009 14:35:19 +0000 (16:35 +0200)]
api: Fix broken build on ARM.

This patch fixes broken build introduced by commit
84bf7ca522e94ec402a1264b01971b924b7e268f (api: remove un-needed
ifdef CONFIG_API already handle by the Makefile).

Signed-off-by: Piotr Ziecik <kosmo@semihalf.com>
15 years agoFix "ld: cannot find -lstubs" build error
Wolfgang Denk [Wed, 22 Jul 2009 21:53:23 +0000 (23:53 +0200)]
Fix "ld: cannot find -lstubs" build error

Commit 1bc15386 moved the examples/ to examples/standalone but failed
to adapt the Makefiles that need to link against libstubs.a

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years agoat91cap9adk: fix #ifdef/#endif pairing
Wolfgang Denk [Sat, 18 Jul 2009 18:47:36 +0000 (20:47 +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 agoARM Cortex A8: Move OMAP3 specific reset handler
Minkyu Kang [Mon, 20 Jul 2009 02:40:01 +0000 (11:40 +0900)]
ARM Cortex A8: Move OMAP3 specific reset handler

Because of the reset_cpu is soc specific, should be move to soc

Cc: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
15 years ago85xx/86xx: Replace in8/out8 with in_8/out_8 on FSL boards
Kumar Gala [Wed, 22 Jul 2009 15:12:39 +0000 (10:12 -0500)]
85xx/86xx: Replace in8/out8 with in_8/out_8 on FSL boards

The pixis code used in8/out8 all over the place.  Replace it with
in_8/out_8 macros.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoxpedite5370: Enable NAND command support
Peter Tyser [Tue, 21 Jul 2009 18:51:08 +0000 (13:51 -0500)]
xpedite5370: Enable NAND command support

Use the MPC8572's eLBC to access 1 GB (or greater) onboard NAND flash
via the 'nand' command.

Previously, the XPedite5370's NAND chip selects were properly
configured, but NAND support was not enabled.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoxes: Increase CONFIG_SYS_BOOTM_LEN to 16MB
Peter Tyser [Tue, 21 Jul 2009 18:51:07 +0000 (13:51 -0500)]
xes: Increase CONFIG_SYS_BOOTM_LEN to 16MB

Increasing CONFIG_SYS_BOOTM_LEN from 8 MB to 16 MB is necessary to
support uncompressing images larger than 8 MB when using the bootm
command.

Note that recent Linux kernels for the 85xx and 86xx map greater than
16MB of memory on bootup, but we use 16MB to maintain compatibility with
older Linux kernels for now.

Signed-off-by: Nate Case <ncase@xes-inc.com>
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoxpedite5370: Fix I2C GPIO initialization typo
Peter Tyser [Mon, 20 Jul 2009 00:17:41 +0000 (19:17 -0500)]
xpedite5370: Fix I2C GPIO initialization typo

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Heiko Schocher<hs@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoxpedite5200,5370: Use buffered NOR flash writes
Peter Tyser [Mon, 20 Jul 2009 00:17:40 +0000 (19:17 -0500)]
xpedite5200,5370: Use buffered NOR flash writes

Buffered writes are possible on the XPedite5200 and XPedite5370 and greatly
improve NOR flash write speeds

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago85xx, 86xx: Add common board_add_ram_info()
Peter Tyser [Fri, 17 Jul 2009 15:14:48 +0000 (10:14 -0500)]
85xx, 86xx: Add common board_add_ram_info()

Previously, 85xx and 86xx boards would display DRAM information on
bootup such as:

...
I2C:   ready
DRAM:
Memory controller interleaving enabled: Bank interleaving!
 2 GB
FLASH: 256 MB
...

This patch moves the printing of the DRAM controller configuration to a
common board_add_ram_info() function which prints out DDR type, width,
CAS latency, and ECC mode.  It also makes the DDR interleaving
information print out in a more sane manner:

...
I2C:   ready
DRAM:   2 GB (DDR2, 64-bit, CL=4, ECC on)
       DDR Controller Interleaving Mode: bank
FLASH: 256 MB
...

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agotqm85xx: Remove board_add_ram_info()
Peter Tyser [Fri, 17 Jul 2009 15:14:47 +0000 (10:14 -0500)]
tqm85xx: Remove board_add_ram_info()

This is in preparation for adding one common 8xxx board_add_ram_info()
function for all 8xxx boards

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoxes: Remove 8xxx board_add_ram_info() function
Peter Tyser [Fri, 17 Jul 2009 15:14:46 +0000 (10:14 -0500)]
xes: Remove 8xxx board_add_ram_info() function

This is in preparation for adding one common 8xxx board_add_ram_info()
fuction for all 8xxx boards

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago86xx: Rename ccsr_ddr's sdram_mode_1, sdram_cfg_1 fields
Peter Tyser [Fri, 17 Jul 2009 15:14:45 +0000 (10:14 -0500)]
86xx: Rename ccsr_ddr's sdram_mode_1, sdram_cfg_1 fields

Rename sdram_mode_1 to sdram_mode and sdram_cfg_1 to sdram_cfg to match
the 86xx user's manual and other Freescale architectures

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago85xx: Add pci/pcie E1000 ethernet support for MPC8544DS and MPC8536 boards
Roy Zang [Thu, 9 Jul 2009 02:05:48 +0000 (10:05 +0800)]
85xx: Add pci/pcie E1000 ethernet support for MPC8544DS and MPC8536 boards

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago85xx: Report which "bank" of NOR flash we are booting from on FSL boards
Kumar Gala [Wed, 15 Jul 2009 03:42:01 +0000 (22:42 -0500)]
85xx: Report which "bank" of NOR flash we are booting from on FSL boards

The p2020DS, MPC8536DS, MPC8572DS, MPC8544DS boards are capable of
swizzling the upper address bits of the NOR flash we boot out of which
creates the concept of "virtual" banks.  This is useful in that we can
flash a test of image of u-boot and reset to one of the virtual banks
while still maintaining a working image in "bank 0".

The PIXIS FPGA exposes registers on LBC which we can use to determine
which "bank" we are booting out of (as well as setting which bank to
boot out of).

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago86xx: Report which "bank" of NOR flash we are booting from on MPC8641HPCN
Kumar Gala [Wed, 15 Jul 2009 18:45:00 +0000 (13:45 -0500)]
86xx: Report which "bank" of NOR flash we are booting from on MPC8641HPCN

The MPC8641HPCN board is capable of swizzling the upper address bit of
the NOR flash we boot out of which creates the concept of "virtual"
banks.  This is useful in that we can flash a test of image of u-boot
and reset to one of the virtual banks while still maintaining a
working image in "bank 0".

The PIXIS FPGA exposes registers on LBC which we can use to determine
which "bank" we are booting out of (as well as setting which bank to
boot out of).

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoRefresh LZMA-lib to v4.65
Luigi 'Comio' Mantellini [Tue, 21 Jul 2009 08:45:49 +0000 (10:45 +0200)]
Refresh LZMA-lib to v4.65

Signed-off-by: Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
15 years agoAT91: factor out ROUND() macro
Wolfgang Denk [Fri, 17 Jul 2009 21:35:29 +0000 (23:35 +0200)]
AT91: factor out ROUND() macro

A large number of boards (all AT91 based) duplicated the ROUND()
macro in their board specific config files. Add the definition to
include/common.h and clean up the board config files.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years ago85xx: Bump up the BOOTMAP to 16M on FSL 85xx boards
Kumar Gala [Wed, 15 Jul 2009 13:54:50 +0000 (08:54 -0500)]
85xx: Bump up the BOOTMAP to 16M on FSL 85xx boards

We have always mapped at least 16M in the kernel and we have seen cases
with new kernel features that a kernel image needs more than 8M of
memory.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoMove api_examples to examples/api
Peter Tyser [Tue, 21 Jul 2009 00:02:21 +0000 (19:02 -0500)]
Move api_examples to examples/api

Also add a rule to remove demo.bin which was previously leftover
after a "make clean"

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years ago83xx, kmeter: fix compile error
Heiko Schocher [Tue, 21 Jul 2009 04:37:28 +0000 (06:37 +0200)]
83xx, kmeter: fix compile error

CONFIG_SYS_MALLOC_LEN is defined in the board config, and
the keymile-common.h, which collects common options used
by all keymile-boards. This results in a compile error
when compiling the kmeter1 board. So remove this define
in the board config file.

Signed-off-by: Heiko Schocher <hs@denx.de>
15 years agoi2c, mpc83xx: add CONFIG_SYS_I2C_INIT_BOARD for fsl_i2c
Heiko Schocher [Thu, 9 Jul 2009 10:04:26 +0000 (12:04 +0200)]
i2c, mpc83xx: add CONFIG_SYS_I2C_INIT_BOARD for fsl_i2c

This patch adds the possibility to call a board specific
i2c bus reset routine for the fsl_i2c bus driver, and adds
this option for the keymile kmeter1 board.

The deblock sequence for this board is implemented and
tested in the following way:

CR = 0x20 (release SDA and SCL pin)
CR = 0xa0 (start read)
dummy read
dummy read
if 2. dummy read == 0x00
3. dummy read

CR = 0x80 (SDA and SCL now 1 SR = 0x86)
CR = 0x00 (Modul reset SR=0x81)
CR = 0x80 (SDA and SCL = 1, SR = 0x81)

Signed-off-by: Heiko Schocher <hs@denx.de>
15 years agoMove examples/ to examples/standalone
Peter Tyser [Fri, 10 Jul 2009 16:03:19 +0000 (11:03 -0500)]
Move examples/ to examples/standalone

The current files in examples are all standalone application examples,
so put them in their own subdirectory for organizational purposes

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years agoMove architecture specific config.mk files into subdirs
Peter Tyser [Fri, 10 Jul 2009 16:03:15 +0000 (11:03 -0500)]
Move architecture specific config.mk files into subdirs

This cleans up U-Boot's toplevel directory a bit and makes the
architecture 'config.mk' file naming and location similar to board
and cpu 'config.mk' files

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years agoAdd "tags" to .gitignore file.
Po-Yu Chuang [Fri, 10 Jul 2009 10:25:34 +0000 (18:25 +0800)]
Add "tags" to .gitignore file.

Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agopowerpc: updates for the keymile boards
Heiko Schocher [Thu, 9 Jul 2009 10:04:18 +0000 (12:04 +0200)]
powerpc: updates for the keymile boards

- CONFIG_SYS_MAX_I2C_BUS changed to 1
  We use only one I2C hardwarecontroller on this boards, so
  change the CONFIG_SYS_MAX_I2C_BUS to 1.
- common: dont print errormsg if second IVM Block lacks.
- 82xx, mgcoge: fix double mtdpart entry in environment
- 82xx, mgcoge: activate on second Flash the second bank.
- common: CONFIG_ENV_SIZE 0x4000 for all keymile boards
- common: Change malloc size to 1MByte for all Keymile boards
    We need a bigger malloc area for the environment support (128k)
    on some Keymile boards (kmeter1) and the upcoming UBI support.
    Change it to 1MB for all Keymile boards to be on the save side.
    Also define CONFIG_SYS_64BIT_VSPRINTF which is needed for
    UBI/UBIFS support.
- Add UBI support to all Keymile boards
- change manner of writing "/localbus/ranges" node
    instead of writting the complete "/localbus/ranges" node
    before booting Linux, only update the ranges entries
    which gets dynamical detected (size of flashes).
    This is needed, because keymile adds in the DTS
    "/localbus/ranges" node entries, which u-boot must
    not overwrite/delete.
- kmeter, mgcoge: define 2 seperate regions needed for the Intel P30 chips
    The Intel P30 chip has 2 non-identical chips on
    one die, so we need to define 2 seperate regions
    that are scanned by physmap_of independantly.
- kmeter1: Add MTD concat support to Keymile boards
- 82xx, mgcoge: add "unlock=yes" to default environment
- added CONFIG_MTD_DEVICE to get in sync with mainline code

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agofsl_sata: Fix compiler warnings shown by gcc-4.4
galak [Tue, 7 Jul 2009 20:53:21 +0000 (15:53 -0500)]
fsl_sata: Fix compiler warnings shown by gcc-4.4

Update fsl_sata to use common structures instead of casting
back and forth between the fsl specific ones and the common ones
(which are identical).

fsl_sata.c: In function 'scan_sata':
fsl_sata.c:550: warning: dereferencing pointer 'cfis' does break strict-aliasing rules
fsl_sata.c:549: warning: dereferencing pointer 'cfis' does break strict-aliasing rules
fsl_sata.c:548: warning: dereferencing pointer 'cfis' does break strict-aliasing rules
fsl_sata.c:545: note: initialized from here
fsl_sata.c:592: warning: dereferencing pointer 'cfis' does break strict-aliasing rules
fsl_sata.c:590: warning: dereferencing pointer 'cfis' does break strict-aliasing rules
fsl_sata.c:588: warning: dereferencing pointer 'cfis' does break strict-aliasing rules
fsl_sata.c:586: warning: dereferencing pointer 'cfis' does break strict-aliasing rules
fsl_sata.c:579: warning: dereferencing pointer 'cfis' does break strict-aliasing rules
...

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoAdd unaligned.h for arm
Simon Kagstrom [Tue, 7 Jul 2009 13:58:51 +0000 (15:58 +0200)]
Add unaligned.h for arm

This patch adds unaligned.h for ARM (needed to build with LZO
compression). The file is taken from the linux kernel, but includes
u-boot headers instead.

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Acked-by: Stefan Roese <sr@denx.de>
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-i2c
Wolfgang Denk [Mon, 20 Jul 2009 20:57:25 +0000 (22:57 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

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

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 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 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 agoAdd unaligned.h for arm
Simon Kagstrom [Tue, 7 Jul 2009 11:58:51 +0000 (13:58 +0200)]
Add unaligned.h for arm

This patch adds unaligned.h for ARM (needed to build with LZO
compression). The file is taken from the linux kernel, but includes
u-boot headers instead.

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Acked-by: Stefan Roese <sr@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 agoMarvell MV88F6281GTW_GE Board support
Prafulla Wadaskar [Thu, 16 Jul 2009 15:28:01 +0000 (20:58 +0530)]
Marvell MV88F6281GTW_GE Board support

This is Marvell's 88F6281_A0 based custom board developed
for wireless access point product

This patch is tested for-
1. Boot from DRAM/SPI flash/NFS
2. File transfer using tftp and loadb
3. SPI flash read/write/erase
4. Booting Linux kernel and RFS from SPI flash
5. Boot from USB supported

Reviewed-by: Ronen Shitrit <rshitrit@marvell.com>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
15 years agoMarvell Sheevaplug Board support
Prafulla Wadaskar [Thu, 16 Jul 2009 15:28:00 +0000 (20:58 +0530)]
Marvell Sheevaplug Board support

Reference:
http://plugcomputer.org/
http://openplug.org/plugwiki/index.php/Das_U-boot_plug_support

This patch is tested for-
1. Boot from DRAM/NAND flash
2. File transfer using tftp
3. NAND flash read/write/erase
4. Linux kernel and RFS Boot from NAND
5. Enabled USB PHY init for kernel need
6. Boot from USB supported

Note: to boot Kirkwood kernel with USB support,
you should add "usb start" in the boot sequence

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
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>