]> git.kernelconcepts.de Git - karo-tx-uboot.git/log
karo-tx-uboot.git
12 years agoIDE: fix compiler warnings
Wolfgang Denk [Sat, 30 Apr 2011 21:29:55 +0000 (23:29 +0200)]
IDE: fix compiler warnings

The changes introduced by commit 0abddf8 ``cmd_ide: enhance new
feature "CONFIG_IDE_AHB"'' caused compiler warnings like

cmd_ide.c: In function 'ide_init':
cmd_ide.c:716: warning: assignment from incompatible pointer type

Constify the respective function arguments to fix this.

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agocommon/cmd_mdio.c: fix compile warning
Anatolij Gustschin [Sat, 30 Apr 2011 02:39:29 +0000 (02:39 +0000)]
common/cmd_mdio.c: fix compile warning

cmd_mdio.c: In function 'mdio_read_ranges':
cmd_mdio.c:97: warning: comparison is always false due to limited range of data type

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Andy Fleming <afleming@freescale.com>
12 years agomiiphy: miiphyutil.c: fix compile warning
Anatolij Gustschin [Sat, 30 Apr 2011 02:17:44 +0000 (02:17 +0000)]
miiphy: miiphyutil.c: fix compile warning

Fix warning introduced while recent PHY Lib changes:

miiphyutil.c: In function 'miiphy_read':
miiphyutil.c:304: warning: comparison is always false due to limited range of data type

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Andy Fleming <afleming@freescale.com>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Sat, 30 Apr 2011 20:45:55 +0000 (22:45 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

12 years agocmd_nvedit.c: clean up with checkpatch
Macpaul Lin [Tue, 26 Apr 2011 16:16:45 +0000 (16:16 +0000)]
cmd_nvedit.c: clean up with checkpatch

Code clean up of cmd_nvedit.c by using checkpatch.pl.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
Acked-by: Detlev Zundel <dzu@denx.de>
12 years agocmd_ide: enhance new feature "CONFIG_IDE_AHB"
Macpaul Lin [Mon, 11 Apr 2011 20:45:32 +0000 (20:45 +0000)]
cmd_ide: enhance new feature "CONFIG_IDE_AHB"

Although most IDE controller is designed to be connected to PCI bridge,
there are still some IDE controller support AHB interface for SoC design.

The driver implementation of these IDE-AHB controllers differ from other
IDE-PCI controller, some additional registers and commands access is required
during CMD/DATA I/O. Hence a configuration "CONFIG_IDE_AHB" in cmd_ide.c is
required to be defined to support these kinds of SoC controllers. Such as
Faraday's FTIDE020 series and Global Unichip's UINF-0301.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agospi: add new driver for OpenCores tiny_spi
Thomas Chou [Mon, 11 Apr 2011 19:48:47 +0000 (19:48 +0000)]
spi: add new driver for OpenCores tiny_spi

This patch adds support for OpenCores tiny_spi.

http://opencores.org/project,tiny_spi

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
12 years agozlib: split up to match original source tree
Mike Frysinger [Fri, 8 Apr 2011 12:23:30 +0000 (12:23 +0000)]
zlib: split up to match original source tree

While looking to upgrade to zlib-1.2.5, the current mondo merge of
multiple files into a single was making things way more difficult
than it should have been.  Hard to pick out what has been changed
to port it to U-Boot, been removed as useless, and bug fixes added
after the fact.

So split the single file up into the original file names, and merge
non-essential changes back from the original tree (for some reason,
style in code in a bunch of places was changed to U-Boot style even
though this isn't "U-Boot" code).

The original build style is retained -- we have a single zlib.c that
includes all the other files, and that is the only file we compile.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agotools/env: document current cross-compilation issues and workaround
Luca Ceresoli [Thu, 7 Apr 2011 22:11:20 +0000 (22:11 +0000)]
tools/env: document current cross-compilation issues and workaround

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
12 years agoHandle most LDSCRIPT setting centrally
Scott Wood [Wed, 6 Apr 2011 13:31:37 +0000 (13:31 +0000)]
Handle most LDSCRIPT setting centrally

Currently, some linker scripts are found by common code in config.mk.
Some are found using CONFIG_SYS_LDSCRIPT, but the code for that is
sometimes in arch config.mk and sometimes in board config.mk.  Some
are found using an arch-specific rule for looking in CPUDIR, etc.

Further, the powerpc config.mk rule relied on CONFIG_NAND_SPL
when it really wanted CONFIG_NAND_U_BOOT -- which covered up the fact
that not all NAND_U_BOOT builds actually wanted CPUDIR/u-boot-nand.lds.

Replace all of this -- except for a handful of boards that are actually
selecting a linker script in a unique way -- with centralized ldscript
finding.

If board code specifies LDSCRIPT, that will be used.
Otherwise, if CONFIG_SYS_LDSCRIPT is specified, that will be used.

If neither of these are specified, then the central config.mk will
check for the existence of the following, in order:

$(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds (only if CONFIG_NAND_U_BOOT)
$(TOPDIR)/$(CPUDIR)/u-boot-nand.lds (only if CONFIG_NAND_U_BOOT)
$(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
$(TOPDIR)/$(CPUDIR)/u-boot.lds

Some boards (sc3, cm5200, munices) provided their own u-boot.lds that
were dead code, because they were overridden by a CPUDIR u-boot.lds under
the old powerpc rules.  These boards' own u-boot.lds have bitrotted and
no longer work -- these lds files have been removed.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Tested-by: Graeme Russ <graeme.russ@gmail.com>
12 years agokeymile-common.h: remove IO mux stuff
Holger Brunck [Fri, 4 Mar 2011 09:16:00 +0000 (10:16 +0100)]
keymile-common.h: remove IO mux stuff

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Wolfgang Denk <wd@denx.de>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Heiko Schocher <hs@denx.de>

12 years agokeymile boards: support of boardId / hwkey lists
Thomas Herzmann [Thu, 9 Dec 2010 10:02:09 +0000 (11:02 +0100)]
keymile boards: support of boardId / hwkey lists

In order to support boardId / hwkey lists, the u-boot default
environment has been updated: Added a script checkboardidlist
which checks the list of boardId / hwkey if the boadrId / hwkey
of the IVM is included in that list. This feature is used if you
got different HW variants but you only want to create one boot
package. E.g. supx5 board series.

Signed-off-by: Thomas Herzmann <thomas.herzmann@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Heiko Schocher <hs@denx.de>

12 years agoppc, arm: rework and enhance keymile-common.h
Holger Brunck [Fri, 4 Mar 2011 13:56:27 +0000 (14:56 +0100)]
ppc, arm: rework and enhance keymile-common.h

Add:
  - introduce "bootrunner" environment variable
    This allows to execute consecutive different commands
    specified in the list "subbootcmd". If one command fails
    the command serie will stop.
  - introduce environment variable "develop", "ramfs" and "release"
    Each variable is one way to boot our linux. "develop" is for
    development purpose and boots the SW via NFS. "release" is for
    booting the linux image from flash, "ramfs" allows to load an SW
    image via tftp into ram and executes from there
  - introduce "addmem" variable, this command adds the used memory
    for linux to the bootargs
  - introduce "addvar" variable, this command adress for the /var
    directory to the kernel command line
  - introduce "setramfspram" and "setrootfsaddr" these calculation
    were done if "ramfs" was used (only for debugging)
  - introduce "tftpramfs" used for "ramfs" to load the image into
    RAM (only for debugging)
Remove unneeded stuff:
   - CONFIG_IO_MUXING is obsolete for keymile boards
   - CONFIG_KM_DEF_ENV_PRIVATE is also obsolete
   - define CONFIG_SYS_TEXT_BASE in board configs only

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Wolfgang Denk <wd@denx.de>
cc: Prafulla Wadaskar <prafulla@marvell.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Heiko Schocher <hs@denx.de>

12 years agokeymile, common: add setting of some environment variables
Heiko Schocher [Mon, 26 Apr 2010 11:07:28 +0000 (13:07 +0200)]
keymile, common: add setting of some environment variables

This patch adds last_stage_init to all keymile boards. And
in the last stage init some environment variables for u-boot
were set. Currently these are pnvramaddr, pram and var address.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Wolfgang Denk <wd@denx.de>
cc: Kim Phillips <kim.phillips@freescale.com>

12 years agokeymile boards: add CONFIG_PIGGY_MAC_ADRESS_OFFSET
Heiko Schocher [Thu, 6 Jan 2011 09:25:26 +0000 (10:25 +0100)]
keymile boards: add CONFIG_PIGGY_MAC_ADRESS_OFFSET

Normaly the PIGGY_MAC_ADRESS can be read directly from the
IVM on keymile boards. On mgcoge3 it differs. Because there
are two piggy boards deployed the second MAC adress must be
calculated with the IVM mac adress and an offset. This patch
allows to set such a offset in the board config.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Heiko Schocher <hs@denx.de>

12 years agoarm, keymile: updates for the arm based boards from keymile
Heiko Schocher [Tue, 8 Mar 2011 09:53:51 +0000 (10:53 +0100)]
arm, keymile: updates for the arm based boards from keymile

define KM_IVM_BUS and KM_ENV_BUS macros
 KM_IVM_BUS is used to define the EEprom_ivm environment variable.
 These macros allow the reuse of these I2C addresses in other code
 locations.

remove unneeded code
  On first HW versions the BOCO FPGA was behind a MUX device. These
  HW versions are not supported anymore. And therefore this code can
  be removed.

added LED initialization for SUEN3
  The bootstat LED required to be initialized so to have a green
  colour after start-up.

define CONFIG_SYS_TEXT_BASE
  This is needed by the relocation code and is not the same for
  our ARM BEC and thus needs to be defined.

remove memsize variable
  An environment variable for memsize is not needed.
  this can be get via the board info struct.

remove unneeded double access to bi_dram[i].size field

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Luca Haab <luca.haab@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Prafulla Wadaskar <prafulla@marvell.com>

12 years agokeymile, common; fix i2c deblocking support
Heiko Schocher [Tue, 8 Mar 2011 09:51:15 +0000 (10:51 +0100)]
keymile, common; fix i2c deblocking support

This patch fix the i2c deblocking facility with the i2c HW-Controller.
The required delays for byte reading, the enhanced criteria for stop
the dummy read and required 5 start/stop sequences are added.

Add i2c deblocking before ivm eeprom read.

Improve i2c deblocking sequence by respecting stop hold time.

Cleaned function for deblocking. Have now one function i2c_make_abort()
available for bitbang, mpc82xx and mpc83xx harware controller.

Signed-off-by: Stefan Bigler <stefan.bigler@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>

12 years agoppc, 8321: cleanup tuxa1, tuda1 and suvd3 support
Heiko Schocher [Tue, 8 Mar 2011 09:47:39 +0000 (10:47 +0100)]
ppc, 8321: cleanup tuxa1, tuda1 and suvd3 support

For the kmsupx5 a new header file was introduced km8321-common.h.
Now the common stuff from tuxa1, tuda1 and suvd3 was removed and
the new header file included.

The defines CONFIG_SYS_PIGGY_BASE and CONFIG_SYS_PIGGY_SIZE are
confusing. Because they actually describe the KMBEC FPGA values.
The KMBEC FPGA can be PRIO on kmeter1 or upio on mgcoge. Therefore
all the defines were renamed.

remove unneeded variable CONFIG_KM_DEF_NETDEV, as it is
already declared in keymile-common.h

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Wolfgang Denk <wd@denx.de>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>

12 years agokm_arm: change some register values for SDRAM initialization
Heiko Schocher [Tue, 22 Feb 2011 08:34:33 +0000 (09:34 +0100)]
km_arm: change some register values for SDRAM initialization

These new values are:
- enables UART0 and UART1 pins in MPP
- define some L2 cache settings
- changes a SDRAM timing to better fit the hardware
- removed three writes that were the same as the reset values

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Holger Brunck <holger.brunck@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>

12 years agokm-arm: i2c support for suenx based boards
Heiko Schocher [Tue, 22 Feb 2011 08:13:00 +0000 (09:13 +0100)]
km-arm: i2c support for suenx based boards

This patch renames the suen3 defines and functions to KM_KIRKWOOD
which is more generic and more precise, because these values
and functions where used by all suenX boards and not only suen3.

Signed-off-by: Lukas Roggli <lukas.roggli@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Prafulla Wadaskar <prafulla@marvell.com>

12 years agopowerpc, 83xx: add kmsupx5 board support
Heiko Schocher [Tue, 22 Feb 2011 08:08:28 +0000 (09:08 +0100)]
powerpc, 83xx: add kmsupx5 board support

The Keymile SUPx5 board series is based on a PBEC8321 but
contains an additional PBUS FPGA (LPXF) on local bus CS2.

Signed-off-by: Thomas Reufer <thomas.reufer@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
cc: Wolfgang Denk <wd@denx.de>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Holger Brunck <holger.brunck@keymile.com>

12 years agokeymile, 8321 boards: move common definitions to km8321-common.h
Thomas Reufer [Wed, 17 Nov 2010 15:08:18 +0000 (16:08 +0100)]
keymile, 8321 boards: move common definitions to km8321-common.h

First step for a cleanup of all header files for km8321 boards.

Signed-off-by: Thomas Reufer <thomas.reufer@keymile.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
cc: Wolfgang Denk <wd@denx.de>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Holger Brunck <holger.brunck@keymile.com>
cc: Heiko Schocher <hs@denx.de>

12 years agoppc: add support for ppc based board mgcoge2ne
Heiko Schocher [Tue, 22 Feb 2011 07:58:19 +0000 (08:58 +0100)]
ppc: add support for ppc based board mgcoge2ne

The mgcoge2 board from keymile deploys two different processors.
An ARM based Kirkwood for the "unit" part of the SW and a PPC for
the "ne" part of the SW. Therefore in Linux and U-Boot the names
for the board are mgcoge2un and mgcoge2ne. This patch adds the
mgcoge2ne part of the board. The ppc part of mgboge2 is quite
similar to mgcoge, therefore a generic header km82xx-common.h
was introduced to collect all similiarities. Currently the only
difference is that mgcoge2ne has a 64 MB numonyx NOR flash with
a single die. The mgcoge has a dual die flash 2*32MB from spansion.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>

12 years agoarm: add support of Kirkwood based board SUEN8
Heiko Schocher [Tue, 22 Feb 2011 07:36:20 +0000 (08:36 +0100)]
arm: add support of Kirkwood based board SUEN8

The Kirwood based SUEN8 board from Keymile is at this stage
the same than the suen3 board. This patch adds the board
support for the suen8.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Prafulla Wadaskar <prafulla@marvell.com>

12 years agoarm: add support for kirkwood based mgcoge2un board
Heiko Schocher [Tue, 22 Feb 2011 07:30:46 +0000 (08:30 +0100)]
arm: add support for kirkwood based mgcoge2un board

This board is similar to keymile suen3.

Signed-off-by: Clive Stubbings <clive.stubbings@xentech.co.uk>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Prafulla Wadaskar <prafulla@marvell.com>

12 years agompc832x: add support for mpc8321 based tuda1 board
Heiko Schocher [Thu, 1 Apr 2010 10:10:30 +0000 (12:10 +0200)]
mpc832x: add support for mpc8321 based tuda1 board

This board is similar to suvd3 board. So most initialisation topics
are taken from suvd3 (UART1, Ethernet, piggy PHY, flash, ram) only the
application specific chip selects differ.

Signed-off-by: Lukas Roggli <lukas.roggli@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>

12 years agompc832x: add support for mpc8321 based tuxa1 board
Heiko Schocher [Thu, 1 Apr 2010 10:07:25 +0000 (12:07 +0200)]
mpc832x: add support for mpc8321 based tuxa1 board

This board is similar to suvd3 board. So most initialisation topics
are taken from suvd3 (UART1, Ethernet, piggy PHY, flash, ram) only the
application specific chip selects differ.

Signed-off-by: Lukas Roggli <lukas.roggli@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>

12 years agompc832x: add support for the mpc8321 based suvd3 board
Heiko Schocher [Thu, 18 Feb 2010 07:08:25 +0000 (08:08 +0100)]
mpc832x: add support for the mpc8321 based suvd3 board

- serial console on UART1
- Ethernet RMII over UCC4
- PHY SMSC LAN8700
- 64MB Flash
- 128 MB DDR2 RAM
- I2C
- bootcount

This board is similiar to the kmeter1 (8360) board,
so common config options are extracted into the
include/configs/km83xx-common.h file.

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Holger Brunck <holger.brunck@keymile.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>

12 years agoarm, ppc: rework environment variables for keymile boards
Holger Brunck [Mon, 14 Mar 2011 15:01:04 +0000 (16:01 +0100)]
arm, ppc: rework environment variables for keymile boards

This patch reworks all headerfiles for keymile boards. Furthermore
the environment variables are refactored.

Changes:
  - introduce km-powerpc.h file and extract ppc specific parts to it
  - move ARM specific options and vaiables to km_arm.h
  - sort the environment variables to logical groups
  - enhance the description of the environment variables
  - remove KM specific HW key and board id from kernel command line

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Wolfgang Denk <wd@denx.de>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>

12 years agoppc, arm: adapt keymile header
Holger Brunck [Mon, 14 Mar 2011 14:49:05 +0000 (15:49 +0100)]
ppc, arm: adapt keymile header

- adapt copyright string
- change bootdelay to 2 seconds
- set max number of command args to 32
- set I/O buffer size to 512

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Wolfgang Denk <wd@denx.de>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>

12 years agokeymile: Fix Coding style issues for keymile boards.
Heiko Schocher [Tue, 15 Mar 2011 15:52:29 +0000 (16:52 +0100)]
keymile: Fix Coding style issues for keymile boards.

- use I/O accessors
  -> For accessing the FPGA therefore a struct km_bec_fpga
     is introduced.
- no longer externs needed
- to defines, that only select functions, don;t assign a
  numeric value
- Codingstyle changes to prevent checkpatch errors/warnings

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Holger Brunck <holger.brunck@keymile.com>
cc: Wolfgang Denk <wd@denx.de>
cc: Detlev Zundel <dzu@denx.de>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>

12 years agoarm, keymile: rename MACH_SUEN3 to MACH_KM_KIRKWOOD
Holger Brunck [Mon, 14 Mar 2011 14:31:19 +0000 (15:31 +0100)]
arm, keymile: rename MACH_SUEN3 to MACH_KM_KIRKWOOD

The MACH_TYPE SUEN3 is now to specific for keymile boards, because
other boards similar to suen3 will follow. So the MACH_SUEN3 was renamed
to MACH_KM_KIRKWOOD.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>

12 years agopowerpc, mpc83xx: add missing functions to include/common.h
Heiko Schocher [Tue, 15 Mar 2011 11:30:47 +0000 (12:30 +0100)]
powerpc, mpc83xx: add missing functions to include/common.h

add following functions to common.h, to prevent
extern declarations:

void disable_addr_trans(void);
void enable_addr_trans(void);
void ddr_enable_ecc(unsigned int dram_size);

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
cc: Kim Phillips <kim.phillips@freescale.com>
cc: Holger Brunck <holger.brunck@keymile.com>
cc: Wolfgang Denk <wd@denx.de>
cc: Detlev Zundel <dzu@denx.de>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-mmc
Wolfgang Denk [Fri, 29 Apr 2011 20:45:50 +0000 (22:45 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mmc

12 years agofsl-ddr: Fix mixed-case macro names
Kyle Moffett [Thu, 14 Apr 2011 17:39:30 +0000 (13:39 -0400)]
fsl-ddr: Fix mixed-case macro names

Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Bump up the CONFIG_SYS_BOOTM_LEN to 64M on FSL 85xx boards
Kumar Gala [Thu, 28 Apr 2011 15:13:41 +0000 (10:13 -0500)]
powerpc/85xx: Bump up the CONFIG_SYS_BOOTM_LEN to 64M on FSL 85xx boards

CONFIG_SYS_BOOTMAPSZ has been 64M on these boards for some time so we
should also allow the kernel image to be up to 64M decompressed.  This
also matches what we pass to the OS based on the ePAPR specification.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Enable eSPI support on P1022DS
Jiang Yutang [Thu, 24 Feb 2011 08:11:56 +0000 (16:11 +0800)]
powerpc/85xx: Enable eSPI support on P1022DS

Signed-off-by: Jiang Yutang <b14898@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Enable eSPI support for p1_p2_rdb
Priyanka Jain [Tue, 8 Feb 2011 07:47:35 +0000 (13:17 +0530)]
powerpc/85xx: Enable eSPI support for p1_p2_rdb

Also added support to save env to spi flash in case of SPIBOOT.

Signed-off-by: Priyanka Jain <Priyanka.Jain@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Enable eSPI controller & SPI boot support on P2020DS
Jerry Huang [Mon, 24 Jan 2011 17:09:56 +0000 (17:09 +0000)]
powerpc/85xx: Enable eSPI controller & SPI boot support on P2020DS

Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com>
Signed-off-by: Zhao Chenhui <b35336@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc: eSPI and eSPI controller support
Mingkai Hu [Tue, 26 Apr 2011 08:31:16 +0000 (16:31 +0800)]
powerpc: eSPI and eSPI controller support

Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com>
Singed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com>
Signed-off-by: Shaohui Xie <b21989@freescale.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agotsec: Fix MDIO on devices with eTSEC2
Andy Fleming [Fri, 29 Apr 2011 07:26:52 +0000 (02:26 -0500)]
tsec: Fix MDIO on devices with eTSEC2

The tsec driver was defining the default MDIO address as
the TSEC_BASE + 0x520, but on eTSEC2 controllers, the first
TSEC's registers are separated from the MDIO registers. Use
the existing MDIO_BASE_ADDR, instead.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agommc: coding style fix and tabify of mmc.h
Thomas Chou [Tue, 19 Apr 2011 03:48:31 +0000 (03:48 +0000)]
mmc: coding style fix and tabify of mmc.h

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
12 years agofsl_esdhc: Fix multi-block read restriction on i.MX53 eSDHCv2
Jason Liu [Tue, 22 Mar 2011 01:32:31 +0000 (01:32 +0000)]
fsl_esdhc: Fix multi-block read restriction on i.MX53 eSDHCv2

For freescale i.MX53 eSDHCv2, when using CMD12, cmdtype need
to be set to ABORT, otherwise, next read command will hang.

This is a software Software Restrictions in i.MX53 reference manual:

29.7.8 Multi-block Read
For pre-defined multi-block read operation, that is,the number of blocks
to read has been defined by previous CMD23 for MMC, or pre-defined number
of blocks in CMD53 for SDIO/SDCombo,or whatever multi-block read without
abort command at card side, an abort command, either automatic or manual
CMD12/CMD52, is still required by ESDHC after the pre-defined number of
blocks are done, to drive the internal state machine to idle mode. In this
case, the card may not respond to this extra abort command and ESDHC will
get Response Timeout.  It is recommended to manually send an abort command
with RSPTYP[1:0] both bits cleared.

Signed-off-by: Jason Liu <jason.hui@linaro.org>
12 years agoMMC: omap_hsmmc.c: disable multiblock rw on old rev omap34xx silicon
John Rigby [Tue, 19 Apr 2011 05:48:14 +0000 (05:48 +0000)]
MMC: omap_hsmmc.c: disable multiblock rw on old rev omap34xx silicon

Signed-off-by: John Rigby <john.rigby@linaro.org>
12 years agoMMC: make b_max unconditional
John Rigby [Mon, 18 Apr 2011 05:50:08 +0000 (05:50 +0000)]
MMC: make b_max unconditional

Make existing field b_max field in struct mmc unconditional
and use it instead of CONFIG_SYS_MMC_MAX_BLK_COUNT in mmc_bread
and mmc_bwrite.

Initialize b_max to CONFIG_SYS_MMC_MAX_BLK_COUNT in mmc_register
if it has not been initialized by the hw driver.

Initialize b_max to 0 in all callers to mmc_register.

Signed-off-by: John Rigby <john.rigby@linaro.org>
Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agommc_spi: add mmc_init call
Thomas Chou [Sun, 17 Apr 2011 21:00:46 +0000 (21:00 +0000)]
mmc_spi: add mmc_init call

As Andy Fleming suggested, we can call mmc_init() in mmc_spi command.
So that we don't need to run mmcinfo command next.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
12 years agoARMV7: Vexpress: Add MMC support
Matt Waddel [Sat, 16 Apr 2011 11:54:08 +0000 (11:54 +0000)]
ARMV7: Vexpress: Add MMC support

Added the board specific definitions to use the MMCI device.

Signed-off-by: Matt Waddel <matt.waddel@linaro.org>
12 years agoMMC: Add support for PL180 ARM mmc device
Matt Waddel [Sat, 16 Apr 2011 11:54:07 +0000 (11:54 +0000)]
MMC: Add support for PL180 ARM mmc device

Add support for the ARM PrimeCell MultiMedia Interface - PL180.
Ported from original device driver written by ST-Ericsson.

Signed-off-by: Matt Waddel <matt.waddel@linaro.org>
12 years agopowerpc/85xx: Change timebase divisor to be defined per processor
Kumar Gala [Fri, 18 Feb 2011 11:40:54 +0000 (05:40 -0600)]
powerpc/85xx: Change timebase divisor to be defined per processor

Introduce new CONFIG_SYS_FSL_TBCLK_DIV on 85xx platforms because
different SoCs have different divisor amounts.  All the PQ3 parts are
/8, the P4080/P4080 is /16, and P2040/P3041/P5020 are /32.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Implement work-around for P4080 erratum SERDES-A001
Timur Tabi [Mon, 18 Apr 2011 22:16:00 +0000 (17:16 -0500)]
powerpc/85xx: Implement work-around for P4080 erratum SERDES-A001

Bank powerdown through RCW[SRDS_LPD_Bn] for XAUI on FM2 and SGMII on FM1
are swapped.

Erratum SERDES-A001 says that if bank two is kept disabled and after bank
three is enabled, then the PLL for bank three won't lock properly.  The
work-around is to enable and then disable bank two after bank three is
enabled.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Extend SERDES9 erratum work-around to SGMII, SRIO, and AURORA
Timur Tabi [Thu, 14 Apr 2011 20:37:06 +0000 (15:37 -0500)]
powerpc/85xx: Extend SERDES9 erratum work-around to SGMII, SRIO, and AURORA

Part of the SERDES9 erratum work-around is to set some bits in the SerDes
TTLCR0 register for lanes configured as XAUI, SGMII, SRIO, or AURORA.  The
current code does this only for XAUI, so extend it to the other protocols.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Display SERDES 8 erratum warning if banks are not disabled
Timur Tabi [Wed, 13 Apr 2011 15:38:23 +0000 (10:38 -0500)]
powerpc/85xx: Display SERDES 8 erratum warning if banks are not disabled

The work-around for P4080 erratum SERDES-8 requires all lanes of banks two
and three to be disabled (powered down) in the RCW.  Display a warning
message if this is not the case.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Implement work-around for P4080 erratum SERDES-A005
Timur Tabi [Fri, 1 Apr 2011 18:19:36 +0000 (13:19 -0500)]
powerpc/85xx: Implement work-around for P4080 erratum SERDES-A005

SerDes PLL bandwidth default setting is incorrect when no lanes are
configured as PCI Express.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/fsl: add 'pixis_reset dump' command
Timur Tabi [Wed, 9 Feb 2011 22:28:48 +0000 (16:28 -0600)]
powerpc/fsl: add 'pixis_reset dump' command

Add the 'pixis_reset dump' command, which displays the contents of the PIXIS
registers.  This command is only available if DEBUG is defined.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/86xx: remove empty board_early_init_f()
Timur Tabi [Thu, 28 Apr 2011 20:01:14 +0000 (15:01 -0500)]
powerpc/86xx: remove empty board_early_init_f()

Remove an empty board_early_init_f() from the MPC8641HPCN board.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Wolfgang Denk [Thu, 28 Apr 2011 21:45:16 +0000 (23:45 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-video

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Wolfgang Denk [Thu, 28 Apr 2011 21:19:18 +0000 (23:19 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

12 years agopowerpc: use 'video-mode' environment variable to configure DIU
Timur Tabi [Mon, 11 Apr 2011 19:18:22 +0000 (14:18 -0500)]
powerpc: use 'video-mode' environment variable to configure DIU

Use the 'video-mode' environment variable (for Freescale chips that have a
DIU display controller) to designate the full video configuration.  Previously,
the DIU driver used the 'monitor' variable, and it was used only to determine
the output video port.

The old definition of the "monitor" environment variable only determines
which video port to use for output.  This variable was set to a number (0,
1, or sometimes 2) to specify a DVI, LVDS, or Dual-LVDS port.  The
resolution was hard-coded into board-specific code.  The Linux command-line
arguments needed to be hard-coded to the proper video definition string.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
12 years agovideo: parse the video-mode environment variable
Timur Tabi [Mon, 21 Mar 2011 21:38:49 +0000 (16:38 -0500)]
video: parse the video-mode environment variable

Add function video_get_video_mode(), which parses the "video-mode" environment
variable and returns each of its components.  The format matches the video=
command-line option used for Linux:

video-mode=<driver>:<xres>x<yres>-<depth>@<freq><,option=string>

<driver> The video driver, ignored by U-Boot
<xres> The X resolution (in pixels) to use.
<yres> The Y resolution (in pixels) to use.
<depth> The color depth (in bits) to use.
<freq> The frequency (in Hz) to use.
<options> A comma-separated list of device-specific options

Signed-off-by: Timur Tabi <timur@freescale.com>
12 years agocfb_console: fix RLE bitmap drawing code
Anatolij Gustschin [Mon, 21 Feb 2011 20:33:29 +0000 (21:33 +0100)]
cfb_console: fix RLE bitmap drawing code

There seems to be tools producing incorrect 'end of bitmap data'
markers '0100' in a RLE bitmap. Drawing such bitmaps can result
in overwriting memory above the frame buffer. E.g. on MPC5121e
based boards this memory can contain U-Boot environment.

We may not rely on the correct end of bitmap data marker 0001
only, but also have to check whether we are going to draw a
valid frame buffer scan line.

The patch provides a fix by maintaining a pixel counter
which is incremented by the amount of pixels we are going
to draw. If the counter exceeds frame buffer pixels limit
we stop the drawing with the error message.

Reported-by: Michael Weiss <michael.weiss@ifm.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Tested-by: Anatolij Gustschin <agust@denx.de>
12 years agoAdd CONFIG_OF_LIBFDT to more boards.
Grant Likely [Mon, 28 Mar 2011 09:59:07 +0000 (09:59 +0000)]
Add CONFIG_OF_LIBFDT to more boards.

The following boards gain device tree support with this patch:

ca9x4_ct_vxp - Versatile Express

i.mx5 boards:
efikamx
mx51evk
mx53evk

OMAP boards:
devkit8000
igep0020
igep0030
omap3_overo
omap3_pandora
omap4_sdp3430
omap3_zoom1
omap3_zoom2
omap4_panda
omap4_sdp4430

Tegra boards:
Harmony

Signed-off-by: Grant Likely <grant.likely@linaro.org>
12 years agoi2c, soft_i2c: deblock bus if switching to another i2c bus
Heiko Schocher [Fri, 8 Apr 2011 14:24:09 +0000 (16:24 +0200)]
i2c, soft_i2c: deblock bus if switching to another i2c bus

Deblock i2c bus when switching to another i2c bus, if using
i2c_set_bus_num().

Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Detlev Zundel <dzu@denx.de>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
12 years agoi2c: add i2c deblock sequence before and after every mux config
Stefan Bigler [Fri, 8 Apr 2011 14:24:08 +0000 (16:24 +0200)]
i2c: add i2c deblock sequence before and after every mux config

To make sure that the mux can be configured a deblocking sequence
is done before the mux configuration. After the mux switch the new leaf
of, the i2c tree must be again deblocked.

Signed-off-by: Stefan Bigler <stefan.bigler@keymile.com>
Acked-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Detlev Zundel <dzu@denx.de>
cc: Prafulla Wadaskar <prafulla@marvell.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
12 years agoarm: a320: fix compile error caused by commit 00d10eb
Po-Yu Chuang [Wed, 27 Apr 2011 22:04:21 +0000 (22:04 +0000)]
arm: a320: fix compile error caused by commit 00d10eb

Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com>
12 years agopowerpc/85xx: Don't set FT_FSL_PCI_SETUP if CONFIG_PCI is not set
Matthew McClintock [Mon, 25 Apr 2011 19:10:35 +0000 (14:10 -0500)]
powerpc/85xx: Don't set FT_FSL_PCI_SETUP if CONFIG_PCI is not set

A lot of boards set FT_FSL_PCI_SETUP directly in their board code
and don't check to see if CONFIG_PCI is actually defined. This
will cause the board compilation to fail if CONFIG_PCI is not
defined. The p1022ds board is one such example.

Instead of fixing every board this patch wraps FT_FSL_PCI_SETUP
around CONFIG_PCI so we can remove CONFIG_PCI and boards will
still build properly.

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: handle both "secX.Y" and "sec-vX.Y" properties
Kim Phillips [Tue, 12 Apr 2011 19:12:47 +0000 (14:12 -0500)]
powerpc/85xx: handle both "secX.Y" and "sec-vX.Y" properties

versioned SEC properties changed names during development, so
for now search and update LIODNs for both "secX.Y" and
"sec-vX.Y" based properties.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Enable ESDHC111 erratum on P2040/P3041/P5010/P5020 SoCs
Lei Xu [Tue, 19 Apr 2011 07:28:41 +0000 (15:28 +0800)]
powerpc/85xx: Enable ESDHC111 erratum on P2040/P3041/P5010/P5020 SoCs

The workaround for ESDHC111 should also be applied on
P2040/P3041/P5010/P5020 SoCs.

Signed-off-by: Lei Xu <B33228@freescale.com>
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Enable Internal USB PHY for p2040, p3041, p5010 and p5020
Roy Zang [Wed, 13 Apr 2011 05:08:51 +0000 (00:08 -0500)]
powerpc/85xx: Enable Internal USB PHY for p2040, p3041, p5010 and p5020

The P2040, P3041, P5010, and P5020 all have internal USB PHYs that we
need to enable for them to function.

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc: Add P3041DS/P5020DS board support (uses corenet_ds code)
Kumar Gala [Wed, 9 Feb 2011 02:00:08 +0000 (02:00 +0000)]
powerpc: Add P3041DS/P5020DS board support (uses corenet_ds code)

The P3041DS & P5020DS boards are almost identical (except for the
processor in them).  Additionally they are based on the P4080DS board
design so we use the some board code for all 3 boards.

Some ngPIXIS (FPGA) registers where reserved on P4080DS and now have
meaning on P3041DS/P5020DS.  We utilize some of these for SERDES clock
configuration.

Additionally, the P3041DS/P5020DS support NAND.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Shaohui Xie <b21989@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agop4080/serdes: Implement the XAUI workaround for SERDES9 erratum
Emil Medve [Wed, 1 Sep 2010 03:57:38 +0000 (22:57 -0500)]
p4080/serdes: Implement the XAUI workaround for SERDES9 erratum

Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: fsl_corenet_serdes code rework
Emil Medve [Wed, 1 Sep 2010 03:57:36 +0000 (22:57 -0500)]
powerpc/85xx: fsl_corenet_serdes code rework

Rework and add some new APIs to the fsl_corenet_serdes code for use by
erratum and drivers.

* Rename serdes_get_bank() to serdes_get_bank_by_lane()
* Add serdes_get_first_lane returns which SERDES lane is used by device

Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Fix Wrong PCIe 3 virtual address on corenet_ds platforms
Trübenbach, Ralf [Wed, 20 Apr 2011 13:04:47 +0000 (13:04 +0000)]
powerpc/85xx: Fix Wrong PCIe 3 virtual address on corenet_ds platforms

This patch fixes a wrong address define in corenet_ds.h (used by
P4080DS.h, P3041DS.h, P5020DS.h).

Since board/Freescale/corenet_ds/tlb.c does not use the
CONFIG_SYS_PCIE3_MEM_VIRT define (uses CONFIG_SYS_PCIE1_MEM_VIRT with a
fix offset instead) this has no effect to the functionality. But it may
be important for changes in the future?

Signed-off-by: Ralf Trübenbach <ralf.truebenbach@men.de>
Cc: Andy Fleming <afleming@gmail.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Add device tree fixup for bman portal
Haiying Wang [Tue, 1 Mar 2011 14:30:07 +0000 (09:30 -0500)]
powerpc/85xx: Add device tree fixup for bman portal

Fix fdt bportal to pass the bman revision number to kernel via device tree.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Add support for 2nd USB controller on p1_p2_rdb
Ramneek Mehresh [Sat, 9 Apr 2011 18:08:47 +0000 (13:08 -0500)]
powerpc/85xx: Add support for 2nd USB controller on p1_p2_rdb

Second USB controller only works for SPI and SD boot because of pin muxing

Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
12 years agopowerpc/85xx: Added PMUXCR1 and PMUXCR2 defines for P1010/P1014 SoC
Dipen Dudhat [Tue, 22 Mar 2011 13:31:36 +0000 (08:31 -0500)]
powerpc/85xx: Added PMUXCR1 and PMUXCR2 defines for P1010/P1014 SoC

Signed-off-by: Dipen Dudhat <Dipen.Dudhat@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Change CS timing params before changing CS properties on IFC
Dipen Dudhat [Fri, 8 Apr 2011 10:34:51 +0000 (16:04 +0530)]
powerpc/85xx: Change CS timing params before changing CS properties on IFC

To make sure that machine change operation work successfully, change
timing parameters first before changing machine for chip select on IFC.

Signed-off-by: Dipen Dudhat <Dipen.Dudhat@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agopowerpc/85xx: Add support to save environment in SD card on p1_p2_rdb
Priyanka Jain [Tue, 8 Feb 2011 07:47:15 +0000 (13:17 +0530)]
powerpc/85xx: Add support to save environment in SD card on p1_p2_rdb

If we boot from a SD card use it for the environment as well.

Signed-off-by: Priyanka Jain <Priyanka.Jain@freescale.com>
Signed-off-by: Poonam Aggrwal <Poonam.Aggrwal@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agocommon: add a grepenv command
Kim Phillips [Tue, 5 Apr 2011 07:15:14 +0000 (07:15 +0000)]
common: add a grepenv command

u-boot environments, esp. when boards are shared across multiple
users, can get pretty large and time consuming to visually parse.
The grepenv command this patch adds can be used in lieu of printenv
to facilitate searching.  grepenv works like printenv but limits
its output only to environment strings (variable name and value
pairs) that match the user specified substring.

the following examples are on a board with a 5313 byte environment
that spans multiple screen pages:

Example 1:  summarize ethernet configuration:

=> grepenv eth TSEC
etact=FM1@DTSEC2
eth=FM1@DTSEC4
ethact=FM1@DTSEC2
eth1addr=00:E0:0C:00:8b:01
eth2addr=00:E0:0C:00:8b:02
eth3addr=00:E0:0C:00:8b:03
eth4addr=00:E0:0C:00:8b:04
eth5addr=00:E0:0C:00:8b:05
eth6addr=00:E0:0C:00:8b:06
eth7addr=00:E0:0C:00:8b:07
eth8addr=00:E0:0C:00:8b:08
eth9addr=00:E0:0C:00:8b:09
ethaddr=00:E0:0C:00:8b:00
netdev=eth0
uprcw=setenv ethact $eth;setenv filename p4080ds/R_PPSXX_0xe/rcw_0xe_2sgmii_rev2_high.bin;setenv start 0xe8000000;protect off all;run upimage;protect on all
upuboot=setenv ethact $eth;setenv filename u-boot.bin;setenv start eff80000;protect off all;run upimage;protect on all
upucode=setenv ethact $eth;setenv filename fsl_fman_ucode_P4080_101_6.bin;setenv start 0xef000000;protect off all;run upimage;protect on all
usdboot=setenv ethact $eth;tftp 1000000 $dir/$bootfile;tftp 2000000 $dir/initramfs.cpio.gz.uboot;tftp c00000 $dir/p4080ds-usdpaa.dtb;setenv bootargs root=/dev/ram rw console=ttyS0,115200 $othbootargs;bootm 1000000 2000000 c00000;
=>

Example 2: detect unused env vars:

=> grepenv etact
etact=FM1@DTSEC2
=>

Example 3: reveal hardcoded variables; e.g., for fdtaddr:

=> grepenv fdtaddr
fdtaddr=c00000
nfsboot=setenv bootargs root=/dev/nfs rw nfsroot=$serverip:$rootpath ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off console=$consoledev,$baudrate $othbootargs;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr - $fdtaddr
ramboot=setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr
=> grep $fdtaddr
fdtaddr=c00000
my_boot=bootm 0x40000000 0x41000000 0x00c00000
my_dtb=tftp 0x00c00000 $prefix/p4080ds.dtb
nohvboot=tftp 1000000 $dir/$bootfile;tftp 2000000 $dir/$ramdiskfile;tftp c00000 $dir/$fdtfile;setenv bootargs root=/dev/ram rw ramdisk_size=0x10000000 console=ttyS0,115200;bootm 1000000 2000000 c00000;
=>

This patch also enables the grepenv command by default on
corenet_ds based boards (and repositions the DHCP command
entry to keep the list sorted).

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Kumar Gala <kumar.gala@freescale.com>
Cc: Andy Fleming <afleming@freescale.com>
12 years agopowerpc: fix implementation of out_8 to match the other out_XX functions
Timur Tabi [Fri, 3 Dec 2010 09:03:46 +0000 (09:03 +0000)]
powerpc: fix implementation of out_8 to match the other out_XX functions

Signed-off-by: Timur Tabi <timur@freescale.com>
12 years agoenv: fix env var autocompletion
Kim Phillips [Mon, 4 Apr 2011 15:17:45 +0000 (15:17 +0000)]
env: fix env var autocompletion

commit 560d424b6d7cd4205b062ad95f1b104bd4f8bcc3 "env: re-add
support for auto-completion" fell short of its description -
the 'used' logic in hmatch_r was reversed - 'used' is 0 if
the hash table entry is not used, or -1 if deleted.  This
patch makes hmatch_r actually match on valid ('used') entries,
instead of skipping them and failing to match anything.

typing 'printenv tft' and hitting 'tab' now displays valid
choices for variable names.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Tested-by: Mike Frysinger <vapier@gentoo.org>
12 years agompc52xx, digsy_mtc: protect default flash sectors
Heiko Schocher [Sun, 3 Apr 2011 20:10:22 +0000 (20:10 +0000)]
mpc52xx, digsy_mtc: protect default flash sectors

call flash_protect_default() to protect default sectors.

Signed-off-by: Heiko Schocher <hs@denx.de>
12 years agompc52xx, digsy_mtc: change phy addr for rev5 boards.
Heiko Schocher [Sun, 3 Apr 2011 20:10:20 +0000 (20:10 +0000)]
mpc52xx, digsy_mtc: change phy addr for rev5 boards.

- rev5 board has phy addr 1 -> adapt CONFIG_PHY_ADDR define
  in board config file.
- also fixup the phy addr entry in dts, before booting
  Linux.

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
12 years agoNET: Correct potential missing goto label in case statement.
Gray Remlin [Tue, 29 Mar 2011 10:21:32 +0000 (10:21 +0000)]
NET: Correct potential missing goto label in case statement.

If neither CONFIG_CMD_PING or CONFIG_CMD_SNTP are defined but
CONFIG_CMD_DNS is, a compile-time error will occur due to the
absence of a goto label.

Signed-off-by: Gray Remlin <gryrmln@gmail.com>
12 years agofix redundant environment for serial flash
thomas.langer@lantiq.com [Tue, 29 Mar 2011 02:35:14 +0000 (02:35 +0000)]
fix redundant environment for serial flash

This patch fixes problems in the handling of redundant environment in env_sf.c

The major problem are double calls of free() on the allocated buffers,
which damages the internal data of malloc and crashes on next call.

In addition, the selection of the active environment had errors and compiler
warnings, which are corrected by this patch.

Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Wed, 27 Apr 2011 19:48:09 +0000 (21:48 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-fdt
Wolfgang Denk [Wed, 27 Apr 2011 19:45:31 +0000 (21:45 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-fdt

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Wed, 27 Apr 2011 19:43:42 +0000 (21:43 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

12 years agoMerge branch 'spi' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Wed, 27 Apr 2011 19:42:18 +0000 (21:42 +0200)]
Merge branch 'spi' of git://git.denx.de/u-boot-blackfin

12 years agoDon't grab memory for LCD if FB address is defined
Minkyu Kang [Sun, 24 Apr 2011 22:22:34 +0000 (22:22 +0000)]
Don't grab memory for LCD if FB address is defined

If FB address is defined specific address then don't grab memory for LCD

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Cc: Albert Aribaud <albert.aribaud@free.fr>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Andy Fleming <afleming@gmail.com>
Cc: Kumar Gala <kumar.gala@freescale.com>
12 years agonhk8815: move config targets from Makefile to boards.cfg
Alessandro Rubini [Sat, 16 Apr 2011 07:50:01 +0000 (07:50 +0000)]
nhk8815: move config targets from Makefile to boards.cfg

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
12 years agonhk8815: add support for relocation
Alessandro Rubini [Sat, 16 Apr 2011 13:00:12 +0000 (13:00 +0000)]
nhk8815: add support for relocation

This patch defines all the needed symbols in the header file
and removes the now-unused config.mk in board directory.
Changes to board C file as requested.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
12 years agonhk8815: remove platform.S, which was unused at link time
Alessandro Rubini [Sat, 16 Apr 2011 07:49:40 +0000 (07:49 +0000)]
nhk8815: remove platform.S, which was unused at link time

This source file, which I got by the vendor in their own port,
was not actually executing because lib-based compilation
didn't call lowlevel_init (we have CONFIG_SKIP_LOWLEVEL_INIT).
With the change to object-based linking, an undefined symbol in
this file started hitting in the final link.

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
12 years agocpuat91: fix board support
Eric Benard [Sun, 3 Apr 2011 06:35:55 +0000 (06:35 +0000)]
cpuat91: fix board support

- fix board support following relocation changes
- switch to boards.cfg
- disable i2c to keep size under 128kiB (1 sector)

Signed-off-by: Eric Bénard <eric@eukrea.com>
12 years agoftsmc020: move ftsmc020 static mem controller to driver/mtd
Macpaul Lin [Fri, 15 Apr 2011 21:37:11 +0000 (21:37 +0000)]
ftsmc020: move ftsmc020 static mem controller to driver/mtd

Move the header file and definitions of ftsmc020
static memory control unit from a320 SoC folder to
"drivers/mtd" folder.

This change will let other SoC which also use ftsmc020
could share the same header file.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agoftsdmc020: move ftsdmc020.h to include/faraday
Macpaul Lin [Fri, 15 Apr 2011 21:37:10 +0000 (21:37 +0000)]
ftsdmc020: move ftsdmc020.h to include/faraday

Move the header file "ftsdmc020.h" (SDRAM Controller)
to "include/faraday" folder.

This change will let other SoC which also use ftsdmc020
could share the same header file.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agocpu9260: update board support
Eric Benard [Sun, 3 Apr 2011 06:35:54 +0000 (06:35 +0000)]
cpu9260: update board support

- update to new relocation code
- switch to boards.cfg
- get rid of LEGACY (still a little hack in .h to compile)
- add nand boot configuration
- boot tested for the following configurations :
9260 (64MB RAM & nor boot)
9260_nand (64MB RAM & nand boot)
9G20_128M (128MB RAM & nor boot)
9G20_nand_128M (128MB RAM & nand boot)
(nor boot is using lowlevel init)

Signed-off-by: Eric Bénard <eric@eukrea.com>
12 years agoFix the issue of _end symbol not being found while building
Sughosh Ganu [Sun, 10 Apr 2011 10:16:08 +0000 (10:16 +0000)]
Fix the issue of _end symbol not being found while building

Fix the nand_spl build for the hawkboard

Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
12 years agoARMV7: OMAP3: Add support for Comelit DIG297 board
Luca Ceresoli [Wed, 20 Apr 2011 15:02:08 +0000 (11:02 -0400)]
ARMV7: OMAP3: Add support for Comelit DIG297 board

Board support for the DIG297 board manufactured by Comelit Group SpA.
It is a custom board based on the BeagleBoard <http://beagleboard.org/> by
Texas Instruments.

The board support is based on the BeagleBoard implementation.

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Albert Aribaud <albert.aribaud@free.fr>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
12 years agoARMV7: OMAP3: Cleanup extern variables in mem.c
Luca Ceresoli [Wed, 20 Apr 2011 15:02:05 +0000 (11:02 -0400)]
ARMV7: OMAP3: Cleanup extern variables in mem.c

Removed boot_flash_* extern variables.
boot_flash_type was totally unused. The other ones were actually constants, so
they have been replaced with #defines in the board config files.

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Albert Aribaud <albert.aribaud@free.fr>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
12 years agoarm: Tegra2: Move clk/mux init to board_early_init_f, add GPIO init
Tom Warren [Thu, 14 Apr 2011 12:09:41 +0000 (12:09 +0000)]
arm: Tegra2: Move clk/mux init to board_early_init_f, add GPIO init

Signed-off-by: Tom Warren <twarren@nvidia.com>