]> git.kernelconcepts.de Git - karo-tx-uboot.git/log
karo-tx-uboot.git
12 years agofdt: Add support for a separate device tree (CONFIG_OF_SEPARATE)
Simon Glass [Mon, 24 Oct 2011 19:15:31 +0000 (19:15 +0000)]
fdt: Add support for a separate device tree (CONFIG_OF_SEPARATE)

This adds support for an FDT to be build as a separate binary file called
u-boot.dtb. This can be concatenated with the U-Boot binary to provide a
device tree located at run-time by U-Boot. The Makefile is modified to
provide this file in u-boot-dtb.bin.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agofdt: Add support for embedded device tree (CONFIG_OF_EMBED)
Simon Glass [Sat, 15 Oct 2011 05:48:21 +0000 (05:48 +0000)]
fdt: Add support for embedded device tree (CONFIG_OF_EMBED)

This new option allows U-Boot to embed a binary device tree into its image
to allow run-time control of peripherals. This device tree is for U-Boot's
own use and is not necessarily the same one as is passed to the kernel.

The device tree compiler output should be placed in the $(obj)
rooted tree. Since $(OBJCOPY) insists on adding the path to the
generated symbol names, to ensure consistency it should be
invoked from the directory where the .dtb file is located and
given the input file name without the path.

This commit contains my entry for the ugliest Makefile / shell interaction
competition.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agofdt: ARM: Add device tree control of U-Boot (CONFIG_OF_CONTROL)
Simon Glass [Sat, 15 Oct 2011 05:48:20 +0000 (05:48 +0000)]
fdt: ARM: Add device tree control of U-Boot (CONFIG_OF_CONTROL)

This adds a device tree pointer to the global data. It can be set by
board code. A later commit will add support for making a device
tree binary blob available to U-Boot for run-time configuration.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agonet: tftpput: add tftpput command
Simon Glass [Mon, 24 Oct 2011 18:00:08 +0000 (18:00 +0000)]
net: tftpput: add tftpput command

This adds the tftpput command to U-Boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agonet: tftpput: implement tftp logic
Simon Glass [Mon, 24 Oct 2011 18:00:07 +0000 (18:00 +0000)]
net: tftpput: implement tftp logic

This adds logic to tftp.c to implement the tftp 'put' command, and
updates the README.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agotftpput: add save_addr and save_size global variables
Simon Glass [Fri, 21 Oct 2011 18:51:38 +0000 (18:51 +0000)]
tftpput: add save_addr and save_size global variables

We need something akin to load_addr to handle saving data.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agonet: tftpput: Support selecting get/put for tftp
Simon Glass [Mon, 24 Oct 2011 18:00:05 +0000 (18:00 +0000)]
net: tftpput: Support selecting get/put for tftp

TftpStart should support starting either a get or a put.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agonet: tftpput: Factor out start, restart and next block functions
Simon Glass [Mon, 24 Oct 2011 18:00:04 +0000 (18:00 +0000)]
net: tftpput: Factor out start, restart and next block functions

This code is required for tftpput, so move it into separate functions.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agonet: tftpput: move common code into separate functions
Simon Glass [Mon, 24 Oct 2011 18:00:03 +0000 (18:00 +0000)]
net: tftpput: move common code into separate functions

We want to show block markers on completion of get and put, so
move this common code into separate functions.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agonet: tftpput: Rename TFTP to TFTPGET
Simon Glass [Mon, 24 Oct 2011 18:00:02 +0000 (18:00 +0000)]
net: tftpput: Rename TFTP to TFTPGET

This is a better name for this protocol. Also remove the typedef to keep
checkpatch happy, and move zeroing of NetBootFileXferSize a little
earlier since TFTPPUT will need to change this.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agonet: tftpput: Add support for receiving ICMP packets
Simon Glass [Mon, 24 Oct 2011 18:00:01 +0000 (18:00 +0000)]
net: tftpput: Add support for receiving ICMP packets

ICMP packets can tell you when there is no server at the other end. It
is useful for tftp to figure this out, so that a quick error can be
displayed, rather than pointlessly retrying.

This adds an ICMP packet handler to the net interface.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agonet: tftpput: Move ICMP code into its own function
Simon Glass [Mon, 24 Oct 2011 18:00:00 +0000 (18:00 +0000)]
net: tftpput: Move ICMP code into its own function

NetReceive() is a very long function with a lot of indent. Before adding
code to the ICMP bit, split it out.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoAdd setenv_ulong() and setenv_addr()
Simon Glass [Mon, 24 Oct 2011 17:59:59 +0000 (17:59 +0000)]
Add setenv_ulong() and setenv_addr()

It seems we put numbers and addresses into environment variables a lot.
We should have some functions to do this.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoMove simple_itoa to vsprintf
Simon Glass [Fri, 21 Oct 2011 18:51:33 +0000 (18:51 +0000)]
Move simple_itoa to vsprintf

This function is generally useful and shouldn't hide away in hush. It
has been moved as is.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoaltera_tse: Fix return of eth_device's recv() callback
Joachim Foerster [Mon, 17 Oct 2011 05:24:46 +0000 (05:24 +0000)]
altera_tse: Fix return of eth_device's recv() callback

It seems to be good practice to return the number of received bytes in the
eth_device's recv() callback, here: tse_eth_rx().

Signed-off-by: Joachim Foerster <joachim.foerster@missinglinkelectronics.com>
12 years agoaltera_tse: m88e1111s: Honor device flags regarding PHY interface mode
Joachim Foerster [Tue, 25 Oct 2011 22:39:57 +0000 (22:39 +0000)]
altera_tse: m88e1111s: Honor device flags regarding PHY interface mode

Note: This is kind of guess work. The current code is preserved for
all RGMII related modes. It is different for flags=0 (GMII) and flags=5
(SGMII). The last case, SGMII, is successfully tested on
Altera's Terasic DE4.

Signed-off-by: Joachim Foerster <joachim.foerster@missinglinkelectronics.com>
12 years agoaltera_tse: Add support for dedicated descriptor memory
Joachim Foerster [Mon, 17 Oct 2011 05:24:44 +0000 (05:24 +0000)]
altera_tse: Add support for dedicated descriptor memory

Signed-off-by: Joachim Foerster <joachim.foerster@missinglinkelectronics.com>
12 years agoaltera_tse: Fix SGDMA reset triggering
Joachim Foerster [Mon, 17 Oct 2011 05:24:43 +0000 (05:24 +0000)]
altera_tse: Fix SGDMA reset triggering

The SW_RESET needs to be set instead of being masked out!

Signed-off-by: Joachim Foerster <joachim.foerster@missinglinkelectronics.com>
12 years agoaltera_tse: Clear SGDMA's RUN bit in async transfer, like in sync case
Joachim Foerster [Tue, 25 Oct 2011 22:39:54 +0000 (22:39 +0000)]
altera_tse: Clear SGDMA's RUN bit in async transfer, like in sync case

Signed-off-by: Joachim Foerster <joachim.foerster@missinglinkelectronics.com>
12 years agopart_efi: dcache: allocate cacheline aligned buffers
Anton staaf [Wed, 12 Oct 2011 13:56:04 +0000 (13:56 +0000)]
part_efi: dcache: allocate cacheline aligned buffers

Currently part_efi.c allocates buffers for the gpt_header, the
legacy_mbr, and the pte (partition table entry) that may be
incorrectly aligned for DMA operations.

This patch uses ALLOC_CACHE_ALIGN_BUFFER for the stack allocated
buffers and memalign to replace the malloc of the pte.

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agommc: dcache: allocate cache aligned buffers for ext_csd
Anton staaf [Tue, 4 Oct 2011 11:24:50 +0000 (11:24 +0000)]
mmc: dcache: allocate cache aligned buffers for ext_csd

Currently the mmc_change_freq and mmc_startup functions allocates
buffers on the stack that are passed down to the MMC device driver.
These buffers could be unaligned to the L1 dcache line size.  This
causes problems when using DMA and with caches enabled.

This patch correctly cache alignes the buffers used for reading the
ext_csd data from an MMC device.

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
12 years agoext2: Cache line aligned partial sector bounce buffer
Anton staaf [Mon, 3 Oct 2011 13:55:00 +0000 (13:55 +0000)]
ext2: Cache line aligned partial sector bounce buffer

Currently, if a device read request is done that does not begin or end
on a sector boundary a stack allocated bounce buffer is used to perform
the read, and then just the part of the sector that is needed is copied
into the users buffer.  This stack allocation can mean that the bounce
buffer will not be aligned to the dcache line size.  This is a problem
when caches are enabled because unaligned cache invalidates are not
safe.

This patch uses ALLOC_CACHE_ALIGN_BUFFER to create a stack allocated
cache line size aligned bounce buffer.

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Dave Liu <r63238@freescale.com>
Cc: Andy Fleming <afleming@gmail.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Change-Id: I32e1594d90ef039137bb219b0f7ced55768744ff
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agommc: dcache: allocate cache aligned buffer for scr and switch_status
Anton staaf [Mon, 3 Oct 2011 13:54:59 +0000 (13:54 +0000)]
mmc: dcache: allocate cache aligned buffer for scr and switch_status

Currently the sd_change_freq function allocates two buffers on the
stack that it passes down to the MMC device driver.  These buffers
could be unaligned to the L1 dcache line size.  This causes problems
when using DMA and with caches enabled.

This patch correctly cache alignes the buffers used for reading the
scr register and switch status values from an MMC device.

Change-Id: Ifa8414f572ef907681bd2d5ff3950285a215357d
Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agotegra: define CONFIG_SYS_CACHELINE_SIZE for tegra
Anton staaf [Mon, 3 Oct 2011 13:54:58 +0000 (13:54 +0000)]
tegra: define CONFIG_SYS_CACHELINE_SIZE for tegra

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Tom Warren <twarren.nvidia@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Change-Id: I5c4bcfc0bfe59158ff249fe3be6640eec6d3cc76
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agocache: add ALLOC_CACHE_ALIGN_BUFFER macro
Anton staaf [Wed, 12 Oct 2011 13:55:59 +0000 (13:55 +0000)]
cache: add ALLOC_CACHE_ALIGN_BUFFER macro

This macro is used to allocate cache line size aligned stack
buffers for use with DMA hardware.

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Aneesh V <aneesh@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Wolfgang Denk <wd@denx.de>
12 years agoRevert "km_arm: enable POST for these boards"
Wolfgang Denk [Mon, 24 Oct 2011 19:14:42 +0000 (21:14 +0200)]
Revert "km_arm: enable POST for these boards"

This reverts commit a2da616311151ecfab8b8fcc510686fc3c0c9a21.
THis was applied by accident - a more recent version of this change
was already present, see commit
9400f8f   2011-10-05 22:03:11 +0200   km_arm: enable POST for these boards

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoarm: Correct build error introduced by getenv_ulong() patch
Simon Glass [Sun, 23 Oct 2011 17:44:35 +0000 (17:44 +0000)]
arm: Correct build error introduced by getenv_ulong() patch

Commit dc8bbea removed a local variable that is used in most ARM boards.

Since we want to avoid an 'unused variable' warning with later compilers,
and the #ifdef logic of whether this variable is required is bit painful,
this declares the variable local to the block of code that needs it.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agopowerpc: Correct build warning introduced by getenv_ulong() patch
Simon Glass [Sun, 23 Oct 2011 17:41:54 +0000 (17:41 +0000)]
powerpc: Correct build warning introduced by getenv_ulong() patch

Commit 1272592 introduced a warning since the variable 's' is no longer
always used, depending on the CONFIG options.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agomkimage: adding support for Davinci AIS image
Stefano Babic [Mon, 17 Oct 2011 00:07:43 +0000 (00:07 +0000)]
mkimage: adding support for Davinci AIS image

Some Davinci processors supports the Application
Image Script (AIS) boot process. The patch adds the generation
of the AIS image inside the mkimage tool to make possible
to generate a bootable U-boot without external tools
(TI Davinci AIS Generator).

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Wolfgang Denk <wd@denx.de>
12 years agonet: xilinx_enet: drop unused !NET_MULTI driver
Mike Frysinger [Sun, 16 Oct 2011 20:04:13 +0000 (16:04 -0400)]
net: xilinx_enet: drop unused !NET_MULTI driver

This driver doesn't support the NET_MULTI framework, and I can't find
any boards/configs/files that reference this subdir, so punt it all.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agonet: sc589: drop unused !NET_MULTI driver
Mike Frysinger [Sun, 16 Oct 2011 10:04:12 +0000 (10:04 +0000)]
net: sc589: drop unused !NET_MULTI driver

No boards appear to use this driver, and it doesn't support NET_MULTI,
so punt the old driver.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agonet: s3c4510b_eth: drop unused !NET_MULTI driver
Mike Frysinger [Sun, 16 Oct 2011 10:04:11 +0000 (10:04 +0000)]
net: s3c4510b_eth: drop unused !NET_MULTI driver

No boards appear to use this driver, and it doesn't support NET_MULTI,
so punt the old driver.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agonet: ns9750: drop !NET_MULTI driver
Mike Frysinger [Sun, 16 Oct 2011 10:04:10 +0000 (10:04 +0000)]
net: ns9750: drop !NET_MULTI driver

Only one board uses this driver (ns9750dev), but the board doesn't seem
to have an entry to actually build it in the Makefile/boards.cfg, so just
delete net support from its board config.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agonet: enc28j60_lpc2292: drop unused !NET_MULTI driver
Mike Frysinger [Sun, 16 Oct 2011 20:04:09 +0000 (16:04 -0400)]
net: enc28j60_lpc2292: drop unused !NET_MULTI driver

Everyone seems to have converted to the new enc28j60 driver, so drop
this older one which isn't used and doesn't support NET_MULTI.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agopowerpc/lib/board.c: Call run_post(POST_ROM) before relocating
Bernhard Kaindl [Sun, 16 Oct 2011 00:07:08 +0000 (00:07 +0000)]
powerpc/lib/board.c: Call run_post(POST_ROM) before relocating

The call to run_post(POST_ROM) which can run the POST memory test
is currently called too late when gd has already been copied to DRAM.

This results in failure to boot Linux after a POST_ROM memory test
tested all RAM while gd was already relocated to DRAM due to gd being
overwritten by the POST_ROM memory test.

Support this by moving the call to run_post(POST_ROM) to run earlier,
before U-Boot has started to move data to DRAM (from late board_init_f
to early board_init_f) where DRAM is initialized, but not used yet.

This allows that an POST memory test can test the whole DRAM,
including the area where the board info struct is located.

Signed-off-by: Bernhard Kaindl <bernhard.kaindl@thalesgroup.com>
Cc: Pieter Voorthuijsen <pieter.voorthuijsen@prodrive.nl>
12 years agonet/dns.c: Fix endian conversion for big-endian in dns command
Bernhard Kaindl [Sat, 15 Oct 2011 23:59:22 +0000 (23:59 +0000)]
net/dns.c: Fix endian conversion for big-endian in dns command

net/dns.c used endian conversion macros wrongly (shorts in reply
were put swapped into CPU, and then ntohs() was used to swap it
back, which broke on big-endian).

Fix this by using the correct linux conversion macro for reading
a unaligned short in network byte order: get_unaligned_be16()
Thanks to Mike Frysinger pointing at the best macro to use.

Tested on big and little endian qemu boards (mips and versatile)

Signed-off-by: Bernhard Kaindl <bernhard.kaindl@thalesgroup.com>
Cc: Pieter Voorthuijsen <pieter.voorthuijsen@prodrive.nl>
Cc: Robin Getz <rgetz@blackfin.uclinux.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agox86: Use getenv_ulong() in place of getenv(), strtoul
Simon Glass [Thu, 13 Oct 2011 14:43:14 +0000 (14:43 +0000)]
x86: Use getenv_ulong() in place of getenv(), strtoul

This changes the board code to use the new getenv_ulong() function.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agosparc: Use getenv_ulong() in place of getenv(), strtoul
Simon Glass [Thu, 13 Oct 2011 14:43:13 +0000 (14:43 +0000)]
sparc: Use getenv_ulong() in place of getenv(), strtoul

This changes the board code to use the new getenv_ulong() function.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agopowerpc: Use getenv_ulong() in place of getenv(), strtoul
Simon Glass [Thu, 13 Oct 2011 14:43:12 +0000 (14:43 +0000)]
powerpc: Use getenv_ulong() in place of getenv(), strtoul

This changes the board code to use the new getenv_ulong() function.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Stefan Roese <sr@denx.de>
12 years agomips: Use getenv_ulong() in place of getenv(), strtoul
Simon Glass [Thu, 13 Oct 2011 14:43:11 +0000 (14:43 +0000)]
mips: Use getenv_ulong() in place of getenv(), strtoul

This changes the board code to use the new getenv_ulong() function.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agomicroblaze: Use getenv_ulong() in place of getenv(), strtoul
Simon Glass [Thu, 13 Oct 2011 14:43:10 +0000 (14:43 +0000)]
microblaze: Use getenv_ulong() in place of getenv(), strtoul

This changes the board code to use the new getenv_ulong() function.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agom68k: Use getenv_ulong() in place of getenv(), strtoul
Simon Glass [Thu, 13 Oct 2011 14:43:09 +0000 (14:43 +0000)]
m68k: Use getenv_ulong() in place of getenv(), strtoul

This changes the board code to use the new getenv_ulong() function.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoblackfin: Use getenv_ulong() in place of getenv(), strtoul
Simon Glass [Thu, 13 Oct 2011 14:43:08 +0000 (14:43 +0000)]
blackfin: Use getenv_ulong() in place of getenv(), strtoul

This changes the board code to use the new getenv_ulong() function.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoavr32: Use getenv_ulong() in place of getenv(), strtoul
Simon Glass [Thu, 13 Oct 2011 14:43:07 +0000 (14:43 +0000)]
avr32: Use getenv_ulong() in place of getenv(), strtoul

This changes the board code to use the new getenv_ulong() function.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoarm: Use getenv_ulong() in place of getenv(), strtoul
Simon Glass [Thu, 13 Oct 2011 14:43:06 +0000 (14:43 +0000)]
arm: Use getenv_ulong() in place of getenv(), strtoul

This changes the board code to use the new getenv_ulong() function.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoAdd getenv_ulong() to read an integer from an environment variable
Simon Glass [Fri, 14 Oct 2011 13:25:18 +0000 (13:25 +0000)]
Add getenv_ulong() to read an integer from an environment variable

This is not an uncommon operation in U-Boot, so let's put it in a common
function.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agocommon: fix missing function pointer relocation in fixup_cmdtable()
Daniel Schwierzeck [Tue, 18 Oct 2011 11:12:22 +0000 (11:12 +0000)]
common: fix missing function pointer relocation in fixup_cmdtable()

In commit fa28bd2eef588ec2048ccafedb2b384d5a355858 patch v1 was applied
instead of v2. This is an incremental patch to update that commit
to version 2.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
12 years agonet: emaclite: Move RX/TX ping pong initialization to
Michal Simek [Wed, 12 Oct 2011 23:23:22 +0000 (23:23 +0000)]
net: emaclite: Move RX/TX ping pong initialization to

Init RX/TX ping pong directly from board not in the driver.

Signed-off-by: Michal Simek <monstr@monstr.eu>
12 years agonet: emaclite: Use unsigned long for baseaddr
Michal Simek [Wed, 12 Oct 2011 23:23:21 +0000 (23:23 +0000)]
net: emaclite: Use unsigned long for baseaddr

Baseaddr should be unsigned long.

Signed-off-by: Michal Simek <monstr@monstr.eu>
12 years agoarm, post, memory: fix bug if sdram base != 0x00000000
Heiko Schocher [Thu, 6 Oct 2011 20:40:00 +0000 (20:40 +0000)]
arm, post, memory: fix bug if sdram base != 0x00000000

commit 8d3fcb5e60b6c8e1d530dbc2e2e33ec6a44670da breaks post
memory support for sdram base != 0x00000000. Fix this.

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
Cc: Holger Brunck <holger.brunck@keymile.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agospi/eon: add support for new EON spi flash EN25Q32B
Shaohui Xie [Tue, 27 Sep 2011 01:21:34 +0000 (01:21 +0000)]
spi/eon: add support for new EON spi flash EN25Q32B

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
12 years agocache: include asm/cache.h for ARCH_DMA_MINALIGN definition
Anton Staaf [Mon, 17 Oct 2011 23:46:13 +0000 (16:46 -0700)]
cache: include asm/cache.h for ARCH_DMA_MINALIGN definition

ARCH_DMA_MINALIGN will be used to allocate DMA buffers that are
aligned correctly.  In all current cases this means that the DMA
buffer will be aligned to at least the L1 data cache line size of
the configured architecture.  If the board configuration file
does not specify the architecture L1 data cache line size then the
maximum line size of the architecture is used to align DMA buffers.

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Ilya Yanok <yanok@emcraft.com>
Cc: Laurence Withers <lwithers@guralp.com>
12 years agox86: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment
Anton Staaf [Mon, 17 Oct 2011 23:46:12 +0000 (16:46 -0700)]
x86: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Graeme Russ <graeme.russ@gmail.com>
12 years agomips: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment
Anton Staaf [Mon, 17 Oct 2011 23:46:11 +0000 (16:46 -0700)]
mips: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Shinya Kuribayashi <skuribay@pobox.com>
12 years agomicroblaze: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment
Anton Staaf [Mon, 17 Oct 2011 23:46:10 +0000 (16:46 -0700)]
microblaze: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Michal Simek <monstr@monstr.eu>
12 years agoavr32: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment
Anton Staaf [Mon, 17 Oct 2011 23:46:09 +0000 (16:46 -0700)]
avr32: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Reinhard Meyer <u-boot@emk-elektronik.de>
12 years agosparc: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment
Anton Staaf [Mon, 17 Oct 2011 23:46:08 +0000 (16:46 -0700)]
sparc: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Daniel Hellstrom <daniel@gaisler.com>
12 years agosh: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment
Anton Staaf [Mon, 17 Oct 2011 23:46:07 +0000 (16:46 -0700)]
sh: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agopowerpc: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment
Anton Staaf [Mon, 17 Oct 2011 23:46:06 +0000 (16:46 -0700)]
powerpc: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Acked-by: Stefan Roese <sr@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
12 years agonios2: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment
Anton Staaf [Mon, 17 Oct 2011 23:46:05 +0000 (16:46 -0700)]
nios2: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Scott McNutt <smcnutt@psyent.com>
12 years agom68k: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment
Anton Staaf [Mon, 17 Oct 2011 23:46:04 +0000 (16:46 -0700)]
m68k: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Jason Jin <jason.jin@freescale.com>
12 years agoarm: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment
Anton Staaf [Mon, 17 Oct 2011 23:46:03 +0000 (16:46 -0700)]
arm: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
12 years agoNS16550: trivial code clean for checkpatch
Simon Glass [Sat, 15 Oct 2011 19:14:09 +0000 (19:14 +0000)]
NS16550: trivial code clean for checkpatch

This removes most checkpatch warnings from the ns16550 driver and its
header.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoMPC85xx: remove broken "mpq101" board
Wolfgang Denk [Sun, 23 Oct 2011 15:00:47 +0000 (17:00 +0200)]
MPC85xx: remove broken "mpq101" board

The board stopped building some time ago, and the board maintainer
agrtees to drop it - see
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/112674

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Alex Dubov <oakad@yahoo.com>
Cc: Andy Fleming <afleming@gmail.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
12 years agoserial: uartlite: Fix compilation warnings
Michal Simek [Tue, 18 Oct 2011 00:22:10 +0000 (00:22 +0000)]
serial: uartlite: Fix compilation warnings

Do not setup userial_ports array as const because
in uartlite_serial_putc is out_be32 which can't write
to tx_fifo if is const.

Warning log:
serial_xuartlite.c: In function 'uartlite_serial_putc':
serial_xuartlite.c:60: warning: initialization discards qualifiers from pointer target type
serial_xuartlite.c: In function 'uartlite_serial_getc':
serial_xuartlite.c:78: warning: initialization discards qualifiers from pointer target type
serial_xuartlite.c: In function 'uartlite_serial_tstc':
serial_xuartlite.c:87: warning: initialization discards qualifiers from pointer target type

Signed-off-by: Michal Simek <monstr@monstr.eu>
12 years agohwmon: Provide dtt_init()
Dirk Eibach [Thu, 13 Oct 2011 23:23:12 +0000 (23:23 +0000)]
hwmon: Provide dtt_init()

Our boards rely on dtt for initialization of fan hardware.
dtt_init() was implemented to be called form board specific code.

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Acked-by: Heiko Schocher <hs@denx.de>
Tested-by: Heiko Schocher <hs@denx.de>
12 years agocommon: cosmetic: CONFIG_BOOTFILE checkpatch compliance
Joe Hershberger [Thu, 13 Oct 2011 13:03:48 +0000 (13:03 +0000)]
common: cosmetic: CONFIG_BOOTFILE checkpatch compliance

Remove MK_STR from places that consume CONFIG_BOOTFILE to force all definitions to be string literals.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agocommon: cosmetic: CONFIG_ROOTPATH checkpatch compliance
Joe Hershberger [Thu, 13 Oct 2011 13:03:47 +0000 (13:03 +0000)]
common: cosmetic: CONFIG_ROOTPATH checkpatch compliance

Remove MK_STR from places that consume CONFIG_ROOTPATH to force all definitions to be string literals.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoautoconf.mk.dep: use target cflags, not host
Mike Frysinger [Wed, 12 Oct 2011 19:48:00 +0000 (19:48 +0000)]
autoconf.mk.dep: use target cflags, not host

The current autoconf.mk.dep rule uses the host cflags when executing the
target compiler (which includes target header files).  We don't want to
mix the target compiler and host compiler flags, so change it to CFLAGS.
Otherwise we get things like -pedantic which the U-Boot source code does
not build with.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agobuild: force migration away from $(AR)
Mike Frysinger [Wed, 12 Oct 2011 19:25:20 +0000 (19:25 +0000)]
build: force migration away from $(AR)

People keep adding new code that still uses $(AR) instead of
$(cmd_link_o_target), so turn it into a build time error.

We still use $(AR) locally, but we don't use $(ARFLAGS).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agobuild: add missing $(AR)->$(cmd_link_o_target) update
Mike Frysinger [Tue, 18 Oct 2011 05:30:17 +0000 (05:30 +0000)]
build: add missing $(AR)->$(cmd_link_o_target) update

Seems people fixed their files to use libfoo.o, but didn't actually
update the creation targets to use $(cmd_link_o_target).  Update the
rest of the Makefile's found with grep.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Simon Glass <sjg@chromium.org>
12 years agoMakefile: Remove MLO on make clean
Joel A Fernandes [Wed, 12 Oct 2011 16:12:55 +0000 (16:12 +0000)]
Makefile: Remove MLO on make clean

SPL builds could leave an MLO which is an mkimage of type omapimage
Make sure its deleted on make clean/distclean

Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
12 years agoconsolidate mdelay by providing a common function for all users
Anatolij Gustschin [Wed, 12 Oct 2011 02:31:39 +0000 (02:31 +0000)]
consolidate mdelay by providing a common function for all users

There are several mdelay() definitions in the driver and
board code. Remove them all and provide a common mdelay()
in lib/time.c.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agocheckpatch whitespace cleanups
Stephen Warren [Tue, 18 Oct 2011 11:11:49 +0000 (11:11 +0000)]
checkpatch whitespace cleanups

This avoids the following checkpatch warning in later patches:

ERROR: "(foo*)" should be "(foo *)"
ERROR: space required before the open brace '{'
ERROR: space prohibited before that close parenthesis ')'
ERROR: spaces required around that '||' (ctx:WxV)
WARNING: space prohibited between function name and open parenthesis '('
WARNING: line over 80 characters

This fixes all the white-space warnings/errors in my subsequent patch,
and within this current patch. A number of other checkpatch warnings
and errors are still present in this patch itself, but are beyond simple
whitespace fixes, so are not solved by this patch.

v2: New patch

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
12 years agodrivers: add the support for Silicon Image SATA controller
Tang Yuantian [Fri, 7 Oct 2011 19:26:58 +0000 (19:26 +0000)]
drivers: add the support for Silicon Image SATA controller

Add the Silicon Image series PCI Express to
Serial ATA controller support, including Sil3132,
Sil3131 and Sil3124.
The SATA controller can be used to load kernel.

The features list:
- Supports 1-lane 2.5 Gbit/s PCI Express
- Supports one/two/four independent Serial ATA channels
- Supports Serial ATA Generation 2 transfer rate of 3.0 Gbit/s
- Supports LBA28 and LBA48

Signed-off-by: Tang Yuantian <b29983@freescale.com>
Signed-off-by: Aaron Williams <Aaron.Williams@cavium.com>
Tested-by: Lan Chunhe <b25806@freescale.com>
12 years agodoc/README: documents and readme for NDS32 arch
Macpaul Lin [Wed, 19 Oct 2011 20:41:11 +0000 (20:41 +0000)]
doc/README: documents and readme for NDS32 arch

Documents and READMEs for NDS32 architecture.
It patch also provides usage of SoC AG101 and board ADP-AG101.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agoadp-ag101: add board adp-ag101 support
Macpaul Lin [Wed, 19 Oct 2011 20:41:10 +0000 (20:41 +0000)]
adp-ag101: add board adp-ag101 support

Add evaluation board "adp-ag101" configuration file adp-ag101.h.
Add adp-ag101.c board config and related settings.
Add board adp-ag101 into boards.cfg

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agonds32: common bdinfo, bootm, image support
Macpaul Lin [Wed, 19 Oct 2011 20:41:09 +0000 (20:41 +0000)]
nds32: common bdinfo, bootm, image support

Add support of NDS32 to common commands bdinfo, bootm, and image format.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agonds32: standalone support
Macpaul Lin [Tue, 11 Oct 2011 22:33:20 +0000 (22:33 +0000)]
nds32: standalone support

Add standalone program related support for nds32 architecture.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agonds32/lib: add generic funcs in NDS32 lib
Macpaul Lin [Tue, 11 Oct 2011 22:33:19 +0000 (22:33 +0000)]
nds32/lib: add generic funcs in NDS32 lib

Add Makefile, board.c, interrupts.c and bootm.c functions
to nds32 architecture.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agonds32/ag101: cpu and init funcs of SoC ag101
Macpaul Lin [Tue, 11 Oct 2011 22:33:18 +0000 (22:33 +0000)]
nds32/ag101: cpu and init funcs of SoC ag101

SoC ag101 is the first chip using NDS32 N1213 cpu core.
Add header file of device offset support for SoC ag101.
Add main function of SoC ag101 based on NDS32 n1213 core.
Add lowlevel_init.S and other periphal related code.

This version of lowlevel_init.S also replace hardcode value
by MARCO defines from the GPL version andesboot for better
code quality.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agonds32/core N1213: NDS32 N12 core family N1213
Macpaul Lin [Wed, 19 Oct 2011 20:41:05 +0000 (20:41 +0000)]
nds32/core N1213: NDS32 N12 core family N1213

Add N1213 cpu core (N12 Core family) support for NDS32 arch.
This patch includes start.S for the initialize procedure of N1213.

Start procedure:
 start.S will start up the N1213 CPU core at first,
 then jump to SoC dependent "lowlevel_init.S" and
 "watchdog.S" to configure peripheral devices.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
Signed-off-by: Greentime Hu <greentime@andestech.com>
12 years agonds32: add NDS32 support into common header file
Macpaul Lin [Wed, 19 Oct 2011 20:41:04 +0000 (20:41 +0000)]
nds32: add NDS32 support into common header file

Add NDS32 support into common header file.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agonds32: add header files support for nds32
Macpaul Lin [Tue, 11 Oct 2011 22:33:15 +0000 (22:33 +0000)]
nds32: add header files support for nds32

Add generic header files support for nds32 architecture.
Cache, ptregs, data type and other definitions are included.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agocmd_bdinfo: replace print_str() with print_mhz()
Timur Tabi [Wed, 5 Oct 2011 22:08:07 +0000 (17:08 -0500)]
cmd_bdinfo: replace print_str() with print_mhz()

The print_str() helper function for cmd_bdinfo can print any string, but it
is only used to print MHz values.  Replace it with print_mhz() that takes
a number and converts it to a string internally.

Signed-off-by: Timur Tabi <timur@freescale.com>
12 years agogpio: Add PCA9698 40-bit I2C I/O port
Dirk Eibach [Mon, 3 Oct 2011 23:13:51 +0000 (23:13 +0000)]
gpio: Add PCA9698 40-bit I2C I/O port

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
12 years agoserial: pl01x: drain PL01x FIFO before baudrate change
Linus Walleij [Sun, 2 Oct 2011 11:52:52 +0000 (11:52 +0000)]
serial: pl01x: drain PL01x FIFO before baudrate change

Not draining the FIFO and waiting for the UART to be non-busy
before changing baudrate results in crap characters on the
console, so let's wait for the FIFO to drain and the last
character to be clocked out before we do that.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
12 years agoexamples: api: allow build with private libgcc
Che-liang Chiou [Mon, 17 Oct 2011 21:04:15 +0000 (21:04 +0000)]
examples: api: allow build with private libgcc

The examples/api is not configured with USE_PRIVATE_LIBGCC.  This makes
building examples/api break on certain boards that do not/cannot use the
public libgcc.

Nevertheless, this patch has to also touch the top-level Makefile to fix
this problem because the current top-level Makefile does not specify
libgcc as a prerequisite of examples/api, and explicitly builds
examples/api _before_ libgcc.

For testing this patch, I added the following to configs/seaboard.h and
ran demo.bin on a Seaboard.

+#define CONFIG_API
+#define CONFIG_SYS_MMC_MAX_DEVICE 2
+#define CONFIG_CMD_NET
+#define CONFIG_NET_MULTI

Signed-off-by: Che-Liang Chiou <clchiou@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agonet: dc2114x: check for apropriate command
Linus Walleij [Sun, 25 Sep 2011 21:41:14 +0000 (21:41 +0000)]
net: dc2114x: check for apropriate command

The code had two paths depending on whether the card was to be
accessed from plain memory or the IO region. However the error
path checks whether IO region was obtained - twice. Fix up the
error path according to the probable intention.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
12 years agokm/common: enable "env default" for all keymile boards
Gerlando Falauto [Thu, 22 Sep 2011 05:06:12 +0000 (05:06 +0000)]
km/common: enable "env default" for all keymile boards

Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
12 years agoftgmac100: reset fix when supports wake on lan
Macpaul Lin [Tue, 20 Sep 2011 19:54:32 +0000 (19:54 +0000)]
ftgmac100: reset fix when supports wake on lan

This patch move the reset function from initialization to
driver register procedure.

Some embedded system supports wake on lan nowadays. On this kind of system,
the ftgmac100 will be still supplied power after the system has been
shut-down by Linux. Hence the register used by linux won't be clear
when the system has been powered-off.

The origin ftgmac100 driver in u-boot will only register
driver and functions to network stack and won't reset the ftgmac100
hardware if the network won't be used during boot-up.
This will lead ftgmac100 continue receiving packets and then might corrupt
linux kernel when booting up.

So we reorder the hardware reset function earlier to force the hardware
to be reset whether it will be used or not.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agokm/common: remove obsolete header file
Holger Brunck [Tue, 13 Sep 2011 23:06:12 +0000 (23:06 +0000)]
km/common: remove obsolete header file

This header is unneeded due to code which was removed in the
past.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Wolfgang Denk <wd@denx.de>

12 years agokm/common: fix ramfs development target
Andreas Huber [Tue, 13 Sep 2011 23:06:11 +0000 (23:06 +0000)]
km/common: fix ramfs development target

Calucations of PRAM needs to take into account the 'rootfssize'.
Memory available to the linux kernel 'mem=' is in all cases set to the total
memory size minus the pram size.

Signed-off-by: Andreas Huber <andreas.huber@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Wolfgang Denk <wd@denx.de>

12 years agokm/common: force set ethaddr only for KM kirkwood boards
Holger Brunck [Tue, 13 Sep 2011 23:06:10 +0000 (23:06 +0000)]
km/common: force set ethaddr only for KM kirkwood boards

This prevents u-boot to print out "Can't overwrite "ethaddr""
each time a powerpc board starts.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Wolfgang Denk <wd@denx.de>

12 years agofix compile warning for env tools
Luka Perkov [Mon, 5 Sep 2011 21:40:13 +0000 (23:40 +0200)]
fix compile warning for env tools

Patch fixes this issue:

fw_env.c: In function ‘fw_setenv’:
fw_env.c:492:5: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 3 has type ‘size_t’ [-Wformat]
fw_env.c: In function ‘flash_write_buf’:
fw_env.c:806:6: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 3 has type ‘size_t’ [-Wformat]

Signed-off-by: Luka Perkov <lists@lukaperkov.net>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agokm_arm: enable POST for these boards
Valentin Longchamp [Fri, 2 Sep 2011 04:59:10 +0000 (04:59 +0000)]
km_arm: enable POST for these boards

The current km_arm boards have a Power-On test jumper. When this
jumper is set, this triggers some Power-On tests on the board.

This patch enables the support of this jumper for starting the
memory_regions test when the jumper is set.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
12 years agoremoved static from images in cmd_bootm.c
Simon Schwarz [Fri, 2 Sep 2011 00:50:31 +0000 (00:50 +0000)]
removed static from images in cmd_bootm.c

This removes static modifier from images variable in cmd_bootm.c.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Fri, 21 Oct 2011 21:48:46 +0000 (23:48 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  mpc85xx: Add inline GPIO acessor functions
  powerpc/85xx: wait for alignment before resetting SERDES RX lanes (SERDES9)
  powerpc/85xx: Fix P2020DS booting
  powerpc/85xx: Update USB device tree status based on pin settings
  fdt: Add new fdt_set_node_status & fdt_set_status_by_alias helpers
  powerpc/85xx: Add support for RMan LIODN initialization
  powerpc/85xx: Update device tree handling for SRIO
  powerpc/85xx: Update setting of SRIO LIODNs
  fm: Don't allow disabling of FM1-DTSEC1
  fm-eth: Don't mark the MAC we use for MDIO as disabled in device tree

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-coldfire
Wolfgang Denk [Fri, 21 Oct 2011 21:36:40 +0000 (23:36 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-coldfire

* 'master' of git://git.denx.de/u-boot-coldfire:
  ColdFire: Clean Makefile _config rules
  ColdFire: Move boards with simple _config rules to boards.cfg
  ColdFire: Fix compilation with CONFIG_SYS_DRAMSZ1 defined
  ColdFire: Merge differentiated linking files into a sigle one by board
  ColdFire: Add $(obj) before cpu lib to correct build
  ColdFire: Cleanup lds files for multiple defined symbols

12 years agoMerge branch 'master' of /home/wd/git/u-boot/master
Wolfgang Denk [Fri, 21 Oct 2011 21:35:12 +0000 (23:35 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master

* 'master' of /home/wd/git/u-boot/master:
  cosmetic: Fixup fixup_silent_linux() for checkpatch
  Correct dependency rule to fix SPL build
  Move timestamp and version files into 'generated' subdir
  sandbox: Makefile changes to build sandbox architecture
  Add generic gpio.h in asm-generic
  Adjust dependency rules to permit per-file flags
  sandbox: Use uintptr_t for 32/64-bit compatibility
  sandbox: Add basic config file
  sandbox: Add serial uart
  sandbox: Add main program
  sandbox: Add OS dependent layer
  sandbox: Force command sections to be 4-byte aligned
  sandbox: Disable standalone/API support
  sandbox: Disable built-in malloc
  sandbox: Add bootm support
  sandbox: Add board info for architecture
  sandbox: Add sandbox board
  sandbox: Add architecture lib files
  sandbox: Add cpu files
  sandbox: Add compiler defines to support a 64-bit x86_64 platform
  sandbox: Add architecture image support
  Fix use of int as pointer in image.c
  sandbox: Add architecture header files
  arm: ca9x4_ct_vxp: enable PXE BOOTP options support
  arm: ca9x4_ct_vxp: enable pxe command support
  Convert ca9x4_ct_vxp to standard env variables
  net: bootp: add PXE/RFC 4578 DHCP options support
  Add pxe command
  lib: add uuid_str_to_bin for use with bootp and PXE uuid
  README: document standard image variables
  Replace space and tab checks with isblank
  cosmetic: remove unneeded curly braces
  Add isblank
  common: add run_command2 for running simple or hush commands
  common, menu: use abortboot for menu timeout
  Add generic, reusable menu code
  DM9000:Add a byte swap macro for dm9000 io operation.
  kw_gpio: fix error in kw_gpio_direction_input
  Blackfin: bfin_spi: fix build error when DEBUG is defined
  Blackfin: define CONFIG_SYS_CACHELINE_SIZE
  video: Moving mx3fb.c to CONFIG_VIDEO
  mx31: make HSP clock for mx3fb driver available
  MX5: Make IPU display output and pixel format configurable
  VIDEO: MX5: export pix format
  VIDEO: MX5: Switch MX5 to CONFIG_VIDEO
  video: update the Freescale DIU driver to use linux/fb.h
  powerpc: cpm2 boards: update fcc register logic