]> git.sur5r.net Git - u-boot/log
u-boot
13 years agoppc4xx: Fix missing linker scripts for partial linking
Stefan Roese [Tue, 14 Dec 2010 16:49:52 +0000 (17:49 +0100)]
ppc4xx: Fix missing linker scripts for partial linking

This patch fixes the acadia_nand and kilauea_nand linker scripts
which have been missing in commit ee8028b7 [ppc4xx: Cleanup for
partial linking and --gc-sections]

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Bernhard Weirich <Bernhard.Weirich@riedel.net>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Mon, 13 Dec 2010 23:18:19 +0000 (00:18 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Mon, 13 Dec 2010 23:06:00 +0000 (00:06 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

13 years agoARM: */start.S: use canonical asm syntax
Wolfgang Denk [Thu, 9 Dec 2010 10:26:24 +0000 (11:26 +0100)]
ARM: */start.S: use canonical asm syntax

Make code build with older tool chains.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agompc83xx: fix pcie enumeration
Baidu Boy [Mon, 29 Nov 2010 13:10:45 +0000 (21:10 +0800)]
mpc83xx: fix pcie enumeration

This patch fix a problem for the pcie enumeration for mpc83xx cpus.  Without
this we will not  get correct value in hose->regions[...].

The pointer *reg in function mpc83xx_pcie_init_bus() shall not be changed.
Because we will use this pointer as a parameter to call function
mpc83xx_pcie_register_hose().

Signed-off-by: Baidu Boy <liucai.lfn@gmail.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
13 years agop1022ds: fix switching of DIU/LBC signals
Timur Tabi [Fri, 3 Dec 2010 19:03:45 +0000 (13:03 -0600)]
p1022ds: fix switching of DIU/LBC signals

On the P1022, the pins which drive the video display (DIU) are muxed with the
local bus controller (LBC), so if the DIU is active, the pins need to be
temporarily muxed to LBC whenever accessing NOR flash.

The code which handled this transition is checking and changing the wrong
bits in PMUXCR.

Also add a follow-up read after a write to NOR flash if we're going to
mux back to DIU after the write, as described in the P1022 RM.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agofsl_esdhc: Set the eSHDC DMACTL[SNOOP] bit after resetting the controller
P.V.Suresh [Sat, 4 Dec 2010 05:07:23 +0000 (10:37 +0530)]
fsl_esdhc: Set the eSHDC DMACTL[SNOOP] bit after resetting the controller

eSDHC host controller reset results in clearing of snoop bit also.
This patch sets the SNOOP bit after the completion of host controller reset.
Without this patch mmc reads are not consistent.

Signed-off-by: P.V.Suresh <pala@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agofsl_upm: Add MxMR/MDR synchronization
John Schmoller [Thu, 2 Dec 2010 17:43:10 +0000 (11:43 -0600)]
fsl_upm: Add MxMR/MDR synchronization

According to Freescale reference manuals (eg section "13.4.4.2
Programming the UPMs" of the P4080 Reference Manual):

"Since the result of any update to the MxMR/MDR register must be in
effect before the dummy read or write to the UPM region, a write to
MxMR/MDR should be followed immediately by a read of MxMR/MDR."

The UPM on a custom P4080-based board did not work without performing
a read of MxMR/MDR after a write.

Signed-off-by: John Schmoller <jschmoller@xes-inc.com>
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agotsec: Revert to setting TBICR_ANEG_ENABLE by default for SGMII
Kumar Gala [Thu, 2 Dec 2010 04:55:54 +0000 (22:55 -0600)]
tsec: Revert to setting TBICR_ANEG_ENABLE by default for SGMII

The following commit:

commit 46e91674fb4b6d06c6a4984c0b5ac7d9a16923f4
Author: Peter Tyser <ptyser@xes-inc.com>
Date:   Tue Nov 3 17:52:07 2009 -0600

    tsec: Force TBI PHY to 1000Mbps full duplex in SGMII mode

Removed setting Auto-Neg by default, however this is believed to be
proper default configuration for initialization of the TBI interface.

Instead we explicitly set CONFIG_TSEC_TBICR_SETTINGS for the
XPedite5370 & XPedite5500 boards that use a Broadcomm PHY which require
Auto-Neg to be disabled to function properly.

This addresses a breakage on the P2020 DS & MPC8572 DS boards when used
with an SGMII riser card.  We also remove setting
CONFIG_TSEC_TBICR_SETTINGS on the P1_P2_RDB family of boards as now the
default setting is sufficient for them.

Additionally, we clean up the code a bit to remove an unnecessary second
define.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Peter Tyser <ptyser@xes-inc.com>
Tested-by: Peter Tyser <ptyser@xes-inc.com>
13 years agoomap3: emif|sdrc: use a single global data define
Nishanth Menon [Sat, 11 Dec 2010 16:41:42 +0000 (11:41 -0500)]
omap3: emif|sdrc: use a single global data define

DECLARE_GLOBAL_DATA_PTR declarations in functions are inherently
troublesome with various compilers (e.g. gcc 4.5)

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoOMAP: Timer: Replace bss variable by gd
Dirk Behme [Sat, 11 Dec 2010 15:50:48 +0000 (10:50 -0500)]
OMAP: Timer: Replace bss variable by gd

Reuse the gd->tbl value for timestamp and add gd->lastinc for lastinc bss
values in the OMAP timer driver.

The usage of bss values in drivers before initialisation of bss is forbidden.
In that special case some data in .rel.dyn gets corrupted.

Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Tested-by: Steve Sakoman <steve.sakoman@linaro.org>
Tested-by: John Rigby <john.rigby@linaro.org>
Tested-by: Nishanth Menon <nm@ti.com>
Acked-by: Nishanth Menon <nm@ti.com>
Tested-by: Heiko Schocher <hs@denx.de>
Tested-by: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoDaVinci DM6446: Config Update
Sandeep Paulraj [Sat, 11 Dec 2010 15:47:30 +0000 (10:47 -0500)]
DaVinci DM6446: Config Update

The DM6446 does not build due to the ARM
relocation patch.

Also the board does not build in the NOR
mode. Changed default to NAND to ensure
no build failure.
While at it removed CONFIG_CMD_KGDB

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agodavinci: Rewrite timer.c to use tbl/tbu emulation variables in gd
Nick Thompson [Sat, 11 Dec 2010 15:46:46 +0000 (10:46 -0500)]
davinci: Rewrite timer.c to use tbl/tbu emulation variables in gd

This change allows the davinci timer functions to be used before
relocation since it avoids using static variables prior to BSS being
made available.

The code is based on that used in the at91 timers, modified to use
a davinci specific hardware timer. It also maintains reset_timer()
to allow deprecated timer usage to continue to work (for example,
in nand_base.c)

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
Tested-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Tested-by: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-imx
Wolfgang Denk [Thu, 9 Dec 2010 19:52:44 +0000 (20:52 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-imx

13 years agoinclude/linux/mii.h: update for supporting GE
Macpaul Lin [Fri, 3 Dec 2010 05:52:34 +0000 (13:52 +0800)]
include/linux/mii.h: update for supporting GE

This file has been synced (copy) from Linux source code.
This commit was based on kernel 2.6.32.
It updates gigabit related phy registers and basic definitions.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
13 years agoARM: make timer variables in gt_t available for all ARM platforms
Prafulla Wadaskar [Wed, 1 Dec 2010 12:16:52 +0000 (17:46 +0530)]
ARM: make timer variables in gt_t available for all ARM platforms

All code that attemots to access variables in BSS before relocation
(for example directly or indirectly by board_init_f()) needs to be
fixed. Especially timer.c needs to fix on most of the ARM platforms.

This patch makes timer related variables in gd_t available for
all ARM implementations.

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Edited commit message.
Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoarmv7: fix relocation skip
Andreas Bießmann [Tue, 30 Nov 2010 23:58:36 +0000 (00:58 +0100)]
armv7: fix relocation skip

I doubt the stack_setup() was defective before:
 we load the current location of _start and compare against destination
 of relocate_code(). If we are already there we shoud skip the
 relocation and jump over to clear_bss. Before the clear_bss was also skipped.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoarm: fixloop(): do not use r8 for relocation
Andreas Bießmann [Tue, 30 Nov 2010 23:58:35 +0000 (00:58 +0100)]
arm: fixloop(): do not use r8 for relocation

r8 is used for global_data and should therefore be left alone!

For C code the compiler flag --fixed-r8 does the job, but in assembler
we need to be aware of that fact.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoarm: relocate_code(): do not set register useless
Andreas Bießmann [Tue, 30 Nov 2010 23:58:34 +0000 (00:58 +0100)]
arm: relocate_code(): do not set register useless

In case we are still at relocation target address before relocation we
do not need to load the registers needed for relocation. We should
instead skip the whole relocation part and jump over to clear_bss
immediately.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoarm: copy_loop(): use scratch register
Andreas Bießmann [Tue, 30 Nov 2010 23:58:33 +0000 (00:58 +0100)]
arm: copy_loop(): use scratch register

This patch uses r1 as scratch register for copy_loop(). Therefore we do
not longer need r7 for the storage of relocate_code()'s 'addr_moni' (the
destination address of relocation).
Therefore r7 can be used later on for other purposes.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agohwconfig: Fix handling of env_hwconfig, board_hwconfig, and cpu_hwconfig
Kumar Gala [Tue, 30 Nov 2010 21:58:27 +0000 (15:58 -0600)]
hwconfig: Fix handling of env_hwconfig, board_hwconfig, and cpu_hwconfig

The handling of env_hwconfig, board_hwconfig, and cpu_hwconfig got
broken when we removed the boards defining dummy board_hwconfig
& cpu_hwconfig values.

We fix this by handling the various strings in priority order.  If
hwconfig_parse returns NULL for a given string we check the next one
in order (env_hwconfig, board_hwconfig, followed by cpu_hwconfig).

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoarm: add 8-byte alignment for ABI compliance before board_init_f
Heiko Schocher [Fri, 12 Nov 2010 06:53:55 +0000 (07:53 +0100)]
arm: add 8-byte alignment for ABI compliance before board_init_f

suggested from Daniel Hobi<daniel.hobi@schmid-telecom.ch>

Tested on following boards:
arm1136: qong
armv7: omap3_beagle
arm926ejs: magnesium, tx25

Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
cc: Albert ARIBAUD <albert.aribaud@free.fr>

13 years agoARMV7: Vexpress: Fix build error
Dirk Behme [Mon, 29 Nov 2010 18:56:59 +0000 (19:56 +0100)]
ARMV7: Vexpress: Fix build error

Fix ca9x4_ct_vxp build error

Configuring for ca9x4_ct_vxp board...
board/armltd/vexpress/libvexpress.o: In function `udelay':
u-boot.git/board/armltd/vexpress/ca9x4_ct_vxp.c:161: multiple
definition of `udelay'
lib/libgeneric.o:u-boot.git/lib/time.c:34: first defined here

lib/libgeneric.o: In function `udelay':

zlib.c:(.text+0x1ee8): undefined reference to `__udelay'

Signed-of-by: Dirk Behme <dirk.behme@googlemail.com>
13 years agoARMV7: Vexpress: fix compile warnings
Matt Waddel [Tue, 2 Nov 2010 23:25:21 +0000 (17:25 -0600)]
ARMV7: Vexpress: fix compile warnings

Fixed "pointer from integer without a cast" warnings in Vexpress.

Signed-off-by: Matt Waddel <matt.waddel@linaro.org>
13 years agoARMV7: Vexpress: fix build errors
Matt Waddel [Thu, 2 Dec 2010 19:43:14 +0000 (12:43 -0700)]
ARMV7: Vexpress: fix build errors

This patch fixes build errors in the vexpress system:
  - Removed sys_proto.h requirement from syslib.c.
  - Switched vexpress to the default armv7 linker script.
  - Renamed TEXT_BASE to CONFIG_SYS_TEXT_BASE.

Signed-off-by: Matt Waddel <matt.waddel@linaro.org>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Wed, 8 Dec 2010 22:17:57 +0000 (23:17 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

13 years agoonenand: fix oob print out issue
Lei Wen [Tue, 7 Dec 2010 01:38:18 +0000 (09:38 +0800)]
onenand: fix oob print out issue

Seems original implementation forget to set the pointer to point
to the oobbuf, so when we want to see oob buf, we see nothing...
Fix it by get pointer as the oobbuf set.

Signed-off-by: Lei Wen <leiwen@marvell.com>
13 years agoarm920t/at91/timer: replace bss variables by gd
Andreas Bießmann [Tue, 30 Nov 2010 09:45:06 +0000 (09:45 +0000)]
arm920t/at91/timer: replace bss variables by gd

Reuse the gd->tbl value for timestamp and add gd->lastinc for lastinc
bss values in arm920t/at91/timer driver.
The usage of bss values in driver before initialisation of bss is
forbidden. In that special case some data in .rel.dyn gets corrupted by
the arm920t/at91/timer driver.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoarm920t/at91/reset: board_reset: define weak symbol
Andreas Bießmann [Tue, 30 Nov 2010 09:45:05 +0000 (09:45 +0000)]
arm920t/at91/reset: board_reset: define weak symbol

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoMAKEALL: fix AT91
Andreas Bießmann [Tue, 30 Nov 2010 09:45:04 +0000 (09:45 +0000)]
MAKEALL: fix AT91

* add boards_by_soc()
 * remove boards already in boards.cfg from LIST_AT91

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoat91rm9200ek: add configure target for RAM boot
Andreas Bießmann [Tue, 30 Nov 2010 09:45:03 +0000 (09:45 +0000)]
at91rm9200ek: add configure target for RAM boot

This patch also removes now unnecessary config.mk in board directory and
make usage of new features in boards.cfg.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoat91rm9200ek: fix SDRAM initialistation values
Andreas Bießmann [Sat, 4 Dec 2010 11:31:46 +0000 (11:31 +0000)]
at91rm9200ek: fix SDRAM initialistation values

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoAT91: add TOP9000 support
Reinhard Meyer [Sat, 30 Oct 2010 23:09:58 +0000 (23:09 +0000)]
AT91: add TOP9000 support

Adds support for the EMK TOP9000 CPU Module which is
based on ATMELs ARM926EJS AT91SAM9XE SoC.

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: fix EMAC gpio init in at91sam9260_devices.c
Reinhard Meyer [Wed, 1 Dec 2010 04:49:53 +0000 (05:49 +0100)]
AT91: fix EMAC gpio init in at91sam9260_devices.c

The AT91SAM9G20 BOOT ROM apparently initializes PA23 and PA24 to multi drive
(open drain). Revert this, if those pins are going to be used for MII.

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: gen_atmel_mci.c: fix bug when Slot B is used
Reinhard Meyer [Tue, 16 Nov 2010 08:24:41 +0000 (09:24 +0100)]
AT91: gen_atmel_mci.c: fix bug when Slot B is used

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years ago83xx NAND boot: fix boards.cfg
Scott Wood [Tue, 7 Dec 2010 00:42:02 +0000 (18:42 -0600)]
83xx NAND boot: fix boards.cfg

This patch http://patchwork.ozlabs.org/patch/72962/ included a boards.cfg
change, but it was omitted when applied as
f1c574d4006d81301792e70fafc31ff39259e793

This fixes the NAND SPL build on MPC8315ERDB.

Signed-off-by: Scott Wood <scottwood@freescale.com>
13 years agofix s3c2410_nand timing default values
David Müller (ELSOFT AG) [Mon, 29 Nov 2010 05:49:19 +0000 (05:49 +0000)]
fix s3c2410_nand timing default values

The attached patch fixes wrong timing default values and adds the
possibility to specify board specific timing value in the board config file.

Signed-off-by: David Mueller <d.mueller@elsoft.ch>
13 years agoenv_nand: Use nand_read_skip_bad instead of nand_read
Steve Sakoman [Fri, 3 Dec 2010 13:25:43 +0000 (13:25 +0000)]
env_nand: Use nand_read_skip_bad instead of nand_read

The nand-read function returns an error code if correctable errors have occurred.
This is not desirable, since the errors have been corrected!

This patch switches to the nand_read_skip_bad function which does not
return an error code if the errors are correctable.

Signed-off-by: Steve Sakoman <steve.sakoman@linaro.org>
Acked-by: Scott Wood <scottwood@freescale.com>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Wolfgang Denk [Mon, 6 Dec 2010 22:45:35 +0000 (23:45 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-video

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-ubi
Wolfgang Denk [Mon, 6 Dec 2010 22:44:06 +0000 (23:44 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ubi

13 years agoubifs.c: BUG: Error following links
Ricardo Ribalda Delgado [Thu, 2 Dec 2010 14:02:35 +0000 (15:02 +0100)]
ubifs.c: BUG: Error following links

The link_name variable is declared inside the if block and it is used
outside it through the name pointer.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoUBI/UBIFS: Automatically unmount UBIFS volume upon UBI partition change
Stefan Roese [Mon, 1 Nov 2010 16:28:22 +0000 (17:28 +0100)]
UBI/UBIFS: Automatically unmount UBIFS volume upon UBI partition change

Automatically unmount UBIFS partition when user changes the UBI device.
Otherwise the following UBIFS commands will crash.

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoUBIFS: Change ubifsload to not read beyond the requested size
Stefan Roese [Mon, 1 Nov 2010 16:28:00 +0000 (17:28 +0100)]
UBIFS: Change ubifsload to not read beyond the requested size

Until now ubifsload pads the destination with 0 up to a multiple of
UBIFS_BLOCK_SIZE (4KiB) while reading a file to memory. This patch
changes this behaviour to only read to the requested length. This
is either the file length or the length/size provided as parameter
to the ubifsload command.

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoUBIFS: Change "ubifs mount" to "ubifsmount" in ubifsls output
Stefan Roese [Thu, 28 Oct 2010 12:09:29 +0000 (14:09 +0200)]
UBIFS: Change "ubifs mount" to "ubifsmount" in ubifsls output

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoUBIFS: Add ubifsumount command to unmount an active volume
Stefan Roese [Thu, 28 Oct 2010 12:09:22 +0000 (14:09 +0200)]
UBIFS: Add ubifsumount command to unmount an active volume

This new ubifsumount command allows the user to unmount a previously
mounted UBIFS volume.

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agompc512x: aria: cleanup board config file
Anatolij Gustschin [Mon, 29 Nov 2010 21:36:39 +0000 (22:36 +0100)]
mpc512x: aria: cleanup board config file

CONFIG_FSL_DIU_LOGO_BMP has been removed while refactoring
MPC8610 and MPC5121 DIU code, so remove it.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
13 years agovideo: move fsl_diu_fb driver to drivers/video
Anatolij Gustschin [Mon, 29 Nov 2010 20:17:37 +0000 (21:17 +0100)]
video: move fsl_diu_fb driver to drivers/video

Since the driver is used not only on Freescale boards,
we move it to a common place for video drivers as
suggested by Wolfgang. The patch also cleans up the
top level Makefile.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
13 years agopowerpc/85xx: do not reloc l2srbar if CONFIG_FLASH_BASE is not defined
Haiying Wang [Wed, 1 Dec 2010 15:35:30 +0000 (10:35 -0500)]
powerpc/85xx: do not reloc l2srbar if CONFIG_FLASH_BASE is not defined

This fixes the compiling error for the board  which doesn't have NOR flash
(so CONFIG_FLASH_BASE is not defined)

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Enable HWCONFIG on MPC8572DS
Kumar Gala [Fri, 19 Nov 2010 14:53:25 +0000 (08:53 -0600)]
powerpc/85xx: Enable HWCONFIG on MPC8572DS

We need HWCONFIG to allow configuration of DDR params

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/8xxx: Fix _POST_WORD_ADDR on 85xx & 86xx systems
Kumar Gala [Wed, 1 Dec 2010 12:42:04 +0000 (06:42 -0600)]
powerpc/8xxx: Fix _POST_WORD_ADDR on 85xx & 86xx systems

We intended to use the PIC TFRR register however we where missing adding
in the PIC register base offset from IMMR when we defined
_POST_WORD_ADDR.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Tue, 30 Nov 2010 21:13:32 +0000 (22:13 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Tue, 30 Nov 2010 21:12:36 +0000 (22:12 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

13 years agohwconfig: Fix dummy initialization of {board, cpu}_hwconfig
Kumar Gala [Tue, 30 Nov 2010 21:01:28 +0000 (15:01 -0600)]
hwconfig: Fix dummy initialization of {board, cpu}_hwconfig

Since board_hwconfig & cpu_hwconfig are defined as weak and dont have a
default value they will get put into the BSS if they aren't defined
elsewhere.  This is problematic as we try to utilize hwconfig before
we've relocated and thus BSS isn't setup.

Instead of giving dummy values in the board files that utilize this
feature, we can just initialize the variables to an empty string and
thus move them out of the BSS if they aren't defined elsewhere.

Also made board_hwconfig & cpu_hwconfig arrays to reduce size associated
with string pointers vs arrays.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Introduce CONFIG_SYS_EXTRA_ENV_RELOC
Kumar Gala [Mon, 29 Nov 2010 20:32:11 +0000 (14:32 -0600)]
powerpc/85xx: Introduce CONFIG_SYS_EXTRA_ENV_RELOC

Some systems need to relocate the env_addr pointer early because the
location it points to will get invalidated before env_relocate is
called.  One example is on systems that might use a L2 or L3 cache
in SRAM mode and initialize that cache from SRAM mode back to being
a cache in cpu_init_r.

We set this on the 85xx boards that have support for NAND, SPI, or
SDHC/MMC boot support as they use a secondary cache in SRAM mode and
need the env_addr pointer relocated since we change from SRAM to normal
cache mode in cpu_init_r.

Also removed CONFIG_SYS_SPL as its not used anywhere.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-samsung
Wolfgang Denk [Tue, 30 Nov 2010 20:30:13 +0000 (21:30 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-samsung

13 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Tue, 30 Nov 2010 20:28:10 +0000 (21:28 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Wolfgang Denk [Tue, 30 Nov 2010 20:28:03 +0000 (21:28 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

13 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Tue, 30 Nov 2010 20:15:25 +0000 (21:15 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

13 years agompc83xx: Make it boot again
Joakim Tjernlund [Fri, 19 Nov 2010 13:15:33 +0000 (14:15 +0100)]
mpc83xx: Make it boot again

After the removal of COLD/WARM start flags my mpc8321
board didn't boot anymore.
Trial and error suggests that map/remap_flash_by_xxx needs
to wait after updating LBLAWAR1 to make sure the the change has
reached the HW before continuing with the code that depends on it.
Final fix suggested by Scott Wood.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
13 years agompc83xx: Fix for MPC8360 ATM Quad OC3 External Phys
Stefan Popa [Fri, 26 Nov 2010 17:09:40 +0000 (17:09 +0000)]
mpc83xx: Fix for MPC8360 ATM Quad OC3 External Phys

Changed the CS4 and CS5 addresses on Local Bus for matching the PMC0
and PMC1 addresses.

Signed-off-by: Stefan Popa <Stefan.Popa@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
13 years agoOMAP3: Zoom2: Fix ARM relocation support
Dirk Behme [Tue, 30 Nov 2010 16:10:48 +0000 (11:10 -0500)]
OMAP3: Zoom2: Fix ARM relocation support

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoOMAP3: Zoom1: Fix ARM relocation support
Dirk Behme [Tue, 30 Nov 2010 16:10:45 +0000 (11:10 -0500)]
OMAP3: Zoom1: Fix ARM relocation support

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoOMAP3: SDP3430: Fix ARM relocation support
Dirk Behme [Tue, 30 Nov 2010 16:10:40 +0000 (11:10 -0500)]
OMAP3: SDP3430: Fix ARM relocation support

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agosh: r7780mp: Remove CONFIG_DRIVER_NE2000 from config
Nobuhiro Iwamatsu [Wed, 24 Nov 2010 05:16:47 +0000 (14:16 +0900)]
sh: r7780mp: Remove CONFIG_DRIVER_NE2000 from config

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
13 years agosh: Fix build in start.S
Nobuhiro Iwamatsu [Wed, 24 Nov 2010 04:12:17 +0000 (13:12 +0900)]
sh: Fix build in start.S

By commit 6d8962e814c15807dd6ac5757904be2a02d187b8,
label of _start was not usable in start.S and build fail.
This change label from  _start to _sh_start.

----
arch/sh/cpu/sh4/libsh4.o: In function `_start':
(.text+0x204): multiple definition of `_start'
arch/sh/cpu/sh4/start.o:(.text+0x0): first defined here
----

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
13 years agoARMV7: S5P: timer: get the count_value from register when call udelay
Minkyu Kang [Fri, 19 Nov 2010 08:00:26 +0000 (17:00 +0900)]
ARMV7: S5P: timer: get the count_value from register when call udelay

Because of count_value is set to tcnb4 register,
should be get from this register when call udelay function.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
13 years agoS5P: goni: fix for relocation
Minkyu Kang [Mon, 22 Nov 2010 11:27:44 +0000 (20:27 +0900)]
S5P: goni: fix for relocation

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
13 years agoS5P: smdkc100: fix for relocation
Minkyu Kang [Mon, 22 Nov 2010 11:26:46 +0000 (20:26 +0900)]
S5P: smdkc100: fix for relocation

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
13 years agoAM3517:EMIF4: fix SDRAM size to 256Mb
Vaibhav Hiremath [Mon, 29 Nov 2010 21:36:10 +0000 (16:36 -0500)]
AM3517:EMIF4: fix SDRAM size to 256Mb

With addition of "dram_init_banksize()" function from Heiko,Schocher
(commit ID: 561142af20f1fd7b425d9425730014e656defb91), the DRAM size
is getting configured wrongly to 512Mb (CS0 & CS1).
So fix it to 256Mb.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoAM3517:Build FIX: undef CONFIG_CMD_NFS support
Vaibhav Hiremath [Mon, 29 Nov 2010 21:36:07 +0000 (16:36 -0500)]
AM3517:Build FIX: undef CONFIG_CMD_NFS support

Without CONFIG_CMD_NET support CONFIG_CMD_NFS leads
to linking error, so disable CONFIG_CMD_NFS option.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoAM3517:Fix for ARM Relocation support
Vaibhav Hiremath [Mon, 29 Nov 2010 21:36:04 +0000 (16:36 -0500)]
AM3517:Fix for ARM Relocation support

Also change the CONFIG_SYS_TEXT_BASE to 0x80008000, required
with relocation support. This is the load address for primary
boot loader (x-loader).

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap3evm: Use GENERATED_GBL_DATA_SIZE
Sanjeev Premi [Mon, 29 Nov 2010 21:32:47 +0000 (16:32 -0500)]
omap3evm: Use GENERATED_GBL_DATA_SIZE

The macro CONFIG_SYS_GBL_DATA_SIZE has been replaced
with GENERATED_GBL_DATA_SIZE.

Also define macros: CONFIG_SYS_INIT_RAM_ADDR and
CONFIG_SYS_INIT_RAM_SIZE.

Based on changes for omap3_beagle in the commit:
 31bfcf1c5776df3d90286aa15104c45096d53dc6

Signed-off-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP3: Fix build failure for igep0030 machine
Enric Balletbo i Serra [Mon, 29 Nov 2010 21:30:47 +0000 (16:30 -0500)]
ARMV7: OMAP3: Fix build failure for igep0030 machine

Seems that if CONFIG_CMD_NET is undefined we should also
undefine CONFIG_CMD_NFS, otherwise build fails with various
undefined reference like:

  net/libnet.o: In function `rpc_req':
  u-boot/net/nfs.c:193: undefined reference to `NetEthHdrSize'
  u-boot/net/nfs.c:202: undefined reference to `NetSendUDPPacket'
  u-boot/net/nfs.c:203: undefined reference to `NetTxPacket'
  u-boot/net/nfs.c:203: undefined reference to `NetServerEther'

This patch adds the undef CONFIG_CMD_NFS in configuration file.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoOMAP4: SDP4430: Disable CMD_NFS
Dirk Behme [Mon, 29 Nov 2010 01:00:12 +0000 (20:00 -0500)]
OMAP4: SDP4430: Disable CMD_NFS

This patch fixes the SDB4430 build after commit 6d8962e814c15807dd6ac5757904be2a02d187b8
by explicitly disabling CMD_NFS.

>From the commit message for "Switch from archive libraries to partial linking":

This commit reveals board configurations that exclude some features but
include source files that depend these disabled features in the build,
resulting in undefined symbols.  Known such cases include:

- disabling CMD_NET but not CMD_NFS;
- enabling CONFIG_OF_LIBFDT but not CONFIG_QE.

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoAdded PCI_DEVICE_ID_PLX_9030.
Horst Kronstorfer [Tue, 4 May 2010 10:37:36 +0000 (12:37 +0200)]
Added PCI_DEVICE_ID_PLX_9030.

Added PCI device ID for the PLXTech PCI 9030 bridge.

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
13 years agoRemove duplicate #defines in atngw100.h and mimc200.h
Semih Hazar [Thu, 17 Dec 2009 13:07:22 +0000 (15:07 +0200)]
Remove duplicate #defines in atngw100.h and mimc200.h

Two configuration include files had duplicate CONFIG_DOS_PARTITION
definitions with the same value.

This patch does not effect anything, just trims unnecessary text.

Signed-off-by: Semih Hazar <semih.hazar@indefia.com>
13 years agoPrepare v2010.12-rc2 v2010.12-rc2
Wolfgang Denk [Sun, 28 Nov 2010 18:44:59 +0000 (19:44 +0100)]
Prepare v2010.12-rc2

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agocfi_flash: fix bug introduced while recent change to flash_get_size()
Anatolij Gustschin [Sun, 28 Nov 2010 01:13:33 +0000 (02:13 +0100)]
cfi_flash: fix bug introduced while recent change to flash_get_size()

commit ec50a8e389863ac35bfd9d9a2e8b30187318e59e
"cfi_flash: handle 'chip size exceeds address window' situation"
added 3rd argument to flash_get_size() but didn't fix all the
function calls from the board specific code. Many boards have
their own flash_get_size() definitions in the board code and
use them there, but some boards (e.g. tqm834x, tqm85xx, pdm360ng)
use flash_get_size() from the cfi_flash.c driver.

The bug shows up if the value of the "max_size" argument (which
is not defined when calling the function with two arguments)
happens to be less than "info->size". In this case on the
affected boards we end up with a bank of reduced size and
in the worst case might even be not able to update U-Boot or
to boot the kernel from flash:

=> fli

Bank # 1: CFI conformant FLASH (32 x 16)  Size: 0 kB in 1 Sectors
  AMD Standard command set, Manufacturer ID: 0x01, Device ID: 0x227E
  Erase timeout: 4096 ms, write timeout: 1 ms
  Buffer write timeout: 3 ms, buffer size: 64 bytes

  Sector Start Addresses:
  F0000000   RO

Bank # 2: CFI conformant FLASH (32 x 16)  Size: 128 MB in 512 Sectors
  AMD Standard command set, Manufacturer ID: 0x01, Device ID: 0x227E
  Erase timeout: 4096 ms, write timeout: 1 ms
  Buffer write timeout: 3 ms, buffer size: 64 bytes

  Sector Start Addresses:
  F8000000        F8040000        F8080000        F80C0000        F8100000
  F8140000        F8180000        F81C0000        F8200000        F8240000
  ...

E.g., updating U-Boot is not possible now:

=> protect off ${u-boot_addr} +${u-boot_size}
Error: end address (0xf007ffff) not in flash!
Bad address format
=> era ${u-boot_addr} +${u-boot_size}
Error: end address (0xf007ffff) not in flash!
Bad address format

This patch removes the 3rd argument of flash_get_size() again
and sets "max_size" in the function itself instead of passing
it as a function argument.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
13 years agoDaVinci: DM355 Leopard : Fix for ARM Relocation support
Sandeep Paulraj [Sat, 27 Nov 2010 23:50:11 +0000 (18:50 -0500)]
DaVinci: DM355 Leopard : Fix for ARM Relocation support

Fix for ARM Relocation support

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoDaVinci DM365: Fix for ARM Relocation support
Sandeep Paulraj [Sat, 27 Nov 2010 23:50:22 +0000 (18:50 -0500)]
DaVinci DM365: Fix for ARM Relocation support

Fix for ARM Relocation support

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoDaVinci DM355: Fix for ARM Relocation support
Sandeep Paulraj [Sat, 27 Nov 2010 23:49:49 +0000 (18:49 -0500)]
DaVinci DM355: Fix for ARM Relocation support

Fix for ARM Relocation support

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Sun, 28 Nov 2010 16:44:00 +0000 (17:44 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

13 years agoFix compiler warning in fdt_support.c
Dirk Behme [Sun, 21 Nov 2010 19:19:34 +0000 (20:19 +0100)]
Fix compiler warning in fdt_support.c

Fix compiler warning

fdt_support.c: In function 'of_bus_default_count_cells':
fdt_support.c:957: warning: passing argument 1 of '__swab32p' discards qualifiers from pointer target type
fdt_support.c:965: warning: passing argument 1 of '__swab32p' discards qualifiers from pointer target type

be32_to_cpup() expects an 'u32 *' while prop is 'const u32 *'.

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
13 years agoDevkit8000: Fix build after introduction of GENERATED_GBL_DATA_SIZE
Thomas Weber [Thu, 18 Nov 2010 07:45:25 +0000 (08:45 +0100)]
Devkit8000: Fix build after introduction of GENERATED_GBL_DATA_SIZE

This patch fixes the issue by defining and using
CONFIG_SYS_INIT_RAM_SIZE and CONFIG_SYS_INIT_RAM_ADDR.

This patch adopts the
commit 31bfcf1c5776df3d90286aa15104c45096d53dc6
from Steve Sakoman and Sandeep Paulraj on Devkit8000.

Signed-off-by: Thomas Weber <weber@corscience.de>
13 years agoppc4xx: Flush complete dcache in relocate_code()
Stefan Roese [Fri, 26 Nov 2010 14:45:34 +0000 (15:45 +0100)]
ppc4xx: Flush complete dcache in relocate_code()

When the cache is enabled in SDRAM we need to flush not only the global
data area but also the bd_info struct in relocate_code. This patch now
flushed the complete dcache (all dcache lines) via flush_dcache() instead
of adding a flush_dcache_range() call for bd_info since this is faster.

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoppc4xx/POST: Handle cached SDRAM correctly in Denali (440EPx) ECC POST
Stefan Roese [Fri, 26 Nov 2010 14:45:22 +0000 (15:45 +0100)]
ppc4xx/POST: Handle cached SDRAM correctly in Denali (440EPx) ECC POST

This patch fixes a problem in the Denali (440EPx) SDRAM ECC POST test.
When cache is enabled in the SDRAM area, the values written to SDRAM
need to be flushed from cache to SDRAM using the dcfb instruction.

Without this patch the POST ECC test failed. Now its working again on
platforms with cache enabled in SDRAM.

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoCoding Style (white space) cleanup
Wolfgang Denk [Sat, 27 Nov 2010 22:30:56 +0000 (23:30 +0100)]
Coding Style (white space) cleanup

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agopowerpc: cmd_ecctest: Use return value of cmd_usage
Thomas Weber [Thu, 25 Nov 2010 07:05:30 +0000 (08:05 +0100)]
powerpc: cmd_ecctest: Use return value of cmd_usage

Use the return value of cmd_usage instead of ignoring this
and returning a 1.

Signed-off-by: Thomas Weber <weber@corscience.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
13 years agogdsys: osd: Use return value of cmd_usage
Thomas Weber [Thu, 25 Nov 2010 07:05:29 +0000 (08:05 +0100)]
gdsys: osd: Use return value of cmd_usage

Use the return value of cmd_usage instead of ignoring this
and returning a 1.

Signed-off-by: Thomas Weber <weber@corscience.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
13 years agocommon/cmd_nvedit: Use return value of cmd_usage
Thomas Weber [Thu, 25 Nov 2010 07:05:28 +0000 (08:05 +0100)]
common/cmd_nvedit: Use return value of cmd_usage

Use the return value of cmd_usage instead of ignoring this
and returning a 1.

Signed-off-by: Thomas Weber <weber@corscience.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
13 years agoCommon/command: Guard strchr/strlen from NULL pointer
Thomas Weber [Wed, 24 Nov 2010 12:07:51 +0000 (13:07 +0100)]
Common/command: Guard strchr/strlen from NULL pointer

Guard strchr/strlen from being called with NULL pointer.
This line is crashing when command "env" is called without subcommand.

The cmd is NULL in this case because the calling function "do_env"
decremented the argc without checking if there are still arguments available.

Signed-off-by: Thomas Weber <weber@corscience.de>
13 years agoCommon/cmd_nvedit: Check for env subcommand
Thomas Weber [Wed, 24 Nov 2010 12:07:52 +0000 (13:07 +0100)]
Common/cmd_nvedit: Check for env subcommand

The env command needs one subcommand. If this is not available
print the usage help.

Signed-off-by: Thomas Weber <weber@corscience.de>
13 years agosort and reformat boards.cfg
Eric Cooper [Tue, 23 Nov 2010 19:19:15 +0000 (14:19 -0500)]
sort and reformat boards.cfg

update suggested sort command in comment to produce desired order
suggest use of "column -t" to reformat

Signed-off-by: Eric Cooper <ecc@cmu.edu>
13 years agoFix jornada memory init
Kristoffer Ericson [Sat, 6 Nov 2010 13:24:27 +0000 (14:24 +0100)]
Fix jornada memory init

* Fix memory initialization. This fixes the problem
  with kernel oopses during heavy load.

* Cleanup pinsetup, which for reference is among
  other things needed for proper flash erasing.

Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
13 years ago74xx_7xx: Cleanup for partial linking and --gc-sections
Wolfgang Denk [Thu, 25 Nov 2010 11:14:07 +0000 (12:14 +0100)]
74xx_7xx: Cleanup for partial linking and --gc-sections

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
13 years ago8260: Cleanup for partial linking and --gc-sections
Wolfgang Denk [Wed, 24 Nov 2010 18:19:08 +0000 (19:19 +0100)]
8260: Cleanup for partial linking and --gc-sections

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
13 years ago824x: Cleanup for partial linking and --gc-sections
Wolfgang Denk [Tue, 23 Nov 2010 22:48:56 +0000 (23:48 +0100)]
824x: Cleanup for partial linking and --gc-sections

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
13 years ago8220: Cleanup for partial linking and --gc-sections
Wolfgang Denk [Thu, 25 Nov 2010 11:15:31 +0000 (12:15 +0100)]
8220: Cleanup for partial linking and --gc-sections

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
13 years ago5xxx: Cleanup for partial linking and --gc-sections
Wolfgang Denk [Tue, 23 Nov 2010 12:20:22 +0000 (13:20 +0100)]
5xxx: Cleanup for partial linking and --gc-sections

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
13 years ago512x: Cleanup for partial linking and --gc-sections
Wolfgang Denk [Mon, 22 Nov 2010 22:36:42 +0000 (23:36 +0100)]
512x: Cleanup for partial linking and --gc-sections

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Timur Tabi <timur@freescale.com>
Acked-by: Stefan Roese <sr@denx.de>