karo-tx-uboot.git
10 years agoUpdate CHANGELOG, prepare -rc2 v2009.11-rc2
Wolfgang Denk [Mon, 7 Dec 2009 22:14:13 +0000 (23:14 +0100)]
Update CHANGELOG, prepare -rc2

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoMAKEALL: Fix return value
Peter Tyser [Mon, 7 Dec 2009 05:58:28 +0000 (23:58 -0600)]
MAKEALL: Fix return value

Previously MAKEALL would always return a value of 0, even if 1 or more
boards did not compile.  This change causes MAKEALL to return 0 if all
boards were able to build, otherwise 1.

This change also requires changing the script interpreter from sh to
bash to support bash's PIPESTATUS variable.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
10 years agotools/mkimage: Remove duplicate line of code
Peter Tyser [Sun, 6 Dec 2009 07:33:24 +0000 (01:33 -0600)]
tools/mkimage: Remove duplicate line of code

Recent commits 1a99de2cb4d08eb3bf9fb3f60a9d533150de8c0e and
6a590c5f5fd12cdd27f3153522acfac3854590e7 both fixed the same bug in the
same manner.  Unfortunately git was "smart" enough to merge both changes
which resulted in some duplicate code.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Reordered code and comment a bit.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoi2c: fix dangling comment in do_i2c_mw()
Heiko Schocher [Sat, 5 Dec 2009 10:59:51 +0000 (11:59 +0100)]
i2c: fix dangling comment in do_i2c_mw()

commit bd3784df94bfeca43fbf34094df9cb1bd3ecca3b deleted some unused
code in do_i2c_mw(), but missed to also remove the respective
commment. This patch fixes this.

Signed-off-by: Heiko Schocher <hs@denx.de>
10 years ago52xx, manroland: add fdt_fixup_memory() in ft_board_setup()
Heiko Schocher [Tue, 1 Dec 2009 18:30:47 +0000 (19:30 +0100)]
52xx, manroland: add fdt_fixup_memory() in ft_board_setup()

To update the real memory size in the memory node on the
uc101 and mucmc52 boards call fdt_fixup_memory() in
ft_board_setup().

Signed-off-by: Heiko Schocher <hs@denx.de>
10 years agoFix computation in nand_util.c:get_len_incl_bad
Daniel Hobi [Tue, 1 Dec 2009 13:05:55 +0000 (14:05 +0100)]
Fix computation in nand_util.c:get_len_incl_bad

Depending on offset, flash size and the number of bad blocks,
get_len_incl_bad may return a too small value which may lead to:

1) If there are no bad blocks, nand_{read,write}_skip_bad chooses the
bad block aware read/write code. This may hurt performance, but does
not have any adverse effects.

2) If there are bad blocks, the nand_{read,write}_skip_bad may choose
the bad block unaware read/write code (if len_incl_bad == *length)
which leads to corrupted data.

Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
10 years agonfs: NfsTimeout() updates
Evan Samanas [Tue, 10 Nov 2009 02:08:36 +0000 (20:08 -0600)]
nfs: NfsTimeout() updates

- NfsTimeout() does not correctly update the NFS timeout value which
  results in NfsTimeout() only being called once in certain situations.
  This can result in the 'nfs' command hanging indefinetly.  For
  example, the command:

    nfs 192.168.0.1:/home/user/file

  will not exit until ctrl-c is pressed if 192.168.0.1 does not have an
  NFS server running.

  This issue is resolved by reinitializting the NFS timeout value inside
  NfsTimeout() when a timeout occurs.

- Make the 'nfs' command print the 'T' character when a timeout occurs.
  Previously there was no indication that timeouts were occuring.

- Mimic the 'tftpboot' command and when a download fails print "Retry
  count exceeded; starting again", and restart the download taking the
  'netretry' environment variable into account.

Signed-off-by: Evan Samanas <esamanas@xes-inc.com>
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Tested on TQM8xxL.

Tested by: Wolfgang Denk <wd@denx.de>

Tested on MPC8527DS.

Tested by: Ed Swarthout <Ed.Swarthout@freescale.com>

10 years agobootm: Fix help message's sub-command ordering
Peter Tyser [Thu, 19 Nov 2009 01:08:59 +0000 (19:08 -0600)]
bootm: Fix help message's sub-command ordering

The help message for the 'bootm' command listed the 'cmdline' and 'bdt'
sub-commands in the wrong order which resulted in the error below when
following the 'help' command's instructions:

  "Trying to execute a command out of order"

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
10 years agohelp: Correct syntax of nandecc help output.
Robert P. J. Day [Tue, 17 Nov 2009 12:30:23 +0000 (07:30 -0500)]
help: Correct syntax of nandecc help output.

"nandecc" help output should not reproduce the command name, nor have
a trailing newline.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
10 years agosmc911x: update SMC911X related configuration description
Mike Rapoport [Wed, 11 Nov 2009 08:03:03 +0000 (10:03 +0200)]
smc911x: update SMC911X related configuration description

Since commit 736fead8fdbf8a8407048bebc373cd551d01ec98 "Convert SMC911X
Ethernet driver to CONFIG_NET_MULTI API" SMC911X configration options
are called CONFIG_SMC911X rather than CONFIG_DRIVER_SMC911X. Update
README to reflect that change.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
10 years agosmc911x: fix typo in smc911x_handle_mac_address name
Mike Rapoport [Wed, 11 Nov 2009 08:03:09 +0000 (10:03 +0200)]
smc911x: fix typo in smc911x_handle_mac_address name

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
10 years agofix nfs symlink name corruption
Ed Swarthout [Thu, 19 Nov 2009 08:47:28 +0000 (02:47 -0600)]
fix nfs symlink name corruption

An off by one error may cause nfs readlink lookup fail if
nfs_path_buff has non-zero data from a previous use.

Loading: *** ERROR: File lookup fail

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
10 years agoat91sam9261ek.c: fix minor coding style issue.
Wolfgang Denk [Mon, 7 Dec 2009 20:06:40 +0000 (21:06 +0100)]
at91sam9261ek.c: fix minor coding style issue.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agotrab: fix warning: implicit declaration of function 'disable_vfd'
Wolfgang Denk [Sun, 6 Dec 2009 00:21:28 +0000 (01:21 +0100)]
trab: fix warning: implicit declaration of function 'disable_vfd'

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agozlib.c: avoid build conflicts for cradle board
Wolfgang Denk [Sat, 5 Dec 2009 23:53:18 +0000 (00:53 +0100)]
zlib.c: avoid build conflicts for cradle board

Commit dce3d79710 updated the zlib code to v0.95; this caused
conflicts when building for the "cradle" board, because the (pretty
generic) preprocessor variable "OFF" was used in multiple files.
Make sure to avoid further conflicts by #undef'ing it in zlib.c
before redefining it.

Signed-off-by: Wolfgang Denk <wd@denx.de>
cc: Giuseppe Condorelli <giuseppe.condorelli@st.com>
cc: Angelo Castello <angelo.castello@st.com>
cc: Alessandro Rubini <rubini-list@gnudd.com>

10 years agoFix out-of-tree building of "apollon" board.
Wolfgang Denk [Sat, 5 Dec 2009 23:26:19 +0000 (00:26 +0100)]
Fix out-of-tree building of "apollon" board.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agolzma: ignore unset filesizes
Mike Frysinger [Fri, 4 Dec 2009 10:35:15 +0000 (05:35 -0500)]
lzma: ignore unset filesizes

The Linux kernel build system changed how it compresses things with LZMA
such that the header no longer contains the filesize (it is instead set to
all F's).  So if we get a LZMA image that has -1 for the 64bit field,
let's just assume that the decompressed size is unknown and continue on.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agoREADME: Rearrange paragraphs to regain linear arrangement.
Detlev Zundel [Tue, 1 Dec 2009 16:16:19 +0000 (17:16 +0100)]
README: Rearrange paragraphs to regain linear arrangement.

Two later additions to the Configuration Option section unfortunately
split the description of Show boot progress and the list of its call outs.

Signed-off-by: Detlev Zundel <dzu@denx.de>
10 years agotools/mkimage: Print FIT image contents after creation
Peter Tyser [Tue, 24 Nov 2009 22:42:10 +0000 (16:42 -0600)]
tools/mkimage: Print FIT image contents after creation

Previously, there was no indication to the user that a FIT image was
successfully created after executing mkimage.  For example:

  $ mkimage -f uImage.its uImage.itb
  DTC: dts->dtb  on file "uImage.its"

Adding some additional output after creating a FIT image lets the user
know exactly what is contained in their image, eg:

  $ mkimage -f uImage.its uImage.itb
  DTC: dts->dtb  on file "uImage.its"
  FIT description: Linux kernel 2.6.32-rc7-00201-g7550d6f-dirty
  Created:         Tue Nov 24 15:43:01 2009
   Image 0 (kernel@1)
    Description:  Linux Kernel 2.6.32-rc7-00201-g7550d6f-dirty
    Type:         Kernel Image
    Compression:  gzip compressed
    Data Size:    2707311 Bytes = 2643.86 kB = 2.58 MB
    Architecture: PowerPC
    OS:           Linux
    Load Address: 0x00000000
    Entry Point:  0x00000000
    Hash algo:    crc32
    Hash value:   efe0798b
    Hash algo:    sha1
    Hash value:   ecafba8c95684f2c8fec67e33c41ec88df1534d7
   Image 1 (fdt@1)
    Description:  Flattened Device Tree blob
    Type:         Flat Device Tree
    Compression:  uncompressed
    Data Size:    12288 Bytes = 12.00 kB = 0.01 MB
    Architecture: PowerPC
    Hash algo:    crc32
    Hash value:   a5cab676
    Hash algo:    sha1
    Hash value:   168722b13e305283cfd6603dfe8248cc329adea6
   Default Configuration: 'config@1'
   Configuration 0 (config@1)
    Description:  Default Linux kernel
    Kernel:       kernel@1
    FDT:          fdt@1

This brings the behavior of creating a FIT image in line with creating a
standard uImage, which also prints out the uImage contents after
creation.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
10 years agotools/fit_image.c: Remove unused fit_set_header()
Peter Tyser [Tue, 24 Nov 2009 22:42:09 +0000 (16:42 -0600)]
tools/fit_image.c: Remove unused fit_set_header()

The FIT fit_set_header() function was copied from the standard uImage's
image_set_header() function during mkimage reorganization.  However, the
fit_set_header() function is not used since FIT images use a standard
device tree blob header.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
10 years agotools/mkimage: Assume FDT image type for FIT images
Peter Tyser [Tue, 24 Nov 2009 22:42:08 +0000 (16:42 -0600)]
tools/mkimage: Assume FDT image type for FIT images

When building a Flattened Image Tree (FIT) the image type needs to be
"flat_dt".  Commit 89a4d6b12fd6394898b8a454cbabeaf1cd59bae5 introduced a
regression which caused the user to need to specify the "-T flat_dt"
parameter on the command line when building a FIT image.  The "-T
flat_dt" parameter should not be needed and is at odds with the current
FIT image documentation.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
10 years agoEXT2FS: fix inode size for ext2fs rev#0
Michael Brandt [Sun, 22 Nov 2009 13:13:27 +0000 (14:13 +0100)]
EXT2FS: fix inode size for ext2fs rev#0

extfs.c assumes that there is always a valid inode_size field in the
superblock. But this is not true for ext2fs rev 0. Such ext2fs images
are for instance generated by genext2fs. Symptoms on ARM machines are
messages like: "raise: Signal # 8 caught"; on PowerPC "ext2ls" will
print nothing.
This fix checks for rev 0 and uses then 128 bytes as inode size.

Signed-off-by: Michael Brandt <Michael.Brandt@emsyso.de>
Tested on: TQM5200S
Tested-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoRemove superfluous preprocessor tests from some cmd_*.c files.
Robert P. J. Day [Thu, 19 Nov 2009 16:00:28 +0000 (11:00 -0500)]
Remove superfluous preprocessor tests from some cmd_*.c files.

A small number of common/cmd_*.c files contain preprocessor tests that
are apparently superfluous since those same tests are used in the
Makefile to control the compilation of those files.  Those tests are
clearly redundant as long as they surround the entirety of the source
in those files.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
10 years agoREADME: Update the list of directories.
Robert P. J. Day [Tue, 17 Nov 2009 06:59:29 +0000 (01:59 -0500)]
README: Update the list of directories.

Bring the directory listing more into line with current content.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
10 years agoRemoves dead code in the file common/cmd_i2c.c
Pratap Chandu [Thu, 12 Nov 2009 13:58:25 +0000 (19:28 +0530)]
Removes dead code in the file common/cmd_i2c.c

There is some dead code enclosed by #if 0 .... #endif in the file
common/cmd_i2c.c
This patch removes the dead code.

Signed-off-by: Pratap Chandu <pratap.rrke@gmail.com>
10 years agosmc91111_eeprom: drop CONFIG stub protection
Mike Frysinger [Wed, 11 Nov 2009 22:51:56 +0000 (17:51 -0500)]
smc91111_eeprom: drop CONFIG stub protection

Since the Makefile now controls the compilation of this, there is no need
for CONFIG checking nor the stub function.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agoRTC: Fix return code in MC13783 RTC driver.
Magnus Lilja [Wed, 11 Nov 2009 18:56:58 +0000 (19:56 +0100)]
RTC: Fix return code in MC13783 RTC driver.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
10 years agocmd_date: Fix spelling in error message.
Magnus Lilja [Wed, 11 Nov 2009 18:56:36 +0000 (19:56 +0100)]
cmd_date: Fix spelling in error message.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
10 years agoMove do_irqinfo() to common/cmd_irq.c
Peter Tyser [Wed, 11 Nov 2009 16:36:28 +0000 (10:36 -0600)]
Move do_irqinfo() to common/cmd_irq.c

cmd_irq.c is a much better home and it is already conditionally
compiled based on CONFIG_CMD_IRQ.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
10 years agocmd_license: Remove unneeded #ifdef CONFIG_CMD_LICENSE
Peter Tyser [Wed, 11 Nov 2009 16:36:19 +0000 (10:36 -0600)]
cmd_license: Remove unneeded #ifdef CONFIG_CMD_LICENSE

cmd_license is already conditionally compiled at the Makefile-level.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
10 years agom41t11: Remove unused functions
Peter Tyser [Mon, 9 Nov 2009 21:18:52 +0000 (15:18 -0600)]
m41t11: Remove unused functions

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
10 years agocircbuf: Move to lib_generic and conditionally compile
Peter Tyser [Mon, 9 Nov 2009 21:17:50 +0000 (15:17 -0600)]
circbuf: Move to lib_generic and conditionally compile

circbuf could be used as a generic library and is only currently
needed when CONFIG_USB_TTY is defined.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
10 years agoFix build failure in examples/standalone
Sanjeev Premi [Mon, 9 Nov 2009 17:13:00 +0000 (22:43 +0530)]
Fix build failure in examples/standalone

Some versions of 'make' do not handle trailing white-spaces
properly. Trailing spaces in ELF causes a 'fake' source to
be added to the variable COBJS; leading to build failure
(listed below). The problem was found with GNU Make 3.80.

Using text-function 'strip' as a workaround for the problem.

make[1]: Entering directory `/home/sanjeev/u-boot/examples/standalone'
arm-none-linux-gnueabi-gcc -g  -Os   -fno-common -ffixed-r8 -msoft-float
-D__KERNEL__ -DTEXT_BASE=0x80e80000 -I/home/sanjeev/u-boot/include
-fno-builtin -ffreestanding -nostdinc -isystem /opt/codesourcery/2009q1-
203/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3/include -pipe  -DCONFIG_
ARM -D__ARM__ -marm  -mabi=aapcs-linux -mno-thumb-interwork -march=armv5
-Wall -Wstrict-prototypes -fno-stack-protector -g  -Os   -fno-common -ff
ixed-r8 -msoft-float   -D__KERNEL__ -DTEXT_BASE=0x80e80000 -I/home/sanje
ev/u-boot/include -fno-builtin -ffreestanding -nostdinc -isystem /opt/co
desourcery/2009q1-203/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3/includ
e -pipe  -DCONFIG_ARM -D__ARM__ -marm  -mabi=aapcs-linux -mno-thumb-inte
rwork -march=armv5 -I.. -Bstatic -T u-boot.lds  -Ttext 0x80e80000 -o .c
arm-none-linux-gnueabi-gcc: no input files
make[1]: *** [.c] Error 1
make[1]: Leaving directory `/home/sanjeev/u-boot/examples/standalone'
make: *** [examples/standalone] Error 2
premi #

Signed-off-by: Sanjeev Premi <premi@ti.com>
Fixed typo (s/ElF/ELF/).
Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years ago85xx: Remove unused CONFIG_ASSUME_AMD_FLASH from config files
Becky Bruce [Thu, 5 Nov 2009 00:30:08 +0000 (18:30 -0600)]
85xx: Remove unused CONFIG_ASSUME_AMD_FLASH from config files

A bunch of the 85xx boards have this cruft in them - it's not used
anywhere.  Delete it.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
10 years agoMAINTAINERS: update responsible for MPC85xx/86xx
Wolfgang Denk [Wed, 2 Dec 2009 21:26:30 +0000 (22:26 +0100)]
MAINTAINERS: update responsible for MPC85xx/86xx

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Becky Bruce <beckyb@kernel.crashing.org>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-nios
Wolfgang Denk [Tue, 1 Dec 2009 09:15:22 +0000 (10:15 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-nios

10 years agoFix example FIT image source files
Ira W. Snyder [Wed, 4 Nov 2009 21:37:59 +0000 (13:37 -0800)]
Fix example FIT image source files

The example FIT image source files do not compile with the latest dtc and
mkimage. The following error message is produced:

DTC: dts->dtb  on file "kernel.its"
Error: kernel.its 7:0 - 1:0 syntax error
FATAL ERROR: Unable to parse input tree
./mkimage: Can't read kernel.itb.tmp: Invalid argument

The FIT image source files are missing the "/dts-v1/;" directive at the
beginning of the file. Add the directive to the examples.

Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
10 years agoimg2srec: use standard types
Mike Frysinger [Wed, 4 Nov 2009 21:13:19 +0000 (16:13 -0500)]
img2srec: use standard types

The img2srec code creates a lot of typedefs with common names.  These
easily clash with system headers that include these typedefs (like mingw).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agotools: gitignore *.exe binaries
Mike Frysinger [Wed, 4 Nov 2009 21:03:25 +0000 (16:03 -0500)]
tools: gitignore *.exe binaries

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agoppc: Move conditional compilation of kgdb.c to Makefile
Peter Tyser [Wed, 4 Nov 2009 05:31:07 +0000 (23:31 -0600)]
ppc: Move conditional compilation of kgdb.c to Makefile

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
10 years agospi_flash.h: pull in linux/types.h for u## types
Mike Frysinger [Tue, 3 Nov 2009 16:36:39 +0000 (11:36 -0500)]
spi_flash.h: pull in linux/types.h for u## types

10 years agobootm: mark local boot_os[] table static
Mike Frysinger [Tue, 3 Nov 2009 16:36:26 +0000 (11:36 -0500)]
bootm: mark local boot_os[] table static

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agomkconfig: deny messed up ARCH definition
Nishanth Menon [Mon, 2 Nov 2009 15:40:18 +0000 (09:40 -0600)]
mkconfig: deny messed up ARCH definition

Refuse to setup a platform if the command line ARCH= is not the same
as the one required for the board. This prevents any user with
prehistoric aliases from messing up their builds.

Reported in thread:
http://old.nabble.com/-U-Boot--Build-breaks-on-some-OMAP3-configs-to26132721.html

Inputs from: Mike Frysinger and Wolfgang Denk:
http://lists.denx.de/pipermail/u-boot/2009-November/063642.html

Cc: Wolfgang Denk <wd@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Anand Gadiyar <gadiyar@ti.com>
Cc: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Tue, 24 Nov 2009 22:27:06 +0000 (23:27 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-net

10 years agoMerge branch 'master-sync' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Tue, 24 Nov 2009 22:22:50 +0000 (23:22 +0100)]
Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

10 years agoRepair the 'netretry=once' option.
Remy Bohmer [Wed, 28 Oct 2009 21:13:39 +0000 (22:13 +0100)]
Repair the 'netretry=once' option.

'netretry = once' does the same as 'netretry = yes', because it is not stored
when it was tried once.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoRepair build fail in case CONFIG_PPC=n and CONFIG_FIT=y
Remy Bohmer [Thu, 29 Oct 2009 13:24:22 +0000 (14:24 +0100)]
Repair build fail in case CONFIG_PPC=n and CONFIG_FIT=y

Signed-off-by: Remy Bohmer <linux@bohmer.net>
10 years agoOMAP3: pandora: fix booting without serial attached
Grazvydas Ignotas [Thu, 12 Nov 2009 09:46:07 +0000 (11:46 +0200)]
OMAP3: pandora: fix booting without serial attached

When the board is booted without serial cable attached (which
is how most of them will be used) UART RX is left floating and
sometimes picks noise, which interrupts countdown and enters
U-Boot prompt instead of booting the kernel.

Fix this by setting up internal pullup on UART RX pin. This
does not prevent serial from working as the internal pullup
is weak.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
10 years agoAdd support for CS2 dataflash for Atmel-SPI.
Remy Bohmer [Wed, 28 Oct 2009 21:13:37 +0000 (22:13 +0100)]
Add support for CS2 dataflash for Atmel-SPI.

The only missing chipselect line support is CS2, and I need it on
CS2...

Signed-off-by: Remy Bohmer <linux@bohmer.net>
10 years agoFix mingw tools build
Remy Bohmer [Wed, 28 Oct 2009 21:13:36 +0000 (22:13 +0100)]
Fix mingw tools build

mkimage does not build due to missing strtok_r() and getline() implementation

Signed-off-by: Remy Bohmer <linux@bohmer.net>
10 years agoBuilding of FIT images does not work.
Remy Bohmer [Wed, 28 Oct 2009 21:13:35 +0000 (22:13 +0100)]
Building of FIT images does not work.

The type is not set for generation of the FIT images, resulting
in no images being created without printing or returning an error

Signed-off-by: Remy Bohmer <linux@bohmer.net>
10 years agoNios2: do_boom_linux(): kernel gunzip input data integrity problem due to
Renato Andreola [Mon, 23 Nov 2009 21:45:14 +0000 (16:45 -0500)]
Nios2: do_boom_linux(): kernel gunzip input data integrity problem due to
missing cache flush.

    Added instruction and data caches flush.

Signed-off-by: Scott McNutt <smcnutt@psyent.com>
10 years agoNios2: Fix compiler warnings in lib_nios2/board.c (unused variables)
Scott McNutt [Mon, 23 Nov 2009 21:29:40 +0000 (16:29 -0500)]
Nios2: Fix compiler warnings in lib_nios2/board.c (unused variables)

Signed-off-by: Scott McNutt <smcnutt@psyent.com>
10 years agoNios2/Nios: Remove unnecessary (residual) linker Nios command scripts from
Scott McNutt [Mon, 23 Nov 2009 20:54:25 +0000 (15:54 -0500)]
Nios2/Nios: Remove unnecessary (residual) linker Nios command scripts from
the standalone examples.

Signed-off-by: Scott McNutt <smcnutt@psyent.com>
10 years agosf: fix stmicro offset setup while erasing
Mike Frysinger [Wed, 14 Oct 2009 23:28:03 +0000 (19:28 -0400)]
sf: fix stmicro offset setup while erasing

Reported-by: Peter Gombos <gombos@protecta.hu>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agosf: new driver for Winbond W25X16/32/64 devices
Jason McMullan [Fri, 9 Oct 2009 21:12:23 +0000 (17:12 -0400)]
sf: new driver for Winbond W25X16/32/64 devices

Signed-off-by: Jason McMullan <jason.mcmullan@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agompc8260: move FDT memory node fixup into common CPU code.
Marcel Ziswiler [Thu, 1 Oct 2009 21:55:17 +0000 (23:55 +0200)]
mpc8260: move FDT memory node fixup into common CPU code.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
Tested-by: Heiko Schocher <hs@denx.de>
10 years agoAdd driver for FTRTC010 real time clock
Po-Yu Chuang [Wed, 23 Sep 2009 07:52:35 +0000 (15:52 +0800)]
Add driver for FTRTC010 real time clock

Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com>
Edited commit message.
Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoMIMC200: set default fbmem value
Mark Jackson [Mon, 17 Aug 2009 15:42:52 +0000 (16:42 +0100)]
MIMC200: set default fbmem value

This patch adds a default bootargs "fbmem" value to the
CONFIG_BOOTARGS string for the MIMC200 board.

Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
10 years agoppc4xx: Initialize magnetic coupler on VOM405 boards
Matthias Fuchs [Tue, 27 Oct 2009 18:58:09 +0000 (19:58 +0100)]
ppc4xx: Initialize magnetic coupler on VOM405 boards

This patch fixes an ugly behavior of the IL712 magnetic coupler
as used on VOM405. These parts will remember their last state
over a power cycle which might cause unwanted behavior.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
10 years agoppc4xx: Initialize magnetic couplers in PLU405
Matthias Fuchs [Mon, 26 Oct 2009 08:58:45 +0000 (09:58 +0100)]
ppc4xx: Initialize magnetic couplers in PLU405

This patch fixes an ugly behavior of the IL712 magnetic couplers
as used on PLU405. These parts will remember their last state
over a power cycle which might cause unwanted behavior.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
10 years agoAdd minimal SJA1000 header for basic CAN mode
Matthias Fuchs [Mon, 26 Oct 2009 08:55:40 +0000 (09:55 +0100)]
Add minimal SJA1000 header for basic CAN mode

This patch is in preparation for the upcoming PLU405 board fix.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Sun, 15 Nov 2009 21:50:52 +0000 (22:50 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-net

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Sun, 15 Nov 2009 21:48:02 +0000 (22:48 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

10 years agoMerge branch 'master-sync' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Sun, 15 Nov 2009 21:27:16 +0000 (22:27 +0100)]
Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

10 years agoppc/85xx: Fix how we determine the number of CAM entries
Kumar Gala [Fri, 13 Nov 2009 14:52:21 +0000 (08:52 -0600)]
ppc/85xx: Fix how we determine the number of CAM entries

We were incorrectly use the max CAM size as the number of entries in
the array for setting up the addrmap.  We should be using the NENTRY
field which is the low 12-bits of TLB1CFG.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agosmc911x: make smc911x_initialize return correct value
Mike Rapoport [Thu, 12 Nov 2009 13:35:08 +0000 (15:35 +0200)]
smc911x: make smc911x_initialize return correct value

Make smc911x_initialize return -1 on error and number of interfaces
detected otherwise.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agosmc911x_eeprom: fix building after smc911x overhaul
Mike Frysinger [Fri, 13 Nov 2009 03:26:02 +0000 (22:26 -0500)]
smc911x_eeprom: fix building after smc911x overhaul

When the smc911x driver was converted to NET_MULTI, the smc911x eeprom was
missed.  The config option needed updating as well as overhauling of the
rergister read/write functions.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agofsl-ddr: Fix the chip-select interleaving issue
Dave Liu [Wed, 11 Nov 2009 23:26:37 +0000 (07:26 +0800)]
fsl-ddr: Fix the chip-select interleaving issue

commit 1542fbdeec0d1e2a6df13189df8dcb1ce8802be3
introduced one new bug to chip-select interleaving.

Single DDR controller also can do the chip-select
interleaving if there is dual-rank or qual-rank DIMMs.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Wed, 11 Nov 2009 22:10:34 +0000 (23:10 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-net

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Wed, 11 Nov 2009 21:58:30 +0000 (22:58 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

10 years agomxc_fec: avoid free() calls to already freed pointers.
javier Martin [Thu, 29 Oct 2009 07:22:43 +0000 (08:22 +0100)]
mxc_fec: avoid free() calls to already freed pointers.

Sometimes, inside NetLoop, eth_halt() is called before eth_init() has
been called. This is harmless except for free() calls to pointers
which have not been allocated yet.

This patch initializes those pointers to NULL and allocates them only
the first time. This way we can get rid of free calls in halt callback.

This has been tested in i.MX27 Litekit board and eldk-4.2 toolchains.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agomxc_fec: fix some erroneous PHY accesses.
javier Martin [Thu, 29 Oct 2009 07:18:34 +0000 (08:18 +0100)]
mxc_fec: fix some erroneous PHY accesses.

This patch fixes erroneous access to the ethernet PHY which broke the driver.
1. Selector field in the auto-negotiation register must be 0x00001 for
using 802.3, not 0x00000 which is reseved.
2. Access to the PHY address specified by CONFIG_FEC_MXC_PHYADDR, not
0x0 fixed address.

This has been tested in i.MX27 Litekit board and eldk-4.2 toolchains.

Now using proper defines for auto-negotiation register.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoARM Don't inline weak symbols
Ron Lee [Wed, 5 Aug 2009 18:14:01 +0000 (20:14 +0200)]
ARM Don't inline weak symbols

------------------------------------------------------------------------

GCC 4.4 complains about this now.

Signed-off-by: Ron Lee <ron@debian.org>
10 years agoFix SMC91111 regression: lpd7a40x build failures
Ben Warren [Mon, 9 Nov 2009 21:09:57 +0000 (13:09 -0800)]
Fix SMC91111 regression: lpd7a40x build failures

Both lpd7a400 and lpd7a404 failed to compile because they had
CONFIG_SMC_USE_IOFUNCS defined:

examples/standalone/smc91111_eeprom.c:388: undefined reference to `SMC_outw'

Also removed an orphaned paren in lpd7a404.h

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoSMC91111: Clean up SMC_inx macros on xsengine and xaeniax
Ben Warren [Mon, 9 Nov 2009 22:01:08 +0000 (14:01 -0800)]
SMC91111: Clean up SMC_inx macros on xsengine and xaeniax

This patch fixes the following warnings:

Configuring for xaeniax board...
smc91111_eeprom.c: In function 'print_macaddr':
smc91111_eeprom.c:278: warning: suggest parentheses around + or - in operand of &
smc91111_eeprom.c:281: warning: suggest parentheses around + or - in operand of &
...
Configuring for xsengine board...
smc91111_eeprom.c: In function 'print_macaddr':
smc91111_eeprom.c:278: warning: suggest parentheses around + or - inside shift
smc91111_eeprom.c:281: warning: suggest parentheses around + or - inside shift

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoMerge branch 'master-sync' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Mon, 9 Nov 2009 21:46:32 +0000 (22:46 +0100)]
Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

10 years agoFix CS8900 regression on impa7 board
Ben Warren [Mon, 9 Nov 2009 19:43:18 +0000 (11:43 -0800)]
Fix CS8900 regression on impa7 board

The following error was seen on impa7 board, due to its use of a 32-bit bus
on CS8900.
cs8900.c:137:37: error: macro "get_reg_init_bus" passed 2 arguments, but takes just 1

This patch gives the macro the correct number of arguments

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoclarify eth driver halt/recv steps
Mike Frysinger [Mon, 2 Nov 2009 03:39:56 +0000 (22:39 -0500)]
clarify eth driver halt/recv steps

The dev->halt() func can be called at any time, and the dev->recv() func
does not need to use NetRxPackets[] when calling NetReceive().

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoFix cs8900 dev->priv not init issue
Hui.Tang [Thu, 5 Nov 2009 01:58:44 +0000 (09:58 +0800)]
Fix cs8900 dev->priv not init issue

Ensure all CS8900 data structures are assigned before accessing device

Signed-off-by: Hui.Tang <zetalabs@gmail.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoppc4xx: 44x_spd_ddr2.c: Fix register macro ECCCR -> ECCES (SDRAM_ECCES)
Stefan Roese [Tue, 3 Nov 2009 13:34:45 +0000 (14:34 +0100)]
ppc4xx: 44x_spd_ddr2.c: Fix register macro ECCCR -> ECCES (SDRAM_ECCES)

This error only appears when DEBUG is enabled in this driver. That's why
it went unnoticed till now.

Signed-off-by: Stefan Roese <sr@denx.de>
10 years agoppc4xx: Canyonlands: Change EBC bus config to drive always (no high-z)
Stefan Roese [Thu, 29 Oct 2009 17:37:45 +0000 (18:37 +0100)]
ppc4xx: Canyonlands: Change EBC bus config to drive always (no high-z)

This patch fixes a problem only seen very occasionally on Canyonlands.
The NOR flash interface (CFI driver) doesn't work reliably in all cases.
Erasing and/or programming sometimes doesn't work. Sometimes with
an error message, like "flash not erased" when trying to program an
area that should have just been erased. And sometimes without any error
messages. As mentioned above, this problem was only seen rarely and with
some PLL configuration (CPU speed, EBC speed).

Now I spotted this problem a few times, when running my Canyonlands with
the following setup (chip_config):

1000-nor         - NOR  CPU:1000 PLB: 200 OPB: 100 EBC: 100

Changing the EBC configuration to not release the bus into high
impedance state inbetween the transfers (ATC, DTC and CTC bits set to 1
in EBC0_CFG) seems to fix this problem. I haven't seen any failure
anymore with this patch applied.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: David Mitchell <dmitchell@amcc.com>
Cc: Jeff Mann <MannJ@embeddedplanet.com>
10 years agoARM: Use Linux version for unaligned access code
Remy Bohmer [Thu, 29 Oct 2009 11:29:37 +0000 (12:29 +0100)]
ARM: Use Linux version for unaligned access code

The asm-arm/unaligned.h includes linux/unaligned/access_ok.h
This file is unsafe to be used on ARM, since it does an unaligned memory
accesses which fails on ARM.

Lookin at Linux the basic difference seems to be the header
"include/asm-arm/unaligned.h". The Linux version of "unaligned.h"
does *not* include "access_ok.h" at all. It includes "le_byteshift.h"
and "be_byteshift.h" instead.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Stefan Roese <sr@denx.de>
--
 include/asm-arm/unaligned.h            |    3 -
 include/linux/unaligned/be_byteshift.h |   70 +++++++++++++++++++++++++++++++++
 include/linux/unaligned/le_byteshift.h |   70 +++++++++++++++++++++++++++++++++
 3 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 include/linux/unaligned/be_byteshift.h
 create mode 100644 include/linux/unaligned/le_byteshift.h

10 years agoppc/85xx: Fix inclusion of 83xx immap in 85xx builds
Kumar Gala [Thu, 5 Nov 2009 00:02:10 +0000 (18:02 -0600)]
ppc/85xx: Fix inclusion of 83xx immap in 85xx builds

The nand_boot_fsl_elbc.c is shared between 83xx & 85xx however we should
not be including the immap_83xx.h when building 85xx.  We can just get
this all from common.h

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years ago86xx: Remove redundant code in initdram
Becky Bruce [Wed, 4 Nov 2009 23:34:04 +0000 (17:34 -0600)]
86xx: Remove redundant code in initdram

The same code exists both inside an #ifdef and outside of it.
Remove the extra code for all the 86xx boards.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agofsl_pci_init_port end-point initialization is broken
Ed Swarthout [Mon, 2 Nov 2009 15:05:49 +0000 (09:05 -0600)]
fsl_pci_init_port end-point initialization is broken

commit 70ed869e broke fsl pcie end-point initialization.
Returning 0 is not correct.  The function must return the first free
bus number for the next controller.

fsl_pci_init() must still be called and a bus allocated even if the
controller is an end-point.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Vivek Mahajan <vivek.mahajan@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agoRevert "ppc/85xx/pci: fsl_pci_init: pcie agent mode support"
Kumar Gala [Wed, 4 Nov 2009 07:29:04 +0000 (01:29 -0600)]
Revert "ppc/85xx/pci: fsl_pci_init: pcie agent mode support"

This reverts commit 70ed869ea5f6b1d13d7b140c83ec0dcd8a127ddc.

There isn't any need to modify the API for fsl_pci_init_port to pass the
status of host/agent(end-point) status.  We can determine that
internally to fsl_pci_init_port.  Revert the patch that makes the API
change.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agoppc/85xx: Fix misc L2 cache enabling bug
Dave Liu [Fri, 30 Oct 2009 23:59:55 +0000 (07:59 +0800)]
ppc/85xx: Fix misc L2 cache enabling bug

We need loop-check the flash clear lock and enable bit for L2 cache.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sat, 31 Oct 2009 15:03:08 +0000 (16:03 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

10 years agosh: Update lowlevel_init.S of espt-giga
Nobuhiro Iwamatsu [Fri, 30 Oct 2009 01:16:27 +0000 (10:16 +0900)]
sh: Update lowlevel_init.S of espt-giga

There was the point that did not use write macro.
Change to write macro.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agosh: Move some defs to convince 'pcrel too far'
Nobuhiro Iwamatsu [Fri, 30 Oct 2009 01:01:25 +0000 (10:01 +0900)]
sh: Move some defs to convince 'pcrel too far'

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Takashi Yoshii <yoshii.takashi@gmail.com>
10 years agosh: Remove malloc_bin_reloc from lib_sh, lib_nios2 and lib_nios.
Nobuhiro Iwamatsu [Thu, 15 Oct 2009 04:36:34 +0000 (13:36 +0900)]
sh: Remove malloc_bin_reloc from lib_sh, lib_nios2 and lib_nios.

By "arm/microblaze/nios/nios2/sh: Remove relocation fixups"
(commit: 0630535e2d062dd73c1ceca5c6125c86d1127a49", doesn't need
malloc_bin_reloc function. This commit remove this.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agoFix DM9000 MAC address handling
Ben Warren [Thu, 22 Oct 2009 04:53:39 +0000 (21:53 -0700)]
Fix DM9000 MAC address handling

Proper behavior is to pull MAC address from NVRAM in the initialization() an
stuff it in dev->address, then program the device from dev->address in
the init() function.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agosbc8349: fix incorrect comment
Wolfgang Denk [Wed, 28 Oct 2009 21:07:56 +0000 (22:07 +0100)]
sbc8349: fix incorrect comment

The comment for the BR0_PRELIM port size initialization incorrectly
stated 32 bit, while it's actually 16 bit. The code is correct.

Reported-by: Guenter Koellner <guenter.koellner@nsn.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Wed, 28 Oct 2009 20:50:09 +0000 (21:50 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-sparc
Wolfgang Denk [Wed, 28 Oct 2009 20:48:40 +0000 (21:48 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-sparc

10 years agoFix Compliation warning for TNY-A9260 and TNY-A9G20
Sandeep Paulraj [Wed, 28 Oct 2009 15:05:03 +0000 (11:05 -0400)]
Fix Compliation warning for TNY-A9260 and TNY-A9G20

The patch fixes a compilation warning by defining
CONFIG_SYS_64BIT_VSPRINTF in the config file

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
10 years agoFix Compliation warning for SBC35-A9G20 board
Sandeep Paulraj [Wed, 28 Oct 2009 15:04:53 +0000 (11:04 -0400)]
Fix Compliation warning for SBC35-A9G20 board

The patch fixes a compilation warning by defining
CONFIG_SYS_64BIT_VSPRINTF in the config file

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
10 years agogalaxy5200: Add default environment variables
Eric Millbrandt [Wed, 28 Oct 2009 14:37:33 +0000 (09:37 -0500)]
galaxy5200: Add default environment variables

Extend bootdelay to 10 seconds.  Set boot retry time to 120 seconds and use
reset to retry.  Define default bootcommand and bootargs for production.

Signed-off-by: Eric Millbrandt <emillbrandt@dekaresearch.com>
10 years agocfi: Add weak default function for flash_cmd_reset()
Stefan Roese [Tue, 27 Oct 2009 14:15:55 +0000 (15:15 +0100)]
cfi: Add weak default function for flash_cmd_reset()

Currently the CFI driver issues both AMD and Intel reset commands.
This is because the driver doesn't know yet which chips are connected.
This dual reset seems to cause problems with the M29W128G chips as
reported by Richard Retanubun. This patch now introduces a weak default
function for the CFI reset command, still with both resets. This can
be overridden by a board specific version if necessary.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Richard Retanubun <RichardRetanubun@ruggedcom.com>