]> git.sur5r.net Git - u-boot/log
u-boot
14 years ago5xxx, fdt: move fdt_fixup_memory() to cpu.c file
Heiko Schocher [Thu, 3 Dec 2009 10:20:06 +0000 (11:20 +0100)]
5xxx, fdt: move fdt_fixup_memory() to cpu.c file

u-boot updates, before starting Linux, the memory node in the
DTS. As this is a "standard" feature, move this functionality
to the cpu.c file for mpc5xxx and mpc512x processors.

Signed-off-by: Heiko Schocher <hs@denx.de>
14 years agoMerge branch 'master' of ../work into next
Wolfgang Denk [Mon, 7 Dec 2009 22:42:33 +0000 (23:42 +0100)]
Merge branch 'master' of ../work into next

14 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>
14 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>
14 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>
14 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>
14 years agompc52xx, manroland: add some commands
Heiko Schocher [Thu, 3 Dec 2009 10:20:42 +0000 (11:20 +0100)]
mpc52xx, manroland: add some commands

add the following commands for the manroland boards:

CONFIG_CMDLINE_EDITING
CONFIG_COMMAND_HISTORY
CONFIG_AUTO_COMPLETE

Signed-off-by: Heiko Schocher <hs@denx.de>
14 years agoMerge branch 'master' into next
Wolfgang Denk [Mon, 7 Dec 2009 21:47:17 +0000 (22:47 +0100)]
Merge branch 'master' into next

Conflicts:
lib_generic/zlib.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoPOST: Remove duplicated post_hotkey_pressed() functions
Stefan Roese [Thu, 3 Dec 2009 05:24:30 +0000 (06:24 +0100)]
POST: Remove duplicated post_hotkey_pressed() functions

This patch introduces a weak default function for post_hotkey_pressed(),
returning 0, for boards without hotkey support. The long-running tests
won't be started on those boards. This default function was implemented
in many board directories. By implementing this weak default we can
remove all those duplicate versions.

Boards with hotkey support, can override this weak default function
by defining one in their board specific code.

Signed-off-by: Stefan Roese <sr@denx.de>
14 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>
14 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>
14 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>

14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>

14 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>
14 years agoMerge branch 'master' into next
Wolfgang Denk [Sat, 5 Dec 2009 01:11:59 +0000 (02:11 +0100)]
Merge branch 'master' into next

Conflicts:
board/esd/plu405/plu405.c
drivers/rtc/ftrtc010.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 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>
14 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>
14 years agozlib: Optimize decompression
Joakim Tjernlund [Thu, 19 Nov 2009 12:22:44 +0000 (13:22 +0100)]
zlib: Optimize decompression

This patch optimizes the direct copy procedure.
Uses get_unaligned() but only in one place.
The copy loop just above this one can also use this
optimization, but I havn't done so as I have not tested if it
is a win there too.
On my MPC8321 this is about 17% faster on my JFFS2 root FS
than the original. No speed test has been performed in u-boot.

Size increase on ppc: 484 bytes

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
14 years agoadd lzop decompression support
Peter Korsgaard [Thu, 19 Nov 2009 10:37:51 +0000 (11:37 +0100)]
add lzop decompression support

Add lzop decompression support to the existing lzo bitstream handling
(think gzip versus zlib), and support it for uImage decompression if
CONFIG_LZO is enabled.

Lzop doesn't compress as good as gzip (~10% worse), but decompression
is very fast (~0.7s faster here on a slow ppc). The lzop decompression
code is based on Albin Tonnerre's recent ARM Linux lzo support patch.

Cc: albin.tonnerre@free-electrons.com
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
14 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>
14 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>
14 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>
14 years agoGeneric udelay() with watchdog support
Ingo van Lil [Tue, 24 Nov 2009 13:09:21 +0000 (14:09 +0100)]
Generic udelay() with watchdog support

According to the PPC reference implementation the udelay() function is
responsible for resetting the watchdog timer as frequently as needed.
Most other architectures do not meet that requirement, so long-running
operations might result in a watchdog reset.

This patch adds a generic udelay() function which takes care of
resetting the watchdog before calling an architecture-specific
__udelay().

Signed-off-by: Ingo van Lil <inguin@gmx.de>
14 years agoi386: Final Relocation
Graeme Russ [Tue, 24 Nov 2009 09:04:21 +0000 (20:04 +1100)]
i386: Final Relocation

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoi386: Move references to link script exports
Graeme Russ [Tue, 24 Nov 2009 09:04:20 +0000 (20:04 +1100)]
i386: Move references to link script exports

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoi386: Remove inline asm symbols from .dynsym
Graeme Russ [Tue, 24 Nov 2009 09:04:19 +0000 (20:04 +1100)]
i386: Remove inline asm symbols from .dynsym

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoi386: Rearrange Interupt Handling
Graeme Russ [Tue, 24 Nov 2009 09:04:18 +0000 (20:04 +1100)]
i386: Rearrange Interupt Handling

In preperation for full relocation

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoi386: Fix race condition when using SC520 timers
Graeme Russ [Tue, 24 Nov 2009 09:04:17 +0000 (20:04 +1100)]
i386: Fix race condition when using SC520 timers

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoi386: Fix global label in inline asm compile error
Graeme Russ [Tue, 24 Nov 2009 09:04:16 +0000 (20:04 +1100)]
i386: Fix global label in inline asm compile error

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoi386: Reorder source objects in lib_i386 Makefile
Graeme Russ [Tue, 24 Nov 2009 09:04:15 +0000 (20:04 +1100)]
i386: Reorder source objects in lib_i386 Makefile

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoi386: Fix link collisions resulting from gcc4.4.1 upgrade
Graeme Russ [Tue, 24 Nov 2009 09:04:14 +0000 (20:04 +1100)]
i386: Fix link collisions resulting from gcc4.4.1 upgrade

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoi386: Fix malloc initialization
Graeme Russ [Tue, 24 Nov 2009 09:04:13 +0000 (20:04 +1100)]
i386: Fix malloc initialization

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoi386: Fix dlmalloc compile warning
Graeme Russ [Tue, 24 Nov 2009 09:04:12 +0000 (20:04 +1100)]
i386: Fix dlmalloc compile warning

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 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>
14 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>
14 years agocrc32: Impl. linux optimized crc32()
Joakim Tjernlund [Thu, 19 Nov 2009 12:44:16 +0000 (13:44 +0100)]
crc32: Impl. linux optimized crc32()

Ported over the more efficient linux crc32() function.
A quick comparsion on ppc:
After changing the old crc32 to do 4 bytes in the
inner loop to be able to compare with new version one can note:
- old inner loop has 61 insn, new has 19 insn.
- new crc32 does one 32 bit load of data to crc while
  the old does four 8 bits loads.
- size is bit bigger for the new crc32:
  1392(old) 1416(new) of text. The is because the new version
  shares code with crc32_no_comp() instead of duplicating code.
- about 33% faster on ppc:
  New > crc 0 0xfffffff -> 39 secs
  Old > crc 0 0xfffffff -> 60 secs

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 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>
14 years agomakefiles: fixes for building build tools
Scott Wood [Thu, 5 Nov 2009 00:41:41 +0000 (18:41 -0600)]
makefiles: fixes for building build tools

Currently, some of the tools instead set CC to be HOSTCC in order to re-use
some pattern rules -- but this fails when the user overrides CC on the make
command line.  Also, the HOSTCFLAGS in tools/Makefile are currently not
being used because config.mk overwrites them.

This patch adds static pattern rules for files that have been requested to
be built with the native compiler using $(HOSTSRCS) and $(HOSTOBJS), and
converts the tools to use them.

It restores easylogo to using the host compiler, which was broken by commit
38d299c2db81bd889c601b5dfc12c4e83ef83333 (if this was an intentional change,
please let me know -- but it seems to be a build tool).

It restores -pedantic and the special flags for darwin and cygwin that were
requested in tools/makefile (but keeps the flags added by config.mk) --
hopefully someone can test this on those platforms.  It no longer
conditionalizes -pedantic on not being darwin; it wasn't clear that that was
intentional, and unless there's a real problem it's just inviting people to
contribute non-pedantic patches to those files (I'm not a fan of -pedantic
personally, but if it's on for one platform it should be on for all).

HOST_LDFLAGS is renamed HOSTLDFLAGS for consistency with the previous
HOST_CFLAGS to HOSTCFLAGS rename.  A new HOSTCFLAGS_NOPED is made available
for those files which currently cannot be built with -pedantic, and replaces
the old FIT_CFLAGS.

imls now uses the cross compiler properly, rather than by trying to
reconstruct CC using the typoed $(CROSS_COMPILER).

envcrc.c is now dependency-processed unconditionally -- previously it would
be built without being on (HOST)SRCS if CONFIG_ENV_IS_EMBEDDED was not
selected.

Signed-off-by: Scott Wood <scottwood@freescale.com>
14 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>
14 years agoexports: rewrite jump table init
Mike Frysinger [Wed, 4 Nov 2009 21:34:42 +0000 (16:34 -0500)]
exports: rewrite jump table init

The current jump table init fails to initialize a bunch of exported
symbols (forceenv/do_reset/etc...).  Rather than fix just these few
missing pieces, rewrite the code to utilize the existing list of
exported symbols -- _exports.h.  Since every exported symbol has to
be listed in this header, it makes sense to use it so that we only
ever have one list that needs to be updated and things can't fall
out of sync again.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 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>
14 years agoMerge branch 'next-sync' of git://git.denx.de/u-boot-arm into next
Wolfgang Denk [Tue, 1 Dec 2009 11:10:51 +0000 (12:10 +0100)]
Merge branch 'next-sync' of git://git.denx.de/u-boot-arm into next

14 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

14 years agoARM Update mach-types
Tom Rix [Sun, 29 Nov 2009 23:56:36 +0000 (17:56 -0600)]
ARM Update mach-types

Fetched from http://www.arm.linux.org.uk/developer/machines/download.php
And built with

repo http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
commit 3fcca9ac6cbce35b3e81e247d375534117d5f4cd

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoomap3_mmc: Encapsulate twl4030 under option CONFIG_TWL4030_POWER
Vaibhav Hiremath [Mon, 23 Nov 2009 11:06:05 +0000 (16:36 +0530)]
omap3_mmc: Encapsulate twl4030 under option CONFIG_TWL4030_POWER

Fixes the build/compilation error if we try to re-use the omap3_mmc code
without TWL4030_POWER.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
14 years agoTI DaVinci: Adding a README for the DaVinci series of SOC's
Sandeep Paulraj [Sat, 21 Nov 2009 18:13:59 +0000 (13:13 -0500)]
TI DaVinci: Adding a README for the DaVinci series of SOC's

Adding an initial README for the DaVinci series of SOC's

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoavr32/hsdramc: Move conditional compilation to Makefile
Jean-Christophe PLAGNIOL-VILLARD [Sat, 6 Jun 2009 10:30:58 +0000 (10:30 +0000)]
avr32/hsdramc: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj <at> jcrosoft.com>
Cc: Haavard Skinnemoen <haavard.skinnemoen <at> atmel.com>
14 years agoNAND: Add config option for imx27lite
Sandeep Paulraj [Sat, 21 Nov 2009 18:24:17 +0000 (13:24 -0500)]
NAND: Add config option for imx27lite

We will get compilation warnings without
"CONFIG_SYS_64BIT_VSPRINTF" being defined
in the board config.

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoarm: A320: Add support for Faraday A320 evaluation board
Po-Yu Chuang [Wed, 11 Nov 2009 09:27:30 +0000 (17:27 +0800)]
arm: A320: Add support for Faraday A320 evaluation board

This patch adds support for A320 evaluation board from Faraday. This board
uses FA526 processor by default and has 512kB and 32MB NOR flash, 64M RAM.
FA526 is an ARMv4 processor and uses the ARM920T source in this patch.

Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com>
14 years agoarm: A320: driver for FTRTC010 real time clock
Po-Yu Chuang [Wed, 11 Nov 2009 09:26:00 +0000 (17:26 +0800)]
arm: A320: driver for FTRTC010 real time clock

This patch adds an FTRTC010 driver for Faraday A320 evaluation board.

Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com>
14 years agoTI DaVinci DM646x: Enable NAND on DM6467 EVM
Sandeep Paulraj [Sat, 21 Nov 2009 23:08:49 +0000 (18:08 -0500)]
TI DaVinci DM646x: Enable NAND on DM6467 EVM

This patch enables NAND on the DM6467 EVM

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoOMAP3: Fix SDRC init
Nishanth Menon [Mon, 9 Nov 2009 14:29:34 +0000 (09:29 -0500)]
OMAP3: Fix SDRC init

Defaults are for Infineon DDR timings.
Since none of the supported boards currently do
XIP boot, these seem to be faulty. fix the values
as per the calculations(ACTIMA,B), conf
the sdrc power with pwdnen and wakeupproc bits

Signed-off-by: Nishanth Menon <nm@ti.com>
14 years agoOMAP3:SDRC: introduce DDR types
Nishanth Menon [Sat, 7 Nov 2009 15:51:24 +0000 (10:51 -0500)]
OMAP3:SDRC: introduce DDR types

Micron DDR timings based on:
http://www.sakoman.net/cgi-bin/gitweb.cgi?p=x-load-omap3.git;a=blob;f=include/asm/arch-omap3/mem.h;h=e6fbfe3947f5d0d85fea776e30821d4017316d86;hb=HEAD

Introduce Micron DDR timings and provide
CONFIG_OMAP3_INFINEON_DDR and CONFIG_OMAP3_MICRON_DDR config
options to allow for platform files to setup their timings as
per the type of DDR selected

Reported-by: Steve Sakoman in http://www.nabble.com/forum/Permalink.jtp?root=25779518&post=25959734&page=y
Signed-off-by: Nishanth Menon <nm@ti.com>
14 years agoOMAP3:SDRC: Cleanup references to SDP
Nishanth Menon [Sat, 7 Nov 2009 15:40:47 +0000 (10:40 -0500)]
OMAP3:SDRC: Cleanup references to SDP

Remove SDP referenced unused defines

Signed-off-by: Nishanth Menon <nm@ti.com>
14 years agoTI DA8xx: Integrate DA830 EVM support into U-Boot
Sekhar Nori [Thu, 12 Nov 2009 16:09:25 +0000 (11:09 -0500)]
TI DA8xx: Integrate DA830 EVM support into U-Boot

Integrate DA830 EVM support into U-Boot.

Provides initial support for TI OMAP-L137/DA830 SoC devices on a Spectrum
Digital EVM board. See http://www.spectrumdigital.com/

Signed-off-by: Nick Thompson <nick.thompson@gefanuc.com>
14 years agoTI DA8xx: Add new directory for da830evm board
Sekhar Nori [Thu, 12 Nov 2009 16:08:39 +0000 (11:08 -0500)]
TI DA8xx: Add new directory for da830evm board

Add new directory for da830evm board

Provides initial support for TI OMAP-L137/DA830 SoC devices on a Spectrum
Digital EVM board. See http://www.spectrumdigital.com/

Provides:
Initial boot and configuration.
Support for i2c.
UART support (console).

Signed-off-by: Nick Thompson <nick.thompson@gefanuc.com>
14 years agoTI DA8xx: Add DA8xx cpu functions
Sekhar Nori [Thu, 12 Nov 2009 16:07:22 +0000 (11:07 -0500)]
TI DA8xx: Add DA8xx cpu functions

Provides initial support for TI OMAP-L1x/DA8xx SoC devices.
See http://www.ti.com

Provides:
Low level initialisation.
System clock API.
Timer control.

Signed-off-by: Nick Thompson <nick.thompson@gefanuc.com>
14 years agoAdd TI DA8xx support: DA8xx includes
Nick Thompson [Thu, 12 Nov 2009 16:06:08 +0000 (11:06 -0500)]
Add TI DA8xx support: DA8xx includes

Provides initial support for TI OMAP-L1x/DA8xx SoC devices.
See http://www.ti.com

The DA8xx devices are similar to DaVinci devices but have a differing
memory map and updated peripheral versions.

Signed-off-by: Nick Thompson <nick.thompson@gefanuc.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
14 years agoTI Davinci: add a pin multiplexer configuration API
Nick Thompson [Thu, 12 Nov 2009 16:03:23 +0000 (11:03 -0500)]
TI Davinci: add a pin multiplexer configuration API

Creates a method allowing pin settings to be logically grouped into data
structure arrays and provides an API to configure the pinmux settings to
enable the relevant pin functions.

Signed-off-by: Nick Thompson <nick.thompson@gefanuc.com>
14 years agoTI Davinci timer.c: Remove volatiles and memory mapped structures
Nick Thompson [Thu, 12 Nov 2009 16:02:17 +0000 (11:02 -0500)]
TI Davinci timer.c: Remove volatiles and memory mapped structures

Remove volatiles and memory mapped structure accesses and replace with
readl and writel macro usage.

Signed-off-by: Nick Thompson <nick.thompson@gefanuc.com>
14 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>
14 years agoAdd a unified s3c24x0 header file
kevin.morfitt@fearnside-systems.co.uk [Tue, 17 Nov 2009 09:30:34 +0000 (18:30 +0900)]
Add a unified s3c24x0 header file

This patch adds a unified s3c24x0 cpu header file that selects the header
file for the specific s3c24x0 cpu from the SOC and CPU configs defined in
board config file. This removes the current chain of s3c24-type #ifdef's
from the s3c24x0 code.

Signed-off-by: Kevin Morfitt <kevin.morfitt@fearnside-systems.co.uk>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
14 years agoS3C6400/SMDK6400: fix stack_setup in start.S
Seunghyeon Rhee [Fri, 13 Nov 2009 07:49:41 +0000 (16:49 +0900)]
S3C6400/SMDK6400: fix stack_setup in start.S

Fix stack_setup to place the stack on the correct address in DRAM
accroding to U-Boot standard and remove conditional compilation by
CONFIG_MEMORY_UPPER_CODE macro that is not necessry. This macro
was introduced and used only by this board for some unclear reason.

The definition of this macro is also removed because it's not
referenced elsewhere.

Signed-off-by: Seunghyeon Rhee <seunghyeon@lpmtec.com>
Tested-by: Minkyu Kang <mk7.kang@samsung.com>
14 years agos5pc1xx: serial: fix the error check logic
Minkyu Kang [Tue, 10 Nov 2009 11:23:50 +0000 (20:23 +0900)]
s5pc1xx: serial: fix the error check logic

Because of Frame error, Parity error and Overrun error are occured only receive
operation, need to masking when error checking.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
14 years agoClean-up of s3c24x0 header files
kevin.morfitt@fearnside-systems.co.uk [Wed, 4 Nov 2009 08:49:31 +0000 (17:49 +0900)]
Clean-up of s3c24x0 header files

Cleans up the s3c24x0 header files:

s4c24x0.h: removes the use of 'volatile' from the S3C24X0_REG8,
S3C24X0_REG16 and S3C24X0_REG32 register typedef's. Registers are always
accessed using the IO accessor functions which cast the register address
as 'volatile' anyway so it isn't required here.

s3c2400.h and s3c2410.h: insert a blank line between the static inline
functions

Signed-off-by: Kevin Morfitt <kevin.morfitt@fearnside-systems.co.uk>
14 years agos3c64xx: move s3c64xx header files to asm-arm/arch-s3c64xx
Minkyu Kang [Wed, 4 Nov 2009 07:07:59 +0000 (16:07 +0900)]
s3c64xx: move s3c64xx header files to asm-arm/arch-s3c64xx

This patch moves the s3c64xx header files from include/
to include/asm-arm/arch-s3c64xx

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
14 years agoMove s3c24x0 header files to asm-arm/arch-s3c24x0/
kevin.morfitt@fearnside-systems.co.uk [Tue, 3 Nov 2009 09:08:41 +0000 (18:08 +0900)]
Move s3c24x0 header files to asm-arm/arch-s3c24x0/

This patch moves the s3c24x0 header files from include/ to
include/asm-arm/arch-s3c24x0/.

checkpatch.pl showed 2 errors and 3 warnings. The 2 errors were both due
to a non-UTF8 character in David M?ller's name:

ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8
#489: FILE: include/asm-arm/arch-s3c24x0/s3c2410.h:3:
+ * David M?ller ELSOFT AG Switzerland. d.mueller@elsoft.ch

As David's name correctly contains a non-UTF8 character I haven't fixed
these errors.

The 3 warnings were all because of the use of 'volatile' in s3c24x0.h:

WARNING: Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt
#673: FILE: include/asm-arm/arch-s3c24x0/s3c24x0.h:35:
+typedef volatile u8 S3C24X0_REG8;
+typedef volatile u16 S3C24X0_REG16;
+typedef volatile u32 S3C24X0_REG32;

I'll fix these errors in another patch.

Tested by running MAKEALL for ARM8 targets and ensuring there were no new
errors or warnings.

Signed-off-by: Kevin Morfitt <kevin.morfitt@fearnside-systems.co.uk>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
14 years agoARM Update mach-types
Tom Rix [Sun, 15 Nov 2009 16:58:06 +0000 (10:58 -0600)]
ARM Update mach-types

Fetched from http://www.arm.linux.org.uk/developer/machines/download.php
And built with

repo http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
commit 156171c71a0dc4bce12b4408bb1591f8fe32dc1a

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agosheevaplug: correct SDRAM address control register
Mark Asselstine [Tue, 27 Oct 2009 14:10:40 +0000 (19:40 +0530)]
sheevaplug: correct SDRAM address control register

value

The SheevaPlug DevKit is shipped with 4x8 by 1Gb DDR devices in
two banks for a total of 512MB of RAM. Based on this configuration
the existing values for SDRAM address control register are incorrect
and result in random kernel oops as memory is incorrectly accessed
(while for example extracting a large tarball such as a rootfs).
Based on the hardware configuration along with the supporting
documentation from Marvell these are the correct values, as
well this change mimics values previously used in Marvell's own
u-boot git tree for the SheevaPlug.

Other variants of the hardware such as the PogoPlug and TonidoPlug
may have different memory configurations but to properly support
those additional board directories should be maintained or a better
system to support other kwb*.cfg is needed.

Tested on SheevaPlug DevKit.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
14 years agoFix for Void function returning value in sbc35-a9g20
Sandeep Paulraj [Wed, 28 Oct 2009 23:16:43 +0000 (19:16 -0400)]
Fix for Void function returning value in sbc35-a9g20

Void function was returning 0 in the m41t94 rtc driver.
This makes it similar to m41t62 rtc driver.

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoARM Update mach-types.h
Tom Rix [Sat, 24 Oct 2009 19:48:33 +0000 (14:48 -0500)]
ARM Update mach-types.h

From http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

Commit id 0996391139f43d032335b5360db11da62a2cbb39

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
15 years agoppc4xx: Remove autoupdate feature from PLU405 board
Matthias Fuchs [Thu, 22 Oct 2009 21:06:59 +0000 (23:06 +0200)]
ppc4xx: Remove autoupdate feature from PLU405 board

The autoupdate feature is not used on PLU405 boards.
So remove it.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
15 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>
15 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>
15 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>
15 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>
15 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

15 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>
15 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>
15 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

15 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

15 years agoMerge branch 'next' of git://www.denx.de/git/u-boot-ppc4xx into next
Wolfgang Denk [Tue, 24 Nov 2009 22:13:06 +0000 (23:13 +0100)]
Merge branch 'next' of git://www.denx.de/git/u-boot-ppc4xx into next

15 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>
15 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>