kernel/u-boot.git
12 years agogunzip: rename z{alloc, free} to gz{alloc, free}
Mike Frysinger [Mon, 9 Apr 2012 13:39:53 +0000 (13:39 +0000)]
gunzip: rename z{alloc, free} to gz{alloc, free}

This allows us to add a proper zalloc() func (one that does a zeroing
alloc), and removes duplicate prototypes.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agofs/fat: align disk buffers on cache line to enable DMA and cache
Eric Nelson [Wed, 11 Apr 2012 04:08:53 +0000 (04:08 +0000)]
fs/fat: align disk buffers on cache line to enable DMA and cache

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agopart_dos: align disk buffers on cache line to enable DMA and cache
Eric Nelson [Sat, 3 Mar 2012 12:02:20 +0000 (12:02 +0000)]
part_dos: align disk buffers on cache line to enable DMA and cache

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agopatman: Change the location of patman path
Vikram Narayanan [Fri, 27 Apr 2012 06:39:31 +0000 (06:39 +0000)]
patman: Change the location of patman path

Fix the location of patman path in README

Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
12 years agopatman: Fix a typo error
Vikram Narayanan [Wed, 25 Apr 2012 05:45:05 +0000 (05:45 +0000)]
patman: Fix a typo error

Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agoGCC47: Fix warning in md5.c
Marek Vasut [Sat, 28 Apr 2012 22:28:40 +0000 (00:28 +0200)]
GCC47: Fix warning in md5.c

md5.c: In function ‘MD5Final’:
md5.c:156:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
md5.c:157:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoGCC47: Fix warning in cmd_nand.c
Marek Vasut [Sat, 28 Apr 2012 22:28:39 +0000 (00:28 +0200)]
GCC47: Fix warning in cmd_nand.c

cmd_nand.c: In function ‘arg_off_size’:
cmd_nand.c:216:5: warning: ‘maxsize’ may be used uninitialized in this function [-Wmaybe-uninitialized]

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Wolfgang Denk <wd@denx.de>
12 years agoMerge branch 'marex@denx.de' of git://git.denx.de/u-boot-staging
Wolfgang Denk [Fri, 27 Apr 2012 11:03:26 +0000 (13:03 +0200)]
Merge branch 'marex@denx.de' of git://git.denx.de/u-boot-staging

* 'marex@denx.de' of git://git.denx.de/u-boot-staging:
  CMD: CONFIG_CMD_SETECPR -> CONFIG_CMD_SETEXPR on omap3_logic
  CMD: Fix CONFIG_CMD_SAVEBP_WRITE_SIZE -> CONFIG_CMD_SPL_WRITE_SIZE
  CMD: Fix typo CMD_FSL -> CMD_MFSL in readme
  HWW1U1A: Fix CMD_SHA1 -> CMD_SHA1SUM
  CMD: Remove CMD_LOG, it's unused
  CMD: Fix typo KGBD -> KGDB on debris board
  CMD: Drop CONFIG_CMD_EMMC, it's not used
  CMD: Drop CONFIG_CMD_DFL, it's not used
  CMD: Drop CMD_DCR, it's not used
  CMD: Drop CMD_CAN, it's not used
  CMD: Remove CMD_AUTOSCRIPT, it's not used
  AT91: Drop AT91_SPIMUX command from cmd_all

12 years agoPrepare v2012.04.01 v2012.04.01
Wolfgang Denk [Wed, 25 Apr 2012 13:22:50 +0000 (15:22 +0200)]
Prepare v2012.04.01

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agosandbox: Use the new run_command()
Simon Glass [Fri, 30 Mar 2012 21:30:57 +0000 (21:30 +0000)]
sandbox: Use the new run_command()

Now that run_command() handles both parsers, clean up sandbox to use it.
This fixes a build error.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoarm: restore fdt_fixup_ethernet call to do_bootm_linux
Stephen Warren [Thu, 19 Apr 2012 11:09:49 +0000 (11:09 +0000)]
arm: restore fdt_fixup_ethernet call to do_bootm_linux

Commit 0a672d4 "arm: Add Prep subcommand support to bootm" re-organized
do_bootm_linux for ARM. During the re-organization, the call to
fdt_fixup_ethernet() was removed. I assume this was useful, so add it
back.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Tom Rini <trini@ti.com>
12 years agoarm: fix bootm with device tree
Stephen Warren [Thu, 19 Apr 2012 11:34:00 +0000 (11:34 +0000)]
arm: fix bootm with device tree

Commit 0a672d4 "arm: Add Prep subcommand support to bootm" re-organized
do_bootm_linux() for ARM. During the re-organization, the code to pass
the device tree to the kernel was removed. Add it back. This restores
the ability to boot a kernel using device tree.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Tom Rini <trini@ti.com>
Acked-by: Allen Martin <amartin@nvidia.com>
Tested-by: Allen Martin <amartin@nvidia.com>
12 years agoFix the behaviour of the 'run' command
Timo Ketola [Sun, 22 Apr 2012 23:57:27 +0000 (23:57 +0000)]
Fix the behaviour of the 'run' command

If one command fails, 'run' command should terminate and not execute
any remaining variables.

Signed-off-by: Timo Ketola <timo@exertus.fi>
Tested-by: Wolfgang Denk <wd@denx.de>
Tested-by: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agoPrepare v2012.04 v2012.04
Wolfgang Denk [Sat, 21 Apr 2012 16:55:26 +0000 (18:55 +0200)]
Prepare v2012.04

Also tiny style cleanup to tools/patman/README

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agonet: ll_temac: drop obsolete "NAMESIZE" define
Stephan Linz [Tue, 10 Apr 2012 06:20:57 +0000 (06:20 +0000)]
net: ll_temac: drop obsolete "NAMESIZE" define

... after commit "net/miiphy/serial: drop duplicate NAMESIZE
define" (sha1:f6add13) was applied. The building of the new
LL TEMAC network driver fails with error below:

xilinx_ll_temac.c: In function 'xilinx_ll_temac_initialize':
xilinx_ll_temac.c:301: error: 'NAMESIZE' undeclared (first use in this function)
xilinx_ll_temac.c:301: error: (Each undeclared identifier is reported only once
xilinx_ll_temac.c:301: error: for each function it appears in.)

Signed-off-by: Stephan Linz <linz@li-pro.net>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoAdd 'patman' patch generation, checking and submission script
Simon Glass [Sat, 14 Jan 2012 15:12:45 +0000 (15:12 +0000)]
Add 'patman' patch generation, checking and submission script

What is this?

=============

This tool is a Python script which:
- Creates patch directly from your branch
- Cleans them up by removing unwanted tags
- Inserts a cover letter with change lists
- Runs the patches through checkpatch.pl and its own checks
- Optionally emails them out to selected people

It is intended to automate patch creation and make it a less
error-prone process. It is useful for U-Boot and Linux work so far,
since it uses the checkpatch.pl script.

It is configured almost entirely by tags it finds in your commits.
This means that you can work on a number of different branches at
once, and keep the settings with each branch rather than having to
git format-patch, git send-email, etc. with the correct parameters
each time. So for example if you put:

in one of your commits, the series will be sent there.

See the README file for full details.
END

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoeb_cpux9k2: add USB host support to board
Jens Scharsig [Mon, 11 Jul 2011 09:25:42 +0000 (09:25 +0000)]
eb_cpux9k2: add USB host support to board

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
12 years agommc: Fix warning if CONFIG_MMC_TRACE is enabled
Dirk Behme [Thu, 8 Mar 2012 02:35:34 +0000 (02:35 +0000)]
mmc: Fix warning if CONFIG_MMC_TRACE is enabled

Fix the warning

mmc.c: In function 'mmc_send_cmd':
mmc.c:87: warning: assignment from incompatible pointer type

in case CONFIG_MMC_TRACE is enabled.

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
CC: Andy Fleming <afleming@freescale.com>
Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Marek Vasut <marex@denx.de>
12 years agoehci-omap: fix for enabling the correct usb port
Jeroen Hofstee [Thu, 19 Apr 2012 11:25:18 +0000 (11:25 +0000)]
ehci-omap: fix for enabling the correct usb port

This is just a patch for the problem reported here:
http://lists.denx.de/pipermail/u-boot/2012-February/117580.html originally reported by Igor.

"Looks like this is copy paste error from my side,(for port2/3 it should have been bypass
 for port2/3 rather its port1 set in bypass mode)"

I only submit the patch since it is missing in 2012.04-rc3 while the twister board
depends on it. Maybe it is already somewhere in the reposistory, but I cannot find it.

note: the twister boards still needs an additional `usb reset`, don't know why.

U-Boot 2012.04-rc3-dirty (Apr 19 2012 - 21:38:38)

AM35XX-GP ES1.0, CPU-OPP2, L3-165MHz, Max CPU Clock 600 Mhz
TAM3517 TWISTER Board + LPDDR/NAND
I2C:   ready
DRAM:  256 MiB
NAND:  512 MiB
MMC:   OMAP SD/MMC: 0
In:    serial
Out:   serial
Err:   serial
Die ID #746c0000000000000155dc1405011024
Net:   DaVinci-EMAC, smc911x-0
Hit any key to stop autoboot:  0
twister => usb start
(Re)start USB...
USB:   Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
       scanning bus for storage devices... 0 Storage Device(s) found
twister => usb reset
(Re)start USB...
USB:   Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
       scanning bus for storage devices... 0 Storage Device(s) found
twister => usb reset
(Re)start USB...
USB:   Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
       scanning bus for storage devices... 0 Storage Device(s) found
twister => usb reset
(Re)start USB...
USB:   Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
       scanning bus for storage devices... 0 Storage Device(s) found

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Acked-by: Govindraj.R <govindraj.raja <at> ti.com>
Acked-by: Tom Rini <trini@ti.com>
12 years agofdt: avoid bad MAKEALL status
Wolfgang Denk [Thu, 19 Apr 2012 02:36:44 +0000 (02:36 +0000)]
fdt: avoid bad MAKEALL status

Current versions of  dtc  always print a message like

DTC: dts->dtb  on file "dt.dtb.tmp"

which cannot even be suppressed with "-qqq".  To avoid incorrect
MAKEALL status, we manually filter out this message.  This is a bit
complicated, as we have to make sure to set a correct return code.

Also, get rid of the temp file: dtc accepts "-" for stdin.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agofdt: fix out of tree builds with DT support
Wolfgang Denk [Thu, 19 Apr 2012 02:36:07 +0000 (02:36 +0000)]
fdt: fix out of tree builds with DT support

Fix: FATAL ERROR: Couldn't open "../arch/arm/dts/tegra20.dtsi": No
such file or directory

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agoGCC4.6: Squash warnings in onenand_base.c
Wolfgang Denk [Thu, 19 Apr 2012 01:14:17 +0000 (01:14 +0000)]
GCC4.6: Squash warnings in onenand_base.c

Fix gcc 4.6 build warnings:
onenand_base.c: In function 'onenand_probe':
onenand_base.c:2577:6: warning: variable 'maf_id' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
12 years agoCMD: CONFIG_CMD_SETECPR -> CONFIG_CMD_SETEXPR on omap3_logic
Marek Vasut [Sat, 31 Mar 2012 07:47:18 +0000 (07:47 +0000)]
CMD: CONFIG_CMD_SETECPR -> CONFIG_CMD_SETEXPR on omap3_logic

Signed-off-by: Marek Vasut <marex@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCMD: Fix CONFIG_CMD_SAVEBP_WRITE_SIZE -> CONFIG_CMD_SPL_WRITE_SIZE
Marek Vasut [Sat, 31 Mar 2012 07:47:17 +0000 (07:47 +0000)]
CMD: Fix CONFIG_CMD_SAVEBP_WRITE_SIZE -> CONFIG_CMD_SPL_WRITE_SIZE

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: scottwood@freescale.com
12 years agoCMD: Fix typo CMD_FSL -> CMD_MFSL in readme
Marek Vasut [Sat, 31 Mar 2012 07:47:16 +0000 (07:47 +0000)]
CMD: Fix typo CMD_FSL -> CMD_MFSL in readme

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: vapier@gentoo.org
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoHWW1U1A: Fix CMD_SHA1 -> CMD_SHA1SUM
Marek Vasut [Sat, 31 Mar 2012 07:47:14 +0000 (07:47 +0000)]
HWW1U1A: Fix CMD_SHA1 -> CMD_SHA1SUM

Fix typo

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Kyle.D.Moffett@boeing.com
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCMD: Remove CMD_LOG, it's unused
Marek Vasut [Sat, 31 Mar 2012 07:47:13 +0000 (07:47 +0000)]
CMD: Remove CMD_LOG, it's unused

$ git grep CMD_LOG
include/configs/kilauea.h:#define CONFIG_CMD_LOG
include/configs/lwmon5.h:#define CONFIG_CMD_LOG
include/configs/makalu.h:#define CONFIG_CMD_LOG
include/configs/quad100hd.h:#undef CONFIG_CMD_LOG
include/configs/zeus.h:#define CONFIG_CMD_LOG

Signed-off-by: Marek Vasut <marex@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCMD: Fix typo KGBD -> KGDB on debris board
Marek Vasut [Sat, 31 Mar 2012 07:47:12 +0000 (07:47 +0000)]
CMD: Fix typo KGBD -> KGDB on debris board

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: dogoil@etinsys.com
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCMD: Drop CONFIG_CMD_EMMC, it's not used
Marek Vasut [Sat, 31 Mar 2012 07:47:11 +0000 (07:47 +0000)]
CMD: Drop CONFIG_CMD_EMMC, it's not used

$ git grep CMD_EMMC
include/configs/u8500_href.h:#define CONFIG_CMD_EMMC

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: dirk.behme@googlemail.com
Cc: helmut.raiger@hale.at
Cc: john.rigby@linaro.org
Cc: vapier@gentoo.org
12 years agoCMD: Drop CONFIG_CMD_DFL, it's not used
Marek Vasut [Sat, 31 Mar 2012 07:47:10 +0000 (07:47 +0000)]
CMD: Drop CONFIG_CMD_DFL, it's not used

$ git grep CMD_DFL
board/atc/ti113x.c:#define CMD_DFLT (PCI_COMMAND_IO|PCI_COMMAND_MEMORY| \
board/atc/ti113x.c:     pci_writew (s, PCI_COMMAND, CMD_DFLT);
board/cpc45/pd67290.c:#define CMD_DFLT (PCI_COMMAND_IO|PCI_COMMAND_MEMORY| \
board/cpc45/pd67290.c:  pci_writew (s, PCI_COMMAND, CMD_DFLT);
drivers/pcmcia/i82365.c:#define CMD_DFLT (PCI_COMMAND_IO|PCI_COMMAND_MEMORY| \
drivers/pcmcia/i82365.c:        pci_writew (s, PCI_COMMAND, CMD_DFLT);
include/configs/MBX.h:#define CONFIG_CMD_DFL
include/configs/MigoR.h:#define CONFIG_CMD_DFL
include/configs/digsy_mtc.h:#define CONFIG_CMD_DFL
include/configs/ms7722se.h:#define CONFIG_CMD_DFL
include/configs/ms7750se.h:#define CONFIG_CMD_DFL
include/configs/r2dplus.h:#define CONFIG_CMD_DFL
include/configs/sh7757lcr.h:#define CONFIG_CMD_DFL
include/configs/sh7785lcr.h:#define CONFIG_CMD_DFL

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Pfister_Werner@intercontrol.de
Cc: iwamatsu@nigauri.org
Cc: nobuhiro.iwamatsu.yj@renesas.com
Cc: vapier@gentoo.org
Cc: wd@denx.de
Cc: yoshihiro.shimoda.uh@renesas.com
Acked-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agoCMD: Drop CMD_DCR, it's not used
Marek Vasut [Sat, 31 Mar 2012 07:47:09 +0000 (07:47 +0000)]
CMD: Drop CMD_DCR, it's not used

$ git grep CMD_DCR
include/configs/ep8260.h:#undef CONFIG_CMD_DCR

Signed-off-by: Marek Vasut <marex@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCMD: Drop CMD_CAN, it's not used
Marek Vasut [Sat, 31 Mar 2012 07:47:08 +0000 (07:47 +0000)]
CMD: Drop CMD_CAN, it's not used

$ git grep CMD_CAN
include/configs/jadecpu.h:#define CONFIG_CMD_CAN

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Matthias Weisser <weisserm@arcor.de>
12 years agoCMD: Remove CMD_AUTOSCRIPT, it's not used
Marek Vasut [Sat, 31 Mar 2012 07:47:07 +0000 (07:47 +0000)]
CMD: Remove CMD_AUTOSCRIPT, it's not used

$ git grep AUTOSCRIPT
include/configs/at91sam9m10g45ek.h:#undef CONFIG_CMD_AUTOSCRIPT
include/configs/gplugd.h:#define CONFIG_CMD_AUTOSCRIPT

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoAT91: Drop AT91_SPIMUX command from cmd_all
Marek Vasut [Sat, 31 Mar 2012 07:47:06 +0000 (07:47 +0000)]
AT91: Drop AT91_SPIMUX command from cmd_all

$ git grep AT91_SPIMUX
include/config_cmd_all.h:#define CONFIG_CMD_AT91_SPIMUX /* AT91 MMC/SPI Mux Support     */

It isn't used anywhere it seems.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoPrepare v2012.04-rc3 v2012.04-rc3
Wolfgang Denk [Wed, 18 Apr 2012 20:52:34 +0000 (22:52 +0200)]
Prepare v2012.04-rc3

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Wolfgang Denk [Wed, 18 Apr 2012 20:41:06 +0000 (22:41 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

* 'master' of git://git.denx.de/u-boot-sh:
  sh: ecovec: Change macro from BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT
  sh: Fix rsk7264 pin setup for on-board ethernet

12 years agosh: ecovec: Change macro from BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT
Nobuhiro Iwamatsu [Wed, 18 Apr 2012 02:05:20 +0000 (11:05 +0900)]
sh: ecovec: Change macro from BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT

When calling board_late_init, we need to define CONFIG_BOARD_LATE_INIT.
The latest ecovec config defines BOARD_LATE_INIT, board_late_init is not called.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agosh: Fix rsk7264 pin setup for on-board ethernet
Phil Edworthy [Tue, 10 Apr 2012 00:47:56 +0000 (00:47 +0000)]
sh: Fix rsk7264 pin setup for on-board ethernet

This sets up the external ethernet IRQ pin.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agoi.MX6: arm2: Add AXI cache and Qos setting
Dirk Behme [Thu, 12 Apr 2012 20:46:14 +0000 (20:46 +0000)]
i.MX6: arm2: Add AXI cache and Qos setting

Do the same AXI cache and Qos settings done already in the
SabreLite imximage.cfg for the ARM2 board, too.

It fixes a display flash issue caused by low priority of
the display IDMA channel.

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
CC: Jason Chen <b02280@freescale.com>
CC: Jason Liu <r64343@freescale.com>
CC: Stefano Babic <sbabic@denx.de>
CC: Fabio Estevam <festevam@gmail.com>
Acked-by: Jason Liu <r64343@freescale.com>
12 years agoPrepare v2012.04-rc2; minor Coding Style cleanup v2012.04-rc2
Wolfgang Denk [Mon, 16 Apr 2012 21:13:51 +0000 (23:13 +0200)]
Prepare v2012.04-rc2; minor Coding Style cleanup

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Mon, 16 Apr 2012 21:01:12 +0000 (23:01 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

* 'master' of git://git.denx.de/u-boot-arm:
  ARM926EJS: Fix cache.c to comply with checkpatch.pl
  ARM926EJS: Make asm routines volatile in cache ops
  MX35: mx35pdk: wrong board revision
  ARM1136: MX35: Make asm routines volatile in cache ops
  ARM: add u-boot.imx as target for i.MX SOCs
  M28: Pull out CONFIG_APBH_DMA so it's always enabled
  DMA: Split the APBH DMA init into block and channel init
  imx: Return gpio_set_value in gpio_direction_output
  imx: Use GPIO_TO_PORT macro in the gpio driver instead of (gpio >> 5)
  imx: Add GPIO_TO_PORT macro in the mxc_gpio driver
  imx: Remove unneeded/repititive definitions from imx headers
  i.MX28: Allow coexistence of PIO and DMA mode for SD/MMC
  MX31: mx31pdk: drop enable_caches from board file
  i.MX28: Fix initial stack pointer position
  mx35: mx35pdk: fix when cache functions are linked
  mx35: flea3: fix when cache functions are linked
  ARM: 926ejs: use debug() for misaligned addresses
  ARM1136: add cache flush and invalidate operations
  mx6qsabrelite: Fix the serial console port
  mx6qsabrelite: Add boot switch setting information into the README
  i.MX6: mx6qsabrelite: add cache commands if cache is enabled
  i.MX6: implement enable_caches()
  i.MX6: define CACHELINE_SIZE
  MX53: DDR: Fix ZQHWCTRL field TZQ_CS
  mx28evk: Add a README file
  mx28: Split the README into a common part and a m28 specific part
  tricorder: Load kernel from ubifs
  tricorder: Add UBIFS
  cm-t35: fix Ethernet reset timing
  hawkboard: Add CONFIG_SPL_LIBGENERIC_SUPPORT
  BeagleBoard: Remove userbutton command and use gpio command instead
  OMAP: Move omap1510inn to Unmaintained / Orphaned

12 years agoARM926EJS: Fix cache.c to comply with checkpatch.pl
Marek Vasut [Fri, 6 Apr 2012 03:25:07 +0000 (03:25 +0000)]
ARM926EJS: Fix cache.c to comply with checkpatch.pl

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
12 years agoARM926EJS: Make asm routines volatile in cache ops
Marek Vasut [Fri, 6 Apr 2012 03:25:06 +0000 (03:25 +0000)]
ARM926EJS: Make asm routines volatile in cache ops

We certainly don't want the compiler to reorganise the code for dcache flushing.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Stefano Babic <sbabic@denx.de>
12 years agoMX35: mx35pdk: wrong board revision
Stefano Babic [Mon, 9 Apr 2012 11:29:06 +0000 (13:29 +0200)]
MX35: mx35pdk: wrong board revision

The board revision is detected accessing to the pmic,
that is not available before relocation (I2C).
This generates the following error:

CPU:   Freescale i.MX35 rev 2.0 at 532 MHz.
Reset cause: WDOG
<reg num> = 7 is invalid. Should be less than 0
Board: MX35 PDK 1.0

The revision number is wrong, as a default value is printed
(tested on a mx35pdk Rev. 2.0).

Move the output in the board_late_init(), when
pmic can be accessed.

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoARM1136: MX35: Make asm routines volatile in cache ops
Stefano Babic [Mon, 9 Apr 2012 11:33:04 +0000 (13:33 +0200)]
ARM1136: MX35: Make asm routines volatile in cache ops

As well as pushed for ARM926EJS, we certainly don't want
the compiler to reorganise the code for dcache flushing
Fix checkpatch warnings as well.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Marek Vasut <marex@denx.de>
CC: Albert Aribaud <albert.u.boot@aribaud.net>
12 years agoARM: add u-boot.imx as target for i.MX SOCs
Stefano Babic [Tue, 3 Apr 2012 04:32:56 +0000 (04:32 +0000)]
ARM: add u-boot.imx as target for i.MX SOCs

Freescale SOCs require an header to u-boot.bin

The patch adds u-boot.imx to the default targets
if the imx file is set (IMX_CONFIG).

Signed-off-by: Stefano Babic <sbabic@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
CC: Loïc Minier <loic.minier@linaro.org>
CC: Mike Frysinger <vapier@gentoo.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Dirk Behme <dirk.behme@de.bosch.com>
Tested-by: Dirk Behme <dirk.behme@googlemail.com>
12 years agoM28: Pull out CONFIG_APBH_DMA so it's always enabled
Marek Vasut [Sun, 8 Apr 2012 17:09:06 +0000 (17:09 +0000)]
M28: Pull out CONFIG_APBH_DMA so it's always enabled

The ABPH DMA is now used also by the SD card. Therefore it has to be enabled
even if NAND is disabled.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
12 years agoDMA: Split the APBH DMA init into block and channel init
Marek Vasut [Sun, 8 Apr 2012 17:34:46 +0000 (17:34 +0000)]
DMA: Split the APBH DMA init into block and channel init

This fixes the issue where mxs_dma_init() was called either twice or never,
without introducing any new init hooks.

The idea is to allow each and every device using the APBH DMA block to
configure and request only the channels it uses, instead of making it call init
for all the channels as is now.

The common DMA block init part, which only configures the block, is then called
from CPUs arch_cpu_init() call.

NOTE: This patch depends on:

http://patchwork.ozlabs.org/patch/150957/

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agoimx: Return gpio_set_value in gpio_direction_output
Vikram Narayanan [Tue, 10 Apr 2012 04:26:30 +0000 (04:26 +0000)]
imx: Return gpio_set_value in gpio_direction_output

Return gpio_set_value in gpio_direction_output.
Earlier it returned 0 and ignored gpio_set_value's return value.

Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Acked-by: Stefano Babic <sbabic@denx.de>
12 years agoimx: Use GPIO_TO_PORT macro in the gpio driver instead of (gpio >> 5)
Vikram Narayanan [Tue, 10 Apr 2012 04:26:20 +0000 (04:26 +0000)]
imx: Use GPIO_TO_PORT macro in the gpio driver instead of (gpio >> 5)

Use the defined GPIO_TO_PORT macro. Remove gpio >> 5 references.

Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Acked-by: Stefano Babic <sbabic@denx.de>
12 years agoimx: Add GPIO_TO_PORT macro in the mxc_gpio driver
Vikram Narayanan [Tue, 10 Apr 2012 04:26:08 +0000 (04:26 +0000)]
imx: Add GPIO_TO_PORT macro in the mxc_gpio driver

Add GPIO_TO_PORT macro in the mxc_gpio.c driver

Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Acked-by: Stefano Babic <sbabic@denx.de>
12 years agoimx: Remove unneeded/repititive definitions from imx headers
Vikram Narayanan [Tue, 10 Apr 2012 04:25:57 +0000 (04:25 +0000)]
imx: Remove unneeded/repititive definitions from imx headers

Remove gpio related unused/repititive definitions from imx headers.

Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Acked-by: Stefano Babic <sbabic@denx.de>
12 years agoi.MX28: Allow coexistence of PIO and DMA mode for SD/MMC
Marek Vasut [Thu, 5 Apr 2012 03:30:35 +0000 (03:30 +0000)]
i.MX28: Allow coexistence of PIO and DMA mode for SD/MMC

This SD DMA function of i.MX28 is still apparently too experimental to be
enabled by default in 2012.04 release. Enable this feature only if the user
plans to tinker with DCache or explicitly enables it.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
12 years agoMX31: mx31pdk: drop enable_caches from board file
Stefano Babic [Fri, 6 Apr 2012 07:53:48 +0000 (09:53 +0200)]
MX31: mx31pdk: drop enable_caches from board file

enable_caches() is implemented now in cpu.c for
ARM1136.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agoi.MX28: Fix initial stack pointer position
Marek Vasut [Sun, 1 Apr 2012 18:21:34 +0000 (18:21 +0000)]
i.MX28: Fix initial stack pointer position

The patch:

  m28evk: Use GENERATED_GBL_DATA_SIZE
  commit 1084606c972ea5f1d89f69bdbd978b867d0ee521

introduced usage of GENERATED_GBL_DATA_SIZE and calculation of initial stack
pointer position defived from that. Due to a small typo, the SP position moved
to 0x21f80, which is past the SRAM area. This didn't manifest on the real
hardware as the SRAM repeats there (address bits in the CPU being ignored).

Though this was caught in QEMU, where it crashed the emulator.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agomx35: mx35pdk: fix when cache functions are linked
Stefano Babic [Sun, 1 Apr 2012 03:23:01 +0000 (03:23 +0000)]
mx35: mx35pdk: fix when cache functions are linked

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agomx35: flea3: fix when cache functions are linked
Stefano Babic [Sun, 1 Apr 2012 03:23:00 +0000 (03:23 +0000)]
mx35: flea3: fix when cache functions are linked

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoARM: 926ejs: use debug() for misaligned addresses
Stefano Babic [Mon, 2 Apr 2012 06:18:49 +0000 (06:18 +0000)]
ARM: 926ejs: use debug() for misaligned addresses

Misaligned warnings are useful to debug faulty drivers.
A misaligned warning is printed also when the driver
is correct - use debug() instead of printf().

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Albert Aribaud <albert.u.boot@aribaud.net>
CC: Mike Frysinger <vapier@gentoo.org>
CC: Marek Vasut <marex@denx.de>
Acked-by: Marek Vasut <marex@denx.de>
12 years agoARM1136: add cache flush and invalidate operations
Anatolij Gustschin [Mon, 2 Apr 2012 06:18:00 +0000 (06:18 +0000)]
ARM1136: add cache flush and invalidate operations

Since commit 5c1ad3e6f8ae578bbe30e09652f1531e9bc22031
(net: fec_mxc: allow use with cache enabled) the FEC_MXC
driver uses flush_dcache_range() and invalidate_dcache_range()
functions. This driver is also configured for ARM1136 based
'flea3' and 'mx35pdk' boards which currently do not build
as there are no ARM1136 specific flush_dcache_range() and
invalidate_dcache_range() functions. Add various ARM1136
cache functions to fix building for 'flea3' and 'mx35pdk'.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
CC: Mike Frysinger <vapier@gentoo.org>
CC: Marek Vasut <marex@denx.de>
Acked-by: Marek Vasut <marex@denx.de>
12 years agomx6qsabrelite: Fix the serial console port
Fabio Estevam [Wed, 28 Mar 2012 09:45:26 +0000 (09:45 +0000)]
mx6qsabrelite: Fix the serial console port

On mx6qsabrelite the console is ttymxc1.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agomx6qsabrelite: Add boot switch setting information into the README
Fabio Estevam [Thu, 29 Mar 2012 02:22:50 +0000 (02:22 +0000)]
mx6qsabrelite: Add boot switch setting information into the README

Add boot switch setting information into the README

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agoi.MX6: mx6qsabrelite: add cache commands if cache is enabled
Eric Nelson [Sun, 4 Mar 2012 11:47:39 +0000 (11:47 +0000)]
i.MX6: mx6qsabrelite: add cache commands if cache is enabled

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Marek Vasut <marex@denx.de>
12 years agoi.MX6: implement enable_caches()
Eric Nelson [Sun, 4 Mar 2012 11:47:38 +0000 (11:47 +0000)]
i.MX6: implement enable_caches()

disabled by default until drivers are fixed

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Marek Vasut <marex@denx.de>
12 years agoi.MX6: define CACHELINE_SIZE
Eric Nelson [Sun, 4 Mar 2012 11:47:37 +0000 (11:47 +0000)]
i.MX6: define CACHELINE_SIZE

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Marek Vasut <marex@denx.de>
12 years agoMX53: DDR: Fix ZQHWCTRL field TZQ_CS
Troy Kisky [Thu, 22 Mar 2012 12:00:31 +0000 (12:00 +0000)]
MX53: DDR: Fix ZQHWCTRL field TZQ_CS

Currently, board files are setting this field to 0x01
which the manual says is a reserved value. Change to
use the default of 0x02 - 128 cycles.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agomx28evk: Add a README file
Fabio Estevam [Sat, 24 Mar 2012 10:58:57 +0000 (10:58 +0000)]
mx28evk: Add a README file

Add a README file for mx28evk board.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Marek Vasut <marex@denx.de>
12 years agomx28: Split the README into a common part and a m28 specific part
Fabio Estevam [Sat, 24 Mar 2012 12:42:21 +0000 (12:42 +0000)]
mx28: Split the README into a common part and a m28 specific part

Split the README into a common part and a m28 specific part.

This will make things easier when adding new README files for other mx28
based boards.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Marek Vasut <marex@denx.de>
12 years agotricorder: Load kernel from ubifs
Bernhard Walle [Tue, 3 Apr 2012 00:37:04 +0000 (00:37 +0000)]
tricorder: Load kernel from ubifs

Signed-off-by: Bernhard Walle <walle@corscience.de>
12 years agotricorder: Add UBIFS
Bernhard Walle [Tue, 3 Apr 2012 00:37:03 +0000 (00:37 +0000)]
tricorder: Add UBIFS

Since kernel should be in a ubifs partition, we need UBIFS.
The greater malloc size is needed for UBIFS.

Signed-off-by: Bernhard Walle <walle@corscience.de>
Squashed two commits (UBIFS enabled and malloc size increased) into one.
Signed-off-by: Thomas Weber <weber@corscience.de>
12 years agocm-t35: fix Ethernet reset timing
Igor Grinberg [Mon, 2 Apr 2012 20:12:58 +0000 (20:12 +0000)]
cm-t35: fix Ethernet reset timing

The reset_net_chip() function has wrong timings for the reset pulse.

This appeared to work until:
0607e2b (ARMV7: OMAP: Write more than 1 byte at a time in i2c_write)

Fix the Ethernet support by introducing right timings.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
12 years agohawkboard: Add CONFIG_SPL_LIBGENERIC_SUPPORT
Tom Rini [Mon, 2 Apr 2012 06:33:43 +0000 (06:33 +0000)]
hawkboard: Add CONFIG_SPL_LIBGENERIC_SUPPORT

With older toolchains we need CONFIG_SPL_LIBGENERIC_SUPPORT in order for
CONFIG_SPL_NAND_SUPPORT to link.

Signed-off-by: Tom Rini <trini@ti.com>
12 years agoBeagleBoard: Remove userbutton command and use gpio command instead
Joel Fernandes [Sun, 11 Sep 2011 08:37:33 +0000 (08:37 +0000)]
BeagleBoard: Remove userbutton command and use gpio command instead

Remove userbutton command and do the detection in board config file using the gpio command

Signed-off-by: Joel A Fernandes <agnel.joel@gmail.com>
Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
12 years agoOMAP: Move omap1510inn to Unmaintained / Orphaned
Tom Rini [Wed, 28 Mar 2012 06:26:19 +0000 (06:26 +0000)]
OMAP: Move omap1510inn to Unmaintained / Orphaned

After removing omap1610inn for not building, move omap1510inn to
orphaned.  Also update boards.cfg to note it's part of the 'omap' SoC to
make sure the board is built more often and future breakage noticed
quicker.

Acked-by: Marek Vasut <marex@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
12 years agodrivers/mtd/spr_smi.c: Fix build warning
Anatolij Gustschin [Wed, 28 Mar 2012 04:27:54 +0000 (04:27 +0000)]
drivers/mtd/spr_smi.c: Fix build warning

Fix:
spr_smi.c: In function 'smi_write':
spr_smi.c:325:15: warning: variable 'WM' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Vipin Kumar <vipin.kumar@st.com>
12 years agoREADME: supported boards are in boards.cfg, not Makefile
Michael Jones [Thu, 15 Mar 2012 22:48:10 +0000 (22:48 +0000)]
README: supported boards are in boards.cfg, not Makefile

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
12 years agomkenvimage: Fix compiler warning
Dirk Behme [Thu, 5 Apr 2012 23:15:07 +0000 (23:15 +0000)]
mkenvimage: Fix compiler warning

Fix the compiler warning

mkenvimage.c: In function ‘main’:
mkenvimage.c:218: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’
mkenvimage.c:226: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’

introduced with the commit

mkenvimage: Use mmap() when reading from a regular file
6ee39f8055680654f9cc97b98dcce9588f1ab71e

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
CC: David Wagner <david.wagner@free-electrons.com>
CC: Anatolij Gustschin <agust@denx.de>
CC: Mike Frysinger <vapier@gentoo.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: David Wagner <deubeuliou@gmail.com>
12 years agoMove bootstage timer out of lib/time.c
Simon Glass [Thu, 5 Apr 2012 12:05:17 +0000 (12:05 +0000)]
Move bootstage timer out of lib/time.c

The standalone example does not have get_timer() defined, so we cannot
rely on it being available.

Move the timer function into boootstage.c to avoid this problem.

This corrects a build breakage for the standalone example on some boards.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
12 years agoconfigs: EB+MCF-EV123.h: Fix typo on CONFIG_SYS_HUSH_PARSER
Fabio Estevam [Sat, 31 Mar 2012 10:47:45 +0000 (10:47 +0000)]
configs: EB+MCF-EV123.h: Fix typo on CONFIG_SYS_HUSH_PARSER

Fix typo on CONFIG_SYS_HUSH_PARSER and also add  CONFIG_SYS_PROMPT_HUSH_PS2
to avoid build error.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agoMerge branch 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging
Wolfgang Denk [Mon, 9 Apr 2012 19:34:27 +0000 (21:34 +0200)]
Merge branch 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging

* 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging:
  LMB: Fix undefined lmb_reserve() on non-lmb platforms
  MIPS: fix endianess handling
  MIPS: fix inconsistency in config option for cache operation mode
  MIPS: board.c: fix init of flash data in bd_info

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Mon, 9 Apr 2012 15:10:01 +0000 (17:10 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-net

* 'master' of git://git.denx.de/u-boot-net:
  net/designware: Change timeout loop implementation
  net/designware: Set ANAR to 0x1e1
  net/designware: Program phy registers when auto-negotiation is ON
  net/designware: Try configuring phy on each dw_eth_init
  net/designware: Consecutive writes must have delay
  net/designware: Phy address fix
  net/designware: Fix the max frame length size
  net/designware: Fix to restore hw mac address
  microblaze: Wire up LL_TEMAC driver initialization
  microblaze: Add faked LL_TEMAC driver configuration
  microblaze: Enable several ethernet driver compilation
  net: ll_temac: Add LL TEMAC driver to u-boot
  Update net subsystem maintainer in doc/git-mailrc
  net/eth.c: fix eth_write_hwaddr() to use dev->enetaddr as fall back
  mvgbe: remove warning for unused methods

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-onenand
Wolfgang Denk [Mon, 9 Apr 2012 15:07:50 +0000 (17:07 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-onenand

* 'master' of git://git.denx.de/u-boot-onenand:
  onenand: samsung: Enable OneNAND support at Samsung's Exynos4210
  onenand: Replace ONENAND_IS_MLC() with ONENAND_HAS_4KB()
  onenand:samsung OneNAND chip probe functions added for GONI and Exynos4210
  onenand:samsung Target dependent OneNAND chip probe function

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-nios
Wolfgang Denk [Mon, 9 Apr 2012 15:00:45 +0000 (17:00 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-nios

* 'master' of git://git.denx.de/u-boot-nios:
  nios2 - adjust gbl data off to account for bd_info
  nios2: implement get_ticks and get_tbclk
  nios2: add flush_dcache_range function

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-x86
Wolfgang Denk [Mon, 9 Apr 2012 14:54:11 +0000 (16:54 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-x86

* 'master' of git://git.denx.de/u-boot-x86:
  x86: Remove dead code in eNET

12 years agoLMB: Fix undefined lmb_reserve() on non-lmb platforms
Marek Vasut [Sun, 1 Apr 2012 03:59:46 +0000 (03:59 +0000)]
LMB: Fix undefined lmb_reserve() on non-lmb platforms

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Tom Warren <TWarren@nvidia.com>
Cc: Graeme Russ <graeme.russ@gmail.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agonet/designware: Change timeout loop implementation
Amit Virdi [Mon, 26 Mar 2012 00:09:59 +0000 (00:09 +0000)]
net/designware: Change timeout loop implementation

The new implementation changes the timeout loop implementation to avoid 1 ms
delay in each failing test. It also configures the delay to 10usec.

Signed-off-by: Amit Virdi <amit.virdi@st.com>
12 years agonet/designware: Set ANAR to 0x1e1
Armando Visconti [Mon, 26 Mar 2012 00:09:58 +0000 (00:09 +0000)]
net/designware: Set ANAR to 0x1e1

This patch forces the advertised capabilities during auto
negotiation to always be 10/100 Mbps and half/full as duplexing.

Signed-off-by: Armando Visconti <armando.visconti@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
12 years agonet/designware: Program phy registers when auto-negotiation is ON
Vikas Manocha [Mon, 26 Mar 2012 00:09:57 +0000 (00:09 +0000)]
net/designware: Program phy registers when auto-negotiation is ON

If AN(auto-negotiation) is ON, speed bit of control register are not
applicable.  Also phy registers were not getting programmed as per the
result of AN. This patch sets only AN bit & restart AN bit for AN ON
selection & programs PHY registers as per AN result.

Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
12 years agonet/designware: Try configuring phy on each dw_eth_init
Vipin Kumar [Mon, 26 Mar 2012 00:09:56 +0000 (00:09 +0000)]
net/designware: Try configuring phy on each dw_eth_init

Phy autonegotiation works only when the ethernet cable is plugged in.
Since the phy was configured only at the init time, a plugged in cable
was necessary to initialize the phy properly.

This patch keeps a flag to check if the phy initialization has
succeeded, and calls configure_phy routine at every init if this flag
reports otherwise.

Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
12 years agonet/designware: Consecutive writes must have delay
Armando Visconti [Mon, 26 Mar 2012 00:09:55 +0000 (00:09 +0000)]
net/designware: Consecutive writes must have delay

This patch solves a TX/RX problem which happens at 10Mbps, due to the
fact that we are not respecting 4 cyles of the phy_clk (2.5MHz) between
two consecutive writes on the same register.

Signed-off-by: Armando Visconti <armando.visconti@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
12 years agonet/designware: Phy address fix
Vipin KUMAR [Mon, 26 Mar 2012 00:09:54 +0000 (00:09 +0000)]
net/designware: Phy address fix

The code assumes the phy address to be > 0, which is not true, the phy address
can be in the range 0-31.

Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
12 years agonet/designware: Fix the max frame length size
Vipin KUMAR [Mon, 26 Mar 2012 00:09:53 +0000 (00:09 +0000)]
net/designware: Fix the max frame length size

The max frame length for normal descriptor can be 0x7FF i.e 2047. It was wrongly
specified as 2048. Currently, the max descriptor length is around 1500, so
redefining the mask to 1600

Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
12 years agonet/designware: Fix to restore hw mac address
Vipin KUMAR [Mon, 26 Mar 2012 00:09:52 +0000 (00:09 +0000)]
net/designware: Fix to restore hw mac address

The network controller mac resets hardware address stored in MAC_HI and MAC_LO
registers if mac is resetted. So, hw mac address needs to be restored in case
mac is explicitly resetted from driver.

Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
12 years agoonenand: samsung: Enable OneNAND support at Samsung's Exynos4210
Lukasz Majewski [Wed, 9 Nov 2011 10:06:14 +0000 (11:06 +0100)]
onenand: samsung: Enable OneNAND support at Samsung's Exynos4210

Enable OneNAND support for Exynos4210 (C210 universal).

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
12 years agoonenand: Replace ONENAND_IS_MLC() with ONENAND_HAS_4KB()
Lukasz Majewski [Wed, 9 Nov 2011 09:30:06 +0000 (10:30 +0100)]
onenand: Replace ONENAND_IS_MLC() with ONENAND_HAS_4KB()

This replacement causes 4KB page size devices to work properly with u-boot.

The old ONENAND_IS_MLC() behavior has been preserved by explicit
setting of ONENAND_HAS_4KB_PAGE for those devices.

This change makes the onenand_base.c file more resembling the respective
kernel sources.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
Test HW:
       - Samsung S5PC110 GONI
       - Samsung S5PC210 Universal

12 years agomicroblaze: Wire up LL_TEMAC driver initialization
Stephan Linz [Sat, 25 Feb 2012 00:48:34 +0000 (00:48 +0000)]
microblaze: Wire up LL_TEMAC driver initialization

Initialize ll_temac driver.

Reported-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Stephan Linz <linz@li-pro.net>
12 years agomicroblaze: Add faked LL_TEMAC driver configuration
Stephan Linz [Sat, 25 Feb 2012 00:48:33 +0000 (00:48 +0000)]
microblaze: Add faked LL_TEMAC driver configuration

Expand the specific configuration for the microblaze-generic
board in xparameters.h with a faked setup to enable the
LL_TEMAC driver.

Note: From now the microblaze-generic board is no longer a
valid board configuration for a real piece of hardware. Rather
than, we use the file config.mk and xparameters.h as a faked
board configuration to force the compilation of all potential
driver code for Microblaze systems.

Signed-off-by: Stephan Linz <linz@li-pro.net>
12 years agomicroblaze: Enable several ethernet driver compilation
Stephan Linz [Sat, 25 Feb 2012 00:48:32 +0000 (00:48 +0000)]
microblaze: Enable several ethernet driver compilation

U-Boot's multipple network supports enables to use
several ethernet drivers but microblaze-generic
platform config file select only one driver.

Reported-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Stephan Linz <linz@li-pro.net>
12 years agonet: ll_temac: Add LL TEMAC driver to u-boot
Stephan Linz [Sat, 25 Feb 2012 00:48:31 +0000 (00:48 +0000)]
net: ll_temac: Add LL TEMAC driver to u-boot

Xilinx LocalLink Tri-Mode Ether MAC driver can be
used by Xilinx Microblaze or Xilinx ppc405/440 in
SDMA and FIFO mode. DCR or XPS bus can be used.

The driver uses and requires MII and PHYLIB.

CP: 4 warnings: 'Use of volatile is usually wrong'
I won't fix this, because it depends on the network
driver subsystem.

Reported-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Stephan Linz <linz@li-pro.net>
12 years agoonenand:samsung OneNAND chip probe functions added for GONI and Exynos4210
Lukasz Majewski [Wed, 9 Nov 2011 10:27:14 +0000 (11:27 +0100)]
onenand:samsung OneNAND chip probe functions added for GONI and Exynos4210

Separate callback for probing OneNAND memory chip.

Tested at:
       Samsung S5PC110 GONI
       Samsung Exynos4210 (S5PC210 Universal)

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
12 years agoonenand:samsung Target dependent OneNAND chip probe function
Lukasz Majewski [Wed, 9 Nov 2011 10:25:32 +0000 (11:25 +0100)]
onenand:samsung Target dependent OneNAND chip probe function

Separate callback for probing OneNAND memory chip.
If no special function is defined, default implementation will be used.

This approach gives more flexibility for OneNAND device probing.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>