]> git.dujemihanovic.xyz Git - u-boot.git/log
u-boot.git
13 years agoserial: implement common uart post test
Mike Frysinger [Sat, 14 May 2011 06:56:15 +0000 (06:56 +0000)]
serial: implement common uart post test

The current arch/driver specific UART posts basically boil down to setting
the UART to loop back mode, then reading and writing data.  If we ignore
the loop back part, the rest can be built upon the existing common serial
API.  So let's do just that.

First add a call back for serial drivers to implement loop back control.
Then write a post test that walks all of the serial drivers, puts them
into loop back mode, and verifies that reading/writing at all the diff
baud rates is OK.

If a serial driver doesn't support loop back mode (either it can't or
it hasn't done so yet), then skip it.  This should allow for people to
easily migrate to the new post test with existing serial drivers.

I haven't touched the few already existing uart post tests as I don't
the hardware or knowledge of converting them over.  So I've marked the
new test as weak which will allow the existing tests to override the
default until they are converted.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoserial: drop useless ctlr field
Mike Frysinger [Fri, 29 Apr 2011 18:03:31 +0000 (18:03 +0000)]
serial: drop useless ctlr field

The multi serial support has a "ctlr" field which almost no one uses,
but everyone is forced to set to useless strings.  So punt it.

Funny enough, the only code that actually reads this field (the mpc8xx
driver) has a typo where it meant to look for the SCC driver.  Fix it
while converting the check to use the name field.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Heiko Schocher <hs@denx.de>
CC: Anatolij Gustschin <agust@denx.de>
CC: Tom Rix <Tom.Rix@windriver.com>
CC: Minkyu Kang <mk7.kang@samsung.com>
CC: Craig Nauman <cnauman@diagraph.com>
CC: Marek Vasut <marek.vasut@gmail.com>
CC: Prafulla Wadaskar <prafulla@marvell.com>
CC: Mahavir Jain <mjain@marvell.com>
13 years agoserial: drop serial_register return value
Mike Frysinger [Fri, 29 Apr 2011 18:03:30 +0000 (18:03 +0000)]
serial: drop serial_register return value

The serial_register function never fails (always return 0), so change it
to a void function to avoid wasting overhead on it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoserial: push default_serial_console to drivers
Mike Frysinger [Fri, 29 Apr 2011 18:03:29 +0000 (18:03 +0000)]
serial: push default_serial_console to drivers

Rather than sticking arch/board/driver specific logic in the common
serial code, push it all out to the respective drivers.  The serial
drivers declare these funcs weak so that boards can still override
things with their own definition.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Heiko Schocher <hs@denx.de>
CC: Anatolij Gustschin <agust@denx.de>
CC: Tom Rix <Tom.Rix@windriver.com>
CC: Minkyu Kang <mk7.kang@samsung.com>
CC: Craig Nauman <cnauman@diagraph.com>
CC: Prafulla Wadaskar <prafulla@marvell.com>
CC: Mahavir Jain <mjain@marvell.com>
Tested-by: Minkyu Kang <mk7.kang@samsung.com>
13 years agodisable security warning flags when possible
Mike Frysinger [Mon, 25 Apr 2011 08:06:40 +0000 (08:06 +0000)]
disable security warning flags when possible

Some toolchains enable security warning flags by default, but these don't
really make sense in the u-boot world.  Such as forcing changes like:
-printf(foo);
+printf("%s", foo);

So disable the flags when the compiler supports them.  Linux has already
merged a similar change in their build system.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agocmd_usage: constify
Mike Frysinger [Sat, 23 Apr 2011 23:43:24 +0000 (23:43 +0000)]
cmd_usage: constify

The usage helper doesn't modify the command, so constify its input arg.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoconstify default env
Mike Frysinger [Sat, 23 Apr 2011 23:43:21 +0000 (23:43 +0000)]
constify default env

I can't see any obvious needs for the default environment to be writable,
so make it const.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoenv: allow people to force envcrc building
Mike Frysinger [Fri, 8 Jul 2011 10:44:25 +0000 (10:44 +0000)]
env: allow people to force envcrc building

For people who want to manually extract the embedded environment so that
it can be manually packed into the final u-boot image, add a config opt
to force building of the envcrc tool.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agosf: sst: support newer standardized flashes
Mike Frysinger [Mon, 25 Apr 2011 06:59:54 +0000 (06:59 +0000)]
sf: sst: support newer standardized flashes

Newer SST flashes have dropped the Auto Address Increment (AAI) word
programming (WP) modes in favor of the standard page programming mode
that most flashes now support.  So add a flags field to the different
flashes to support both modes with new and old styles.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agosf: unify write disable commands
Mike Frysinger [Mon, 25 Apr 2011 06:59:53 +0000 (06:59 +0000)]
sf: unify write disable commands

Every spi flash uses the same write disable command, so unify this in
the common code.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Fixed commit message.
Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agosf: eon/stmicro: inline useless ID defines
Mike Frysinger [Sat, 23 Apr 2011 23:05:58 +0000 (23:05 +0000)]
sf: eon/stmicro: inline useless ID defines

These defines are used in only one place, so just inline them.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agosf: kill off now-unused local state
Mike Frysinger [Tue, 28 Jun 2011 07:38:10 +0000 (07:38 +0000)]
sf: kill off now-unused local state

Now that the common spi_flash structure tracks all the info that these
drivers need, kill off their local state indirection and use just what
the common code provides.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agosf: unify write funcs
Mike Frysinger [Mon, 25 Apr 2011 06:58:29 +0000 (06:58 +0000)]
sf: unify write funcs

Once we add a new page_size field for write lengths, we can unify the
write methods for most of the spi flash drivers.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agosf: unify write enable commands
Mike Frysinger [Sat, 23 Apr 2011 23:05:55 +0000 (23:05 +0000)]
sf: unify write enable commands

Every spi flash uses the same write enable command, so unify this in
the common code.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoMAKEALL: add -h/--help options
Mike Frysinger [Thu, 21 Apr 2011 22:01:43 +0000 (22:01 +0000)]
MAKEALL: add -h/--help options

Convert all the comments at the top of the file into help text for people
to easily get at with standard -h/--help options.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Detlev Zundel <dzu@denx.de>
13 years agoTimer: Remove reset_timer_masked()
Graeme Russ [Fri, 15 Jul 2011 02:21:14 +0000 (02:21 +0000)]
Timer: Remove reset_timer_masked()

In some circumstances, reset_timer_masked() was called be timer_init() in
order to perform architecture specific timer initialisation. In such
cases, the required code in reset_timer_masked() has been moved into
timer_init()

13 years agoTimer: Fix at91rm9200/spi.c timer usage
Graeme Russ [Fri, 15 Jul 2011 02:20:40 +0000 (02:20 +0000)]
Timer: Fix at91rm9200/spi.c timer usage

13 years agoTimer: Remove reset_timer() for non-Nios2 arches
Graeme Russ [Fri, 15 Jul 2011 02:19:44 +0000 (02:19 +0000)]
Timer: Remove reset_timer() for non-Nios2 arches

13 years agoTimer: Allow reset_timer() only for systems with low resolution timers
Graeme Russ [Fri, 15 Jul 2011 02:18:56 +0000 (02:18 +0000)]
Timer: Allow reset_timer() only for systems with low resolution timers

13 years agoTimer: Remove set_timer completely
Graeme Russ [Fri, 15 Jul 2011 02:18:12 +0000 (02:18 +0000)]
Timer: Remove set_timer completely

13 years agoRemove calls to set_timer outside arch/
Graeme Russ [Tue, 28 Jun 2011 01:40:55 +0000 (01:40 +0000)]
Remove calls to set_timer outside arch/

There is no need to use set_timer(). Replace with appropriate use of
get_timer()

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Acked-by: Wolfgang Denk <wd@denx.de>
13 years agospl: add support for omap-common libraries
Daniel Schwierzeck [Wed, 13 Jul 2011 05:11:09 +0000 (05:11 +0000)]
spl: add support for omap-common libraries

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
13 years agospl: Add support for common libraries and drivers
Daniel Schwierzeck [Wed, 13 Jul 2011 05:11:08 +0000 (05:11 +0000)]
spl: Add support for common libraries and drivers

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
13 years agoreplace CONFIG_PRELOADER with CONFIG_SPL_BUILD
Aneesh V [Wed, 13 Jul 2011 05:11:07 +0000 (05:11 +0000)]
replace CONFIG_PRELOADER with CONFIG_SPL_BUILD

replace all occurences of CONFIG_PRELOADER with CONFIG_SPL_BUILD

Signed-off-by: Aneesh V <aneesh@ti.com>
13 years agoscaled down version of generic libraries for SPL
Aneesh V [Wed, 13 Jul 2011 05:11:06 +0000 (05:11 +0000)]
scaled down version of generic libraries for SPL

Signed-off-by: Aneesh V <aneesh@ti.com>
13 years agoarm: adjust PLATFORM_LIBS for SPL
Aneesh V [Tue, 19 Jul 2011 05:51:41 +0000 (05:51 +0000)]
arm: adjust PLATFORM_LIBS for SPL

Signed-off-by: Aneesh V <aneesh@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
13 years agoHook SPL build-system into toplevel Makefile
Daniel Schwierzeck [Wed, 13 Jul 2011 05:11:04 +0000 (05:11 +0000)]
Hook SPL build-system into toplevel Makefile

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
13 years agoExtend build-system for SPL framework
Daniel Schwierzeck [Mon, 18 Jul 2011 06:09:15 +0000 (06:09 +0000)]
Extend build-system for SPL framework

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
13 years agospl: add initial support for a generic SPL framework
Daniel Schwierzeck [Mon, 18 Jul 2011 07:48:07 +0000 (07:48 +0000)]
spl: add initial support for a generic SPL framework

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
13 years agoUse ALL-y style instead of ifeq blocks for better readability
Daniel Schwierzeck [Wed, 13 Jul 2011 05:11:01 +0000 (05:11 +0000)]
Use ALL-y style instead of ifeq blocks for better readability

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
13 years agoFix: watchdog timed out, if using md5 command
Jens Scharsig [Mon, 18 Jul 2011 12:39:11 +0000 (14:39 +0200)]
Fix: watchdog timed out, if using md5 command

* Fix: if using md5 command watchdog timed out
* change function call md5(..) to the watchdog-safe variant
  md5_wd(..) to support watchdog reset

Signed-off-by: Jens Scharsig <esw@bus-elektronik.de>
13 years agoFix: watchdog timed out, if using sha1 command
Jens Scharsig [Mon, 18 Jul 2011 12:39:07 +0000 (14:39 +0200)]
Fix: watchdog timed out, if using sha1 command

* Fix: if using sha1 command watchdog timed out
* change function call sha1_csum(..) to the watchdog-safe variant
  sha1_csum_wd(..) to support watchdog reset

Signed-off-by: Jens Scharsig <esw@bus-elektronik.de>
13 years agocommand/cmd_cache.c: Add optional flush arguments
Matthew McClintock [Tue, 24 May 2011 10:09:05 +0000 (10:09 +0000)]
command/cmd_cache.c: Add optional flush arguments

It might be desirable to have the ability to flush icache/dcache
within u-boot, this patch gives each arch the ability to provide
a flush_dcache/flush_icache function to let u-boot flush caches
from the prompt

Signed-off-by: Matthew McClintock <msm@freescale.com>
13 years agocommon/cmd_ximg.c: add ifdef protection for gzip uncompression
Matthew McClintock [Tue, 24 May 2011 05:48:26 +0000 (05:48 +0000)]
common/cmd_ximg.c: add ifdef protection for gzip uncompression

Print a message if we do not have the ability to uncompress a gzip
image. Before, u-boot would just assume the routines were available

Signed-off-by: Matthew McClintock <msm@freescale.com>
13 years agodisk/part.c: Make features optional
Matthew McClintock [Tue, 24 May 2011 05:31:19 +0000 (05:31 +0000)]
disk/part.c: Make features optional

If we don't want to build support for any partition types we can now
add #undef CONFIG_PARTITIONS in a board config file to keep this from
being compiled in. Otherwise boards assume this is compiled in by
default

Signed-off-by: Matthew McClintock <msm@freescale.com>
13 years agomiiphy: use strncpy() not sprintf()
Laurence Withers [Thu, 14 Jul 2011 23:21:45 +0000 (23:21 +0000)]
miiphy: use strncpy() not sprintf()

In miiphy_register() the new device's name was initialised by passing a
string parameter as the format string to sprintf(). As this would cause
problems if it ever contained a '%' symbol, switch to using strncpy()
instead.

Signed-off-by: Laurence Withers <lwithers@guralp.com>
Cc: Andy Fleming <afleming@freescale.com>
13 years agopowerpc: Fix device tree padding associated with ramdisk
Kumar Gala [Wed, 6 Jul 2011 15:16:28 +0000 (15:16 +0000)]
powerpc: Fix device tree padding associated with ramdisk

When booting with a ramdisk we bump the amount of memory reserved for
the device tree by FDT_RAMDISK_OVERHEAD.  However we did not increase
the actual size in the device tree blob to match.

Its possible on boundary cases that we dont have enough memory according
to the device tree blob and get errors like:

WARNING: could not set linux,initrd-end FDT_ERR_NOSPACE

We can easily fix this by setting the device tree size at the same time
we bump the amount of memory reserved for the device tree.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
13 years agoRevert "post, memory test: add memory_post_test() to include file"
Wolfgang Denk [Tue, 26 Jul 2011 11:53:35 +0000 (13:53 +0200)]
Revert "post, memory test: add memory_post_test() to include file"

This reverts commit f18714dd61331b48ab9dc0ef717d61f1441a0e17
which cuases compile errors on a number of boards.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoFix: if using crc32 command watchdog timed out
Jens Scharsig [Mon, 18 Jul 2011 06:46:26 +0000 (08:46 +0200)]
Fix: if using crc32 command watchdog timed out

* Fix: if using crc32 command watchdog timed out
* change function call crc32(..) to the watchdog-safe variant
  crc_32_wd(..) to support watchdog reset

Signed-off-by: Jens Scharsig <esw@bus-elektronik.de>
13 years agomemcpy/memmove: Do not copy to same address
Matthias Weisser [Sun, 22 May 2011 23:03:55 +0000 (23:03 +0000)]
memcpy/memmove: Do not copy to same address

In some cases (e.g. bootm with a elf payload which is already at the right
position) there is a in place copy of data to the same address. Catching this
saves some ms while booting.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
13 years agoscsi/ahci: add support for non-PCI controllers
Rob Herring [Wed, 6 Jul 2011 16:13:36 +0000 (16:13 +0000)]
scsi/ahci: add support for non-PCI controllers

Add support for AHCI controllers that are not PCI based.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Wolfgang Denk <wd@denx.de>
13 years agoscsi/ahci: ata id little endian fix
Rob Herring [Wed, 1 Jun 2011 09:10:26 +0000 (09:10 +0000)]
scsi/ahci: ata id little endian fix

The ata id string always needs swapping, not just on BE machines.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
13 years agopost, memory test: add memory_post_test() to include file
Heiko Schocher [Tue, 31 May 2011 20:24:07 +0000 (20:24 +0000)]
post, memory test: add memory_post_test() to include file

This include is needed, if this memory test is used "outside"
from post code, for example booting with nand_spl, and using
this memory test before copying u-boot code to RAM and jumping
to it.

Signed-off-by: Heiko Schocher <hs@denx.de>
13 years agoandes_spi: add andes_spi interface
Macpaul Lin [Sun, 24 Apr 2011 22:01:38 +0000 (22:01 +0000)]
andes_spi: add andes_spi interface

andes_spi is an spi interface developed by Andes Tech.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
13 years agocosmetic, main: correct indentation/spacing issues
Jason Hobbs [Thu, 23 Jun 2011 08:27:30 +0000 (08:27 +0000)]
cosmetic, main: correct indentation/spacing issues

Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
13 years agocosmetic, main: clean up declarations of abortboot
Jason Hobbs [Wed, 29 Jun 2011 06:25:14 +0000 (06:25 +0000)]
cosmetic, main: clean up declarations of abortboot

Remove an unneeded prototype declaration from the top of main.c,
and use plain inline instead of __inline__ to please checkpatch.

Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
13 years agonet: designware: fix uninitialized phy_addr usage
Mike Frysinger [Thu, 2 Jun 2011 05:19:38 +0000 (05:19 +0000)]
net: designware: fix uninitialized phy_addr usage

When CONFIG_DW_SEARCH_PHY is disabled, the local phy_addr variable
never gets initialized which causes random behavior at runtime and a
gcc warning.  So set it by default to the stored phy address.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Reviewed-by: Vipin Kumar <vipin.kumar@st.com>
Fix commit message.
Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agonet: designware: fix unused warning when CONFIG_DW_AUTONEG is enabled
Mike Frysinger [Thu, 2 Jun 2011 05:19:37 +0000 (05:19 +0000)]
net: designware: fix unused warning when CONFIG_DW_AUTONEG is enabled

The ctrl variable is only used when autoneg support is disabled, so only
declare it under those conditions to avoid an unused variable warning.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Reviewed-by: Vipin Kumar <vipin.kumar@st.com>
13 years agoautostart: unify duplicated logic into the bootm code
Mike Frysinger [Sun, 5 Jun 2011 13:43:02 +0000 (13:43 +0000)]
autostart: unify duplicated logic into the bootm code

Rather than having a bunch of random commands handle autostart behavior,
unify the logic in a single place.  This also fixes building of these

different commands when bootm is disabled.

Acked-by: Matthew McClintock <msm@freescale.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoboard/tqm85xx: Create and tear down TLB for get_ram_size()
Becky Bruce [Mon, 18 Jul 2011 23:49:16 +0000 (18:49 -0500)]
board/tqm85xx: Create and tear down TLB for get_ram_size()

We need a TLB entry to call get_ram_size(); the common code doesn't create
one until *after* fixed_sdram() has determined the size.  So we set up tlbs
for the max possible size and tear them down once we're done with
get_ram_size(); the common 85xx code will then set up a final set of tlb
entries for the *actual* detected size of ddr.

This prevents us from having TLB entries that are larger than DDR sitting
around for very long, which is not a recommended scenario.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/mpc85xx: Add clear_ddr_tlbs function
Becky Bruce [Mon, 18 Jul 2011 23:49:15 +0000 (18:49 -0500)]
powerpc/mpc85xx: Add clear_ddr_tlbs function

This is useful when we just want to wipe out the TLBs.  There's currently
a function that resets the ddr tlbs to a different value; it is changed to
utilize this function.  The new function can be used in conjunction with
setup_ddr_tlbs() for a board to temporarily map/unmap the DDR address
range as needed.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agofman: insert the Fman firmware into the device tree
Timur Tabi [Tue, 3 May 2011 18:35:11 +0000 (13:35 -0500)]
fman: insert the Fman firmware into the device tree

The Fman device tree node binding allows for the entire Fman firmware binary
data to be embedded in the device tree.  This eliminates the need to have
NOR flash mapped to Linux just so that the Fman driver can see the firmware.

The location of the Fman firmware is taken from the 'fman_ucode' environment
variable.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: add support the ePAPR "phandle" property
Timur Tabi [Tue, 10 May 2011 20:28:14 +0000 (15:28 -0500)]
powerpc/85xx: add support the ePAPR "phandle" property

The ePAPR specification says that phandle properties should be called
"phandle", and not "linux,phandle".  To facilitate the migration from
"linux,phandle" to "phandle", we update fdt_qportal() to use the new
function, fdt_create_phandle().  This function abstracts the creation of
phandle properties.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-mmc
Wolfgang Denk [Tue, 19 Jul 2011 20:27:07 +0000 (22:27 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mmc

* 'master' of git://git.denx.de/u-boot-mmc:
  mmc: rescan fails on empty slot
  AT91:mmc:fix multiple read/write error
  mmc: Access mode validation for eMMC cards > 2 GiB
  mmc: sh_mmcif: add support for Renesas MMCIF
  mmc: fix the condition for MMC version 4
  MMC: add marvell sdhci driver
  MMC: add sdhci generic framework
  MMC: add erase function to both mmc and sd
  MMC: unify mmc read and write operation
  mmc: Tegra2: Enable SD/MMC driver for Seaboard and Harmony
  mmc: Tegra2: SD/MMC driver for Seaboard - eMMC on SDMMC4, SDIO on SDMMC3

13 years agoFix typo from 'mb_alloc' -> 'lmb_alloc'
Matthew McClintock [Mon, 18 Jul 2011 13:08:05 +0000 (13:08 +0000)]
Fix typo from 'mb_alloc' -> 'lmb_alloc'

Signed-off-by: Matthew McClintock <msm@freescale.com>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Mon, 18 Jul 2011 19:04:56 +0000 (21:04 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

* 'master' of git://git.denx.de/u-boot-arm:
  ARM: MX5: Fix broken leftover TO-2 errata workaround
  MX31: Cleanup clock function
  scb9328: Add ARM relocation support
  am3517evm: change console device from ttyS2 to ttyO2
  Remove volatile qualifier in get_ram_size() calls
  TI: TNETV107X Fix Build Error
  ARM: add missing CONFIG_SKIP_LOWLEVEL_INIT for armv7
  arm: add CONFIG_MACH_TYPE setting and documentation
  arm: add __ilog2 function
  Timer: Fix misuse of ARM *timer_masked() functions outside arch/arm
  EfikaMX: Enable EXT2 booting
  EfikaMX: Add missing CONFIG_SYS_TEXT_BASE
  EfikaMX: Use correct imximage.cfg
  MX27: Update to autogenerated asm-offsets.h
  MX5: Update to autogenerated asm-offsets.h
  imx: Add support for zmx25 board
  imx: Make imx25 compatible to mxc_gpio driver and fix in tx25
  imx: Add auto generation of asm-offsets.h for imx25
  imx: Add support for USB EHCI on imx25
  imx: Use correct imx25 reset.c
  imx: Add get_tbclk() function for imx25
  ARM: Update maintainer of board scb9328
  mx27: Make the UART port number explicit
  build: Add targets for auto gen of asm-offsets.h and use it in imx35
  mx31pdk: cosmetic: Fix line over 80 characters

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Mon, 18 Jul 2011 19:03:08 +0000 (21:03 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  powerpc/p2041rdb: Add p2041rdb board support
  powerpc/85xx: Fix detection of P1017E
  powerpc/mpc8548cds: Remove incorrect DDR_MSYNC_IN erratum define

13 years agoARM: MX5: Fix broken leftover TO-2 errata workaround
David Jander [Thu, 14 Jul 2011 03:58:57 +0000 (03:58 +0000)]
ARM: MX5: Fix broken leftover TO-2 errata workaround

This check was broken. r3 does not contain the silicon revision anymore, so
we need to reload it. Also, this errata only applies to i.MX51.

Signed-off-by: David Jander <david@protonic.nl>
Acked-by: Stefano Babic <sbabic@denx.de>
13 years agoMX31: Cleanup clock function
Stefano Babic [Wed, 13 Jul 2011 12:34:52 +0000 (14:34 +0200)]
MX31: Cleanup clock function

The patch provide the same API used with other i.MX
processors and get rid of mx31_ functions.

Signed-off-by: Stefano Babic <sbabic@denx.de>
13 years agoscb9328: Add ARM relocation support
Torsten Koschorrek [Thu, 14 Jul 2011 23:16:51 +0000 (23:16 +0000)]
scb9328: Add ARM relocation support

This patch fixes compiler errors due to missing definitions of
CONFIG_SYS_SDRAM_BASE and CONFIG_SYS_INIT_SP_ADDR.

It also does some cleanup: CONFIG_SYS_TEXT_BASE was moved to scb9328.h,
obsolete config.mk was removed. The scb9328 board has 1 DRAM bank, so don't
ask for more banks. CONFIG_NR_DRAM_BANKS will ever be 1.

Signed-off-by: Torsten Koschorrek <koschorrek@synertronixx.de>
13 years agoam3517evm: change console device from ttyS2 to ttyO2
Yegor Yefremov [Mon, 18 Jul 2011 08:37:35 +0000 (10:37 +0200)]
am3517evm: change console device from ttyS2 to ttyO2

the serial device names have been changed from ttySx to ttyOx, so the
console device name should be also changed to support the latest kernel
versions.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Vaibhav Hiremath<hvaibhav@ti.com>
13 years agopowerpc/p2041rdb: Add p2041rdb board support
Mingkai Hu [Thu, 7 Jul 2011 04:29:15 +0000 (12:29 +0800)]
powerpc/p2041rdb: Add p2041rdb board support

P2041RDB Specification:
-----------------------
Memory subsystem:
 * 4Gbyte unbuffered DDR3 SDRAM SO-DIMM(64bit bus)
 * 128 Mbyte NOR flash single-chip memory
 * 256 Kbit M24256 I2C EEPROM
 * 16 Mbyte SPI memory
 * SD connector to interface with the SD memory card

Ethernet:
 * dTSEC1: connected to the Vitesse SGMII PHY (VSC8221)
 * dTSEC2: connected to the Vitesse SGMII PHY (VSC8221)
 * dTSEC3: connected to the Vitesse SGMII PHY (VSC8221)
 * dTSEC4: connected to the Vitesse RGMII PHY (VSC8641)
 * dTSEC5: connected to the Vitesse RGMII PHY (VSC8641)

PCIe:
 * Lanes E, F, G and H of Bank1 are connected to one x4 PCIe SLOT1
 * Lanes C and Land D of Bank2 are connected to one x4 PCIe SLOT2

SATA: Lanes C and Land D of Bank2 are connected to two SATA connectors

USB 2.0: connected via a internal UTMI PHY to two TYPE-A interfaces

I2C:
 * I2C1: Real time clock, Temperature sensor, Memory module
 * I2C2: Vcore Regulator, 256Kbit I2C Bus EEPROM, PCIe slot1/2

UART: supports two UARTs up to 115200 bps for console

Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Fix detection of P1017E
Kumar Gala [Fri, 15 Jul 2011 15:11:44 +0000 (10:11 -0500)]
powerpc/85xx: Fix detection of P1017E

Had a typo such that P1017E would not be detected correctly.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoRemove volatile qualifier in get_ram_size() calls
Albert ARIBAUD [Sun, 3 Jul 2011 05:55:33 +0000 (05:55 +0000)]
Remove volatile qualifier in get_ram_size() calls

Checkpatch.pl complains about the volatile qualifier in calls to
get_ram_size(). Remove this qualifier in the prototype and in the
calls where it is useless, and leave it only in the function body
where it is needed.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
13 years agoTI: TNETV107X Fix Build Error
Chan-Taek Park [Thu, 23 Jun 2011 09:19:26 +0000 (09:19 +0000)]
TI: TNETV107X Fix Build Error

This patch provides SDRAM base address and initial stack address to fix
build errors.

Signed-off-by: Chan-Taek Park <c-park@ti.com>
13 years agoARM: add missing CONFIG_SKIP_LOWLEVEL_INIT for armv7
Rob Herring [Tue, 28 Jun 2011 05:39:38 +0000 (05:39 +0000)]
ARM: add missing CONFIG_SKIP_LOWLEVEL_INIT for armv7

cpu_init_crit can be skipped, but the code is still enabled requiring a
platform to supply lowlevel_init.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Albert ARIBAUD <albert.aribaud@free.fr>
13 years agoarm: add CONFIG_MACH_TYPE setting and documentation
Igor Grinberg [Thu, 14 Jul 2011 05:45:07 +0000 (05:45 +0000)]
arm: add CONFIG_MACH_TYPE setting and documentation

CONFIG_MACH_TYPE is used to set the machine type number in the
common arm code instead of setting it in the board code.
Boards with dynamically discoverable machine types can still set the
machine type number in the board code.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
13 years agoAdd uboot "fdt_high" enviroment variable
David A. Long [Sat, 9 Jul 2011 20:40:19 +0000 (16:40 -0400)]
Add uboot "fdt_high" enviroment variable

Add a new "fdt_high" enviroment variable. This can be used to control (or prevent) the
relocation of the flattened device tree on boot. It can be used to prevent relocation
of the fdt into highmem.  The variable behaves similarly to the existing "initrd_high"
variable.

Signed-off-by: David A. Long <dave.long@linaro.org>
13 years agoarm: add __ilog2 function
Rob Herring [Tue, 5 Jul 2011 04:38:51 +0000 (04:38 +0000)]
arm: add __ilog2 function

Add __ilog2 function for ARM. Needed for ahci.c

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Albert ARIBAUD <albert.aribaud@free.fr>
13 years agoTimer: Fix misuse of ARM *timer_masked() functions outside arch/arm
Graeme Russ [Fri, 15 Jul 2011 23:31:37 +0000 (23:31 +0000)]
Timer: Fix misuse of ARM *timer_masked() functions outside arch/arm

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
13 years agommc: rescan fails on empty slot
Michael Jones [Thu, 14 Jul 2011 23:09:43 +0000 (23:09 +0000)]
mmc: rescan fails on empty slot

Fail in 'mmc rescan' if mmc_init() returns error

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
Acked-by: Andy Fleming <afleming@freescale.com>
13 years agoAT91:mmc:fix multiple read/write error
elen.song [Tue, 12 Jul 2011 00:17:07 +0000 (00:17 +0000)]
AT91:mmc:fix multiple read/write error

According to datasheet,set block count before multiple read/write.

Signed-off-by: elen.song <elen.song@atmel.com>
Acked-by: Andy Fleming <afleming@freescale.com>
13 years agommc: Access mode validation for eMMC cards > 2 GiB
Łukasz Majewski [Tue, 5 Jul 2011 02:19:44 +0000 (02:19 +0000)]
mmc: Access mode validation for eMMC cards > 2 GiB

This patch provides handling of the two way handshake when SEND_OP_COND
(CMD1) is send to mmc card. It is necessary to inform eMMC card if the
host can work with high capacity cards (Jedec JESD84-A441, point 7.4.3).

The extra flag MMC_MODE_HC (high capacity) is added to indicate if the
host is capable of handling the high capacity eMMC cards.

Since this change is added to the generic mmc framework, then it requires
other boards to indicate if their mmc controllers can handle high capacity
cards. As it is now - the old behaviour of the framework is preserved.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
13 years agommc: sh_mmcif: add support for Renesas MMCIF
Yoshihiro Shimoda [Mon, 4 Jul 2011 22:21:22 +0000 (22:21 +0000)]
mmc: sh_mmcif: add support for Renesas MMCIF

Some Renesas SuperH have MMCIF module. This driver supports it.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Andy Fleming <afleming@freescale.com>
13 years agommc: fix the condition for MMC version 4
Yoshihiro Shimoda [Mon, 4 Jul 2011 22:13:26 +0000 (22:13 +0000)]
mmc: fix the condition for MMC version 4

Fix the problem that if we use the chip of MMC version 4 and
the capacity is smaller than 2GB or equal, the mmc->capacity is
invalid. According to the JEDEC Standard, the value of ext_csd's
capacity is valid if the value is more than 2GB.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Andy Fleming <afleming@freescale.com>
13 years agoMMC: add marvell sdhci driver
Lei Wen [Tue, 28 Jun 2011 21:50:07 +0000 (21:50 +0000)]
MMC: add marvell sdhci driver

This could support both armada100 and pantheon serial in the mainline,
while this driver also be tested to support upcoming mg, mmp2 and mmp3
hardware.

Signed-off-by: Lei Wen <leiwen@marvell.com>
Acked-by: Andy Fleming <afleming@freescale.com>
13 years agoMMC: add sdhci generic framework
Lei Wen [Tue, 28 Jun 2011 21:50:06 +0000 (21:50 +0000)]
MMC: add sdhci generic framework

Nowdays, there are plenty of mmc driver in uboot adopt the sd standard
host design, aka as sdhci. It is better to centralize the common logic
together to better maintenance.

Signed-off-by: Lei Wen <leiwen@marvell.com>
Acked-by: Andy Fleming <afleming@freescale.com>
13 years agoMMC: add erase function to both mmc and sd
Lei Wen [Wed, 22 Jun 2011 17:03:31 +0000 (17:03 +0000)]
MMC: add erase function to both mmc and sd

Erase is a very basic function since the begin of sd specification is
announced. Although we could write a bulk of full 0xff memory to the
range to take place of erase, it is more convenient and safe to
implement the erase function itself.

Signed-off-by: Lei Wen <leiwen@marvell.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
13 years agoMMC: unify mmc read and write operation
Lei Wen [Wed, 22 Jun 2011 17:03:30 +0000 (17:03 +0000)]
MMC: unify mmc read and write operation

mmc read and write command has so many in common, unfiy those two to
force consistency across the those two.

Signed-off-by: Lei Wen <leiwen@marvell.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Andy Fleming <afleming@freescale.com>
13 years agommc: Tegra2: Enable SD/MMC driver for Seaboard and Harmony
Tom Warren [Tue, 31 May 2011 10:30:38 +0000 (10:30 +0000)]
mmc: Tegra2: Enable SD/MMC driver for Seaboard and Harmony

Signed-off-by: Tom Warren <twarren@nvidia.com>
Acked-by: Andy Fleming <afleming@freescale.com>
13 years agommc: Tegra2: SD/MMC driver for Seaboard - eMMC on SDMMC4, SDIO on SDMMC3
Tom Warren [Tue, 31 May 2011 10:30:37 +0000 (10:30 +0000)]
mmc: Tegra2: SD/MMC driver for Seaboard - eMMC on SDMMC4, SDIO on SDMMC3

Signed-off-by: Tom Warren <twarren@nvidia.com>
Acked-by: Andy Fleming <afleming@freescale.com>
13 years agofdt: introduce fdt_create_phandle()
Gerald Van Baren [Fri, 15 Jul 2011 01:40:10 +0000 (21:40 -0400)]
fdt: introduce fdt_create_phandle()

The ePAPR specification says that phandle properties should be called
"phandle", and not "linux,phandle".  To facilitate the migration from
"linux,phandle" to "phandle", introduce function fdt_create_phandle(),
which creates a phandle in a given node.  For now, we create both the
"phandle" and "linux,phandle" properties.  A later version of this
function will remove support for "linux,phandle".

Signed-off-by: Timur Tabi <timur@freescale.com>
13 years agofdt: add prototype for fdt_increase_size()
Timur Tabi [Tue, 3 May 2011 18:35:10 +0000 (13:35 -0500)]
fdt: add prototype for fdt_increase_size()

Add a prototype for fdt_increase_size() so that anyone can call it.

Signed-off-by: Timur Tabi <timur@freescale.com>
13 years agofdt: introduce fdt_verify_alias_address() and fdt_get_base_address()
Timur Tabi [Tue, 3 May 2011 18:24:07 +0000 (13:24 -0500)]
fdt: introduce fdt_verify_alias_address() and fdt_get_base_address()

Introduce two functions, fdt_verify_alias_address() and
fdt_get_base_address(), which can be used to verify the physical address
of a device in a device tree.

fdt_get_base_address() returns the base address of an SOC or PCI node.

fdt_verify_alias_address() prints a message if the address of a node
specified by an alias does not match the given physical address.

Signed-off-by: Timur Tabi <timur@freescale.com>
13 years agolibfdt: Implement property iteration functions
David Gibson [Tue, 9 Mar 2010 06:39:14 +0000 (17:39 +1100)]
libfdt: Implement property iteration functions

For ages, we've been talking about adding functions to libfdt to allow
iteration through properties.  So, finally, here are some.

I got bogged down on this for a long time because I didn't want to
expose offsets directly to properties to the callers.  But without
that, attempting to make reasonable iteration functions just became
horrible.  So eventually, I settled on an interface which does now
expose property offsets.  fdt_first_property_offset() and
fdt_next_property_offset() are used to step through the offsets of the
properties starting from a particularly node offset.  The details of
the property at each offset can then be retrieved with either
fdt_get_property_by_offset() or fdt_getprop_by_offset() which have
interfaces similar to fdt_get_property() and fdt_getprop()
respectively.

No explicit testcases are included, but we do use the new functions to
reimplement the existing fdt_get_property() function.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This was extracted from the DTC commit:
73dca9ae0b9abe6924ba640164ecce9f8df69c5a Mon Sep 17 00:00:00 2001

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
13 years agoSupport ePAPR compliant phandle properties
David Gibson [Thu, 26 Nov 2009 04:37:13 +0000 (15:37 +1100)]
Support ePAPR compliant phandle properties

Currently, the Linux kernel, libfdt and dtc, when using flattened
device trees encode a node's phandle into a property named
"linux,phandle".  The ePAPR specification, however - aiming as it is
to not be a Linux specific spec - requires that phandles be encoded in
a property named simply "phandle".

This patch adds support for this newer approach to dtc and libfdt.
Specifically:

- fdt_get_phandle() will now return the correct phandle if it
          is supplied in either of these properties

- fdt_node_offset_by_phandle() will correctly find a node with
          the given phandle encoded in either property.

- By default, when auto-generating phandles, dtc will encode
          it into both properties for maximum compatibility.  A new -H
          option allows either only old-style or only new-style
          properties to be generated.

- If phandle properties are explicitly supplied in the dts
  file, dtc will not auto-generate ones in the alternate format.

- If both properties are supplied, dtc will check that they
          have the same value.

- Some existing testcases are updated to use a mix of old and
          new-style phandles, partially testing the changes.

- A new phandle_format test further tests the libfdt support,
          and the -H option.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This was extracted from the DTC commit:
d75b33af676d0beac8398651a7f09037555a550b Mon Sep 17 00:00:00 2001

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
13 years agoEfikaMX: Enable EXT2 booting
Marek Vasut [Mon, 11 Jul 2011 14:16:45 +0000 (14:16 +0000)]
EfikaMX: Enable EXT2 booting

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
13 years agoEfikaMX: Add missing CONFIG_SYS_TEXT_BASE
Jana Rapava [Mon, 11 Jul 2011 14:16:44 +0000 (14:16 +0000)]
EfikaMX: Add missing CONFIG_SYS_TEXT_BASE

Signed-off-by: Jana Rapava <fermata7@gmail.com>
13 years agoEfikaMX: Use correct imximage.cfg
Jana Rapava [Mon, 11 Jul 2011 14:16:43 +0000 (14:16 +0000)]
EfikaMX: Use correct imximage.cfg

Signed-off-by: Jana Rapava <fermata7@gmail.com>
13 years agoMX27: Update to autogenerated asm-offsets.h
Stefano Babic [Thu, 7 Jul 2011 03:37:07 +0000 (03:37 +0000)]
MX27: Update to autogenerated asm-offsets.h

On i.MX27, the asm-offsets.h file is not yet generated as it should be.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Matthias Weisser <weisserm@arcor.de>
13 years agoMX5: Update to autogenerated asm-offsets.h
Stefano Babic [Thu, 7 Jul 2011 03:37:06 +0000 (03:37 +0000)]
MX5: Update to autogenerated asm-offsets.h

On i.MX5, the asm-offsets.h file is not yet generated as it should be.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Matthias Weisser <weisserm@arcor.de>
13 years agoimx: Add support for zmx25 board
Matthias Weisser [Wed, 6 Jul 2011 00:28:33 +0000 (00:28 +0000)]
imx: Add support for zmx25 board

zmx25 is a board based on imx25 SoC, 64 Megs of LPDDR, 32 Megs of NOR flash, an
optional NAND flash.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
13 years agoimx: Make imx25 compatible to mxc_gpio driver and fix in tx25
Matthias Weisser [Wed, 6 Jul 2011 00:28:32 +0000 (00:28 +0000)]
imx: Make imx25 compatible to mxc_gpio driver and fix in tx25

Adding support for mxc_gpio driver for imx25 and fix names of registers in tx25
board.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
13 years agoimx: Add auto generation of asm-offsets.h for imx25
Matthias Weisser [Wed, 6 Jul 2011 00:28:31 +0000 (00:28 +0000)]
imx: Add auto generation of asm-offsets.h for imx25

Offsets to registers may be needed in asm code. This patch adds automated
generation of these offsets form C structures.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
13 years agoimx: Add support for USB EHCI on imx25
Matthias Weisser [Wed, 6 Jul 2011 00:28:30 +0000 (00:28 +0000)]
imx: Add support for USB EHCI on imx25

Adding support for USB host on imx25 using the internal PHY. Changing the name
of base address define for imx31 to get some unification.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
13 years agoimx: Use correct imx25 reset.c
Matthias Weisser [Wed, 6 Jul 2011 00:28:29 +0000 (00:28 +0000)]
imx: Use correct imx25 reset.c

imx25 used the wrong reset.c from imx27

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
13 years agoimx: Add get_tbclk() function for imx25
Matthias Weisser [Wed, 6 Jul 2011 00:28:28 +0000 (00:28 +0000)]
imx: Add get_tbclk() function for imx25

Need this function for autoboot keyd

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
13 years agoARM: Update maintainer of board scb9328
Torsten Koschorrek [Wed, 6 Jul 2011 05:41:02 +0000 (05:41 +0000)]
ARM: Update maintainer of board scb9328

Signed-off-by: Torsten Koschorrek <koschorrek@synertronixx.de>
13 years agomx27: Make the UART port number explicit
Fabio Estevam [Fri, 1 Jul 2011 07:15:52 +0000 (07:15 +0000)]
mx27: Make the UART port number explicit

mx27_uart_init_pins does the IOMUX setting for UART1 port.

Change the function name to make the UART port number explicit.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
13 years agobuild: Add targets for auto gen of asm-offsets.h and use it in imx35
Matthias Weisser [Thu, 30 Jun 2011 05:24:11 +0000 (05:24 +0000)]
build: Add targets for auto gen of asm-offsets.h and use it in imx35

asm-offsets.h should be auto generated. This patch adds two rules to rules.mk
which makes this possible and removes the rules on imx35.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
Acked-by: Stefano Babic <sbabic@denx.de>