]> git.karo-electronics.de Git - karo-tx-uboot.git/log
karo-tx-uboot.git
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>
12 years agoUpdate net subsystem maintainer in doc/git-mailrc
Joe Hershberger [Wed, 4 Apr 2012 00:56:34 +0000 (19:56 -0500)]
Update net subsystem maintainer in doc/git-mailrc

Signed-off-by: Joe Hershberger <joe.hershberger@gmail.com>
12 years agonet/eth.c: fix eth_write_hwaddr() to use dev->enetaddr as fall back
Eric Miao [Wed, 18 Jan 2012 22:56:33 +0000 (22:56 +0000)]
net/eth.c: fix eth_write_hwaddr() to use dev->enetaddr as fall back

Ignore the return value of eth_getenv_enetaddr_by_index(), and if it
fails, fall back to use dev->enetaddr, which could be filled up by
the ethernet device driver:

With the current code, introduced with below commit, eth_write_hwaddr()
will fail immediately if there is no eth<n>addr in the environment variables.

However, e.g. for an overo based product that uses the SMSC911x ethernet
chip (with the MAC address set via EEPROM connected to the SMSC911x chip),
the MAC address is still OK.

On mx28 boards that are depending on the OCOTP bits to set the MAC address
(like the Denx m28 board), the OCOTP bits should be used instead of
failing on the environment variables.

Actually, this was the original behavior, and was later changed by
commit 7616e7850804c7c69e0a22c179dfcba9e8f3f587.

Signed-off-by: Eric Miao <eric.miao@linaro.org>
Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Dirk Behme <dirk.behme@de.bosch.com>
CC: Stefan Roese <sr@denx.de>
CC: Eric Miao <eric.miao@linaro.org>
CC: Wolfgang Denk <wd@denx.de>
CC: Philip Balister <philip@balister.org>
CC: Zach Sadecki <zach@itwatchdogs.com>
12 years agomvgbe: remove warning for unused methods
Stefan Bigler [Mon, 26 Mar 2012 00:02:13 +0000 (00:02 +0000)]
mvgbe: remove warning for unused methods

Some baords may use the GBE interface but they have no
phy connected to the interface and a direct MAC/MAC interface.
For them we need to get rid of compiler warnings.

Signed-off-by: Stefan Bigler <stefan.bigler@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
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 agoMIPS: fix endianess handling
Daniel Schwierzeck [Mon, 2 Apr 2012 02:57:56 +0000 (02:57 +0000)]
MIPS: fix endianess handling

Make endianess of target CPU configurable. Use the new config
option for dbau1550_el and pb1000 boards.

Adapt linking of standalone applications to pass through
endianess options to LD.

Build tested with:
 - ELDK 4 mips_4KC- and mips4KCle
 - Sourcery CodeBench Lite 2011.03-93

With this patch all 26 MIPS boards can be compiled now in one step by
running "MAKEALL -a mips".

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
12 years agoMIPS: fix inconsistency in config option for cache operation mode
Daniel Schwierzeck [Mon, 2 Apr 2012 02:57:55 +0000 (02:57 +0000)]
MIPS: fix inconsistency in config option for cache operation mode

Commit ab2a98b11716364bc5a8c43cdfa7fee176cda1d8 missed to
use the new config option in dcache_enable().

Fix this to avoid inconsistencies if someone wants to disable
and enable D-caches.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
12 years agoMIPS: board.c: fix init of flash data in bd_info
Daniel Schwierzeck [Mon, 2 Apr 2012 02:57:54 +0000 (02:57 +0000)]
MIPS: board.c: fix init of flash data in bd_info

Boards with CONFIG_SYS_NO_FLASH should not forced to define
CONFIG_SYS_FLASH_BASE. In this case the flash data in bd_info
should be initialized with 0 like the other archs do.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
12 years agox86: Remove dead code in eNET
Simon Glass [Wed, 14 Mar 2012 16:16:01 +0000 (16:16 +0000)]
x86: Remove dead code in eNET

This avoids a compiler warning about unused variables.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-By: Graeme Russ <graeme.russ@gmail.com>
12 years agoPrepare v2012.04-rc1 v2012.04-rc1
Wolfgang Denk [Fri, 30 Mar 2012 22:13:05 +0000 (00:13 +0200)]
Prepare v2012.04-rc1

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agonet/altera_tse: use flush_dcache_range instead of flush_dcache
Stefan Kristiansson [Fri, 4 Nov 2011 02:38:07 +0000 (02:38 +0000)]
net/altera_tse: use flush_dcache_range instead of flush_dcache

flush_dcache is not declared in the common.h API,
flush_dcache_range however is

Signed-off-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Ben Warren <biggerbadderben@gmail.com>
Cc: Thomas Chou <thomas@wytron.com.tw>
Acked-by: Thomas Chou <thomas@wytron.com.tw>
12 years agonet/ethoc: use flush_dcache_range instead of flush_dcache
Stefan Kristiansson [Fri, 4 Nov 2011 02:38:06 +0000 (02:38 +0000)]
net/ethoc: use flush_dcache_range instead of flush_dcache

flush_dcache is not declared in the common.h API,
flush_dcache_range however is

Signed-off-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Ben Warren <biggerbadderben@gmail.com>
Cc: Thomas Chou <thomas@wytron.com.tw>
Acked-by: Thomas Chou <thomas@wytron.com.tw>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Fri, 30 Mar 2012 21:56:04 +0000 (23:56 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

* 'master' of git://git.denx.de/u-boot-usb:
  Enable high speed support for USB device framework and usbtty

12 years agoRAMDISK: Fix unused variable issue caused by raw rd support
Marek Vasut [Fri, 30 Mar 2012 21:19:10 +0000 (23:19 +0200)]
RAMDISK: Fix unused variable issue caused by raw rd support

image.c: In function ‘boot_get_ramdisk’:
image.c:800:8: warning: unused variable ‘end’ [-Wunused-variable]

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
12 years agoBOOT: Add RAW ramdisk support to bootz
Marek Vasut [Sun, 18 Mar 2012 11:47:58 +0000 (11:47 +0000)]
BOOT: Add RAW ramdisk support to bootz

This patch allows loading RAW ramdisk via bootz command. The raw ramdisk is
loaded only in case it's size is specified:

  bootz <kernel addr> <ramdisk addr>:<ramdisk size> <fdt addr>

For example:

  bootz 0x42000000 0x43000000:0x12345 0x44000000

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Tom Warren <TWarren@nvidia.com>
Cc: albert.u.boot@aribaud.net
Cc: afleming@gmail.com
Cc: Simon Glass <sjg@chromium.org>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
12 years agoBOOT: Add "bootz" command to boot Linux zImage on ARM
Marek Vasut [Wed, 14 Mar 2012 21:52:45 +0000 (21:52 +0000)]
BOOT: Add "bootz" command to boot Linux zImage on ARM

This command boots Linux zImage from where the zImage is loaded to. Passing
initrd and fdt is supported.

Tested on i.MX28 based DENX M28EVK
Tested on PXA270 based Voipac PXA270.

NOTE: This currently only supports ARM, but other architectures can be easily
added by defining bootz_setup().

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Warren <TWarren@nvidia.com>
Cc: albert.u.boot@aribaud.net
Cc: afleming@gmail.com,
Cc: Simon Glass <sjg@chromium.org>,
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
12 years agomx28evk: fix build error
Anatolij Gustschin [Fri, 30 Mar 2012 05:45:27 +0000 (05:45 +0000)]
mx28evk: fix build error

Fix:
drivers/mmc/libmmc.o: In function `mxsmmc_send_cmd':
/home/ag/git/u-boot/drivers/mmc/mxsmmc.c:210: undefined reference to `mxs_dma_desc_append'
/home/ag/git/u-boot/drivers/mmc/mxsmmc.c:211: undefined reference to `mxs_dma_go'
drivers/mmc/libmmc.o: In function `mxsmmc_initialize':
/home/ag/git/u-boot/drivers/mmc/mxsmmc.c:306: undefined reference to `mxs_dma_desc_alloc'

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agopci: declare pciauto functions in header
Linus Walleij [Sun, 25 Mar 2012 12:13:15 +0000 (12:13 +0000)]
pci: declare pciauto functions in header

The FSL PCI driver uses local prototypes for
pciauto_[pre|post]scan_setup_bridge(), this does not seem right,
so move them to the <pci.h> file.

Fixed a small extern declaration too, this is harmless but distracts
the view since all other prototypes are explicitly external.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
12 years agopci: get rid of local prototypes
Linus Walleij [Sun, 25 Mar 2012 12:13:05 +0000 (12:13 +0000)]
pci: get rid of local prototypes

two boards were redeclaring pciauto_region_allocate() in their local
scope for no obvious reason, the function is in <pci.h> anyway,
this is probably just copying artifacts and old cruft.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
12 years agoAdd support for loading and saving the environment to a FAT partition
Maximilian Schwerin [Mon, 12 Mar 2012 23:57:50 +0000 (23:57 +0000)]
Add support for loading and saving the environment to a FAT partition

The following must be defined:

CONFIG_ENV_IS_IN_FAT
Enable this saving environment to FAT.

FAT_ENV_INTERFACE
Interface the FAT resides on (e.g. mmc).

FAT_ENV_DEVICE
The interface device number (e.g. 0 for mmc0)

FAT_ENV_PART
The device part (e.g. 1 for mmc0:1)

FAT_ENV_FILE
The filename of the environment file.

Author:    Maximilian Schwerin <mvs@tigris.de>

Removed dead DEBUG comment.
Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoMAKEALL: Add -m/-M option to determine maintainers
Marek Vasut [Mon, 5 Mar 2012 15:10:51 +0000 (15:10 +0000)]
MAKEALL: Add -m/-M option to determine maintainers

The -m option tries to find the board in MAINTAINERS file and figure out the
email. The -M option lists boards including their maintainers emails and all
affiliated emails. There are multiple strategies used to retrieve these emails:

1) Check board/<boardname> with git log and use three most recent emails
2) Check board/<boardname> with git log and use three most used emails
3) Try finding board in MAINTAINERS file and retrieve all emails from there

The result is then sorted and unique results are retrieved and reported.

For -m option, only strategy 3) is used.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
12 years agocmd_log: print log->v2.con value in the "log info" command
Heiko Schocher [Tue, 14 Feb 2012 22:21:07 +0000 (22:21 +0000)]
cmd_log: print log->v2.con value in the "log info" command

print in the "log info" command, if "log_version = 2" also the
value from "log->v2.con".

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
12 years agocommand, log: Coding Style cleanup
Heiko Schocher [Tue, 14 Feb 2012 22:21:06 +0000 (22:21 +0000)]
command, log: Coding Style cleanup

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
12 years agocommand, log: print with "log show" a full logbuffer
Heiko Schocher [Thu, 16 Feb 2012 01:02:21 +0000 (01:02 +0000)]
command, log: print with "log show" a full logbuffer

If the logbuffer contains LOGBUFF_LEN chars, they never got
printed with the "log show" command, because chars get
printed with the following for loop:

for (i = 0; i < (size & LOGBUFF_MASK); i++) {

with size = LOGBUFF_LEN and LOGBUFF_MASK = (LOGBUFF_LEN-1)
for loop never executed ...

Fix this.

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
Fixed merge conflict.
Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agodrivers/mmc/mmc.c: Fix build warning
Anatolij Gustschin [Wed, 28 Mar 2012 21:24:32 +0000 (21:24 +0000)]
drivers/mmc/mmc.c: Fix build warning

Fix:
mmc.c: In function 'mmc_bounce_buffer_start':
mmc.c:132:13: warning: no return statement in function returning
non-void [-Wreturn-type]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Andy Fleming <afleming@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Acked-by: Marek Vasut <marex@denx.de>
12 years agodrivers/mmc/tegra2_mmc.c: fix GCC 4.6 warning
Anatolij Gustschin [Wed, 28 Mar 2012 03:40:00 +0000 (03:40 +0000)]
drivers/mmc/tegra2_mmc.c: fix GCC 4.6 warning

Fix:
tegra2_mmc.c: In function 'mmc_send_cmd':
tegra2_mmc.c:230:3: warning: 'mask' may be used uninitialized in this
function [-Wuninitialized]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Doug Anderson <dianders@chromium.org>
Cc: Tom Warren <twarren@nvidia.com>
12 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Fri, 30 Mar 2012 18:17:11 +0000 (20:17 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  lzma: fix printf warnings
  Remove CONFIG_SYS_EXTBDINFO from snapper9260.h
  cmd_pxe.c: fix strict-aliasing warnings
  net: smc91111: use mdelay()
  doc: Fix some typos in different files
  disk/part.c: Fix device enumeration through API
  mkenvimage: Really set the redundant byte when applicable
  mkenvimage: Don't try to detect comments in the input file
  mkenvimage: Use mmap() when reading from a regular file
  mkenvimage: Read/Write from/to stdin/out by default or if the filename is "-"
  mkenvimage: More error handling
  mkenvimage: Correct an include and add a missing one
  mkenvimage: correct and clarify comments and error messages
  MAKEALL: display SPL size if present
  ARMV7/Vexpress: add missing get_ticks() and get_tbclk()
  mkenvimage: fix usage message
  cmd_fat: add FAT write command
  fs/fat/fat_write.c: Fix GCC 4.6 warnings
  FAT write: Fix compile errors

12 years agoMerge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Wolfgang Denk [Fri, 30 Mar 2012 18:17:02 +0000 (20:17 +0200)]
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
  lzma: fix printf warnings
  Remove CONFIG_SYS_EXTBDINFO from snapper9260.h
  cmd_pxe.c: fix strict-aliasing warnings
  net: smc91111: use mdelay()
  doc: Fix some typos in different files
  disk/part.c: Fix device enumeration through API
  mkenvimage: Really set the redundant byte when applicable
  mkenvimage: Don't try to detect comments in the input file
  mkenvimage: Use mmap() when reading from a regular file
  mkenvimage: Read/Write from/to stdin/out by default or if the filename is "-"
  mkenvimage: More error handling
  mkenvimage: Correct an include and add a missing one
  mkenvimage: correct and clarify comments and error messages
  MAKEALL: display SPL size if present
  ARMV7/Vexpress: add missing get_ticks() and get_tbclk()
  mkenvimage: fix usage message
  cmd_fat: add FAT write command
  fs/fat/fat_write.c: Fix GCC 4.6 warnings
  FAT write: Fix compile errors

12 years agopost: remove #warning for kirkwood CPUs
Valentin Longchamp [Fri, 30 Mar 2012 03:29:28 +0000 (03:29 +0000)]
post: remove #warning for kirkwood CPUs

Since commit 96f5c4b the needed functions (get_ticks() and get_tbclk() )
are defined for kirkwood CPUs as well. This warning is then not relevant
anymore.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Holger Brunck <holger.brunck@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
cc: Albert Aribaud <albert.u.boot@aribaud.net>

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Fri, 30 Mar 2012 16:09:08 +0000 (18:09 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

* 'master' of git://git.denx.de/u-boot-arm: (146 commits)
  arm: Use common .lds file where possible
  arm: add a common .lds link script
  arm: Remove unneeded setting of LDCSRIPT
  Define CPUDIR for the .lds link script
  arm: Remove zipitz2 link script
  Allow arch directory to contain .lds without requiring Makefile
  OMAP: Remove omap1610inn-based boards
  arch/arm/cpu/armv7/omap-common/clocks-common.c: Fix build warnings
  board/ti/beagle/beagle.c: Fix build warnings
  sdrc.c: Fix typo in do_sdrc_init() for SPL
  tegra: i2c: Add I2C driver
  tegra: fdt: i2c: Add extra I2C bindings for U-Boot
  tegra: i2c: Select I2C ordering for Seaboard
  tegra: i2c: Enable I2C on Seaboard
  tegra: i2c: Select number of controllers for Tegra2 boards
  tegra: i2c: Initialise I2C on Nvidia boards
  tegra: Enhance clock support to handle 16-bit clock divisors
  fdt: Add function to allow aliases to refer to multiple nodes
  tegra: Rename NV_PA_PMC_BASE to TEGRA2_PMC_BASE
  tegra: fdt: Enable FDT support for Ventana
  tegra: fdt: Enable FDT support for Seaboard
  tegra: usb: Enable USB on Seaboard
  tegra: usb: Add common USB defines for tegra2 boards
  tegra: usb: Add USB support to nvidia boards
  arm: Check for valid FDT after console is up
  fdt: Avoid early panic() when there is no FDT present
  tegra: usb: Add support for Tegra USB peripheral
  tegra: fdt: Add function to return peripheral/clock ID
  usb: Add support for txfifo threshold
  tegra: usb: fdt: Add USB definitions for Tegra2 Seaboard
  tegra: usb: fdt: Add additional device tree definitions for USB ports
  tegra: fdt: Add clock bindings for Tegra2 Seaboard
  tegra: fdt: Add clock bindings
  tegra: fdt: Add additional USB binding
  fdt: Add tegra-usb bindings file from linux
  fdt: Add staging area for device tree binding documentation
  tegra: fdt: Add device tree file for Tegra2 Seaboard from kernel
  tegra: fdt: Add Tegra2x device tree file from kernel
  arm: fdt: Add skeleton device tree file from kernel
  fdt: Add basic support for decoding GPIO definitions
  fdt: Add functions to access phandles, arrays and bools
  fdt: Tidy up a few fdtdec problems
  fdt: Add tests for fdtdec
  fdt: Add fdtdec_find_aliases() to deal with alias nodes
  arm: Tegra2: Fix ELDK42 gcc failure with inline asm stack pointer load
  net: fec_mxc: allow use with cache enabled
  net: force PKTALIGN to ARCH_DMA_MINALIGN
  i.MX28: Enable caches by default
  i.MX28: Make use of the bounce buffer
  i.MX28: Do data transfers via DMA in MMC driver
  MMC: Implement generic bounce buffer
  i.MX28: Add cache support to MXS NAND driver
  i.MX28: Add cache support into the APBH DMA driver
  ARM926EJS: Implement cache operations
  board/vpac270/onenand.c: Fix build errors
  nhk8815: fix build errors
  atmel-boards: add missing atmel_mci.h
  ARM: highbank: setup env from boot source register
  ARM: highbank: change env config to use nvram
  ARM: highbank: add reset support
  ARM: highbank: Add boot counter support
  ARM: highbank: change TEXT_BASE to 0x8000
  ARM: highbank: fix us_to_tick calculation
  ARM: highbank: add missing get_tbclk
  ARM: highbank: fix warning for calxedaxgmac_initialize
  net: calxedaxgmac: fix build due to missing __aligned definition
  EXYNOS: Add structure for Exynos4 DMC
  EXYNOS: SMDK5250: Support all 4 UARTs
  ARM: fix s3c2410 timer code
  ARM: davinci: fixes for cam_enc_4xx board
  omap3_spi: receive transmit mode
  calimain, enbw_cmc: Fix typo in comments
  Davinci: ea20: use gpio framework to access gpios
  OMAP3: mt_ventoux: sets its own mtdparts
  OMAP3: mt_ventoux: updated timing for FPGA
  twl4030: fix potential power supply handling issues
  NAND: TI: fix warnings in omap_gpmc.c
  cam_enc_4xx: Rename 'images' to 'imgs'
  arm: Add Prep subcommand support to bootm
  OMAP3: twister: add support to boot Linux from SPL
  SPL: call cleanup_before_linux() before booting Linux
  OMAP3: SPL: do not call I2C init if no I2C is set.
  Add cache functions to SPL for armv7
  devkit8000: Implement and activate direct OS boot
  omap/spl: change output of spl_parse_image_header
  omap-common/spl: Add linux boot to SPL
  devkit8000/spl: init GPMC for dm9000 in SPL
  omap-common: Add NAND SPL linux booting
  devkit8000: add config for spl command
  Add cmd_spl command
  mx53ard: Initialize return code with error
  mx53: Make PLL2 to be the parent of UART clock
  configs: imx: Use CONFIG_SF_DEFAULT_CS
  mx28evk: Provide default values for SPI bus and chip select
  USB: ehci-mx6: Add proper IO accessors
  mx6: Read silicon revision from register
  i.MX28: Drop __naked function from spl_mem_init
  mxs_spi: Return proper timeout error
  i.MX28: Make the stabilization delays shorter
  pmic_i2c: Return error in case of invalid pmic_i2c_tx_num
  mx6: Remove duplicate definition of ANATOP_BASE_ADDR
  mx6: Fix reset cause for Power On Reset case
  i.MX6: mx6qsabrelite: add MACH_TYPE_MX6Q_SABRELITE
  i.MX6: mx6q_sabrelite: add CONFIG_REVISION_TAG
  i.MX28: Enable additional DRAM address bits
  mx6q: mx6qsabrelite: setup_spi() should be called in board_init to allow use for environment
  mx31: add "ARM11P power gating" to get_reset_cause
  mx31pdk: Fix CONFIG_SYS_MEMTEST_END
  efikamx: Fix CONFIG_SYS_MEMTEST_END
  mx53smd: Fix CONFIG_SYS_MEMTEST_END
  mx53evk: Fix CONFIG_SYS_MEMTEST_END
  mx51evk: Fix CONFIG_SYS_MEMTEST_END
  i.MX6: mx6qsabrelite: add ext2 support
  imximage: Remove overwriting of flash_offset
  IXP: Fix GPIO_INT_ACT_LOW_SET()
  IXP: Fix NAND build warning on PDNB3 and SCPU
  IXP: Move PDNB3 and SCPU from Makefile to boards.cfg
  IXP: Squash warnings in IXP NPE
  IXP: Fix missing MACH_TYPE_{ACTUX?,PNB3,DVLHOST}
  IXP: Make IXP buildable with arm-linux- toolchains
  Examples: Properly append LDFLAGS to LD command
  SPL: Enable YMODEM support on BeagleBone and AM335x EVM
  SPL: Add YMODEM over UART load support
  SPL: Add README.omap3
  README: document more SPL config options
  spl.c: Use __noreturn decorator
  config.mk: Check for -fstack-usage support
  config.mk: Make cc-option create a file under include/generated
  ...

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-microblaze
Wolfgang Denk [Fri, 30 Mar 2012 16:01:39 +0000 (18:01 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-microblaze

* 'master' of git://git.denx.de/u-boot-microblaze:
  microblaze: Enable phylib and mii support

12 years agoarm: Use common .lds file where possible
Simon Glass [Mon, 20 Feb 2012 20:17:52 +0000 (20:17 +0000)]
arm: Use common .lds file where possible

Each cpu directory currently has its own .lds file. This is only needed
in most cases because the start.o file is in a different subdir.

Now that we can factor out this difference, we can move most cpus over
to the common .lds file.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoarm: add a common .lds link script
Simon Glass [Thu, 23 Feb 2012 03:28:41 +0000 (03:28 +0000)]
arm: add a common .lds link script

Most ARM CPUs use a very similar link script. This adds a basic
script that can be used by most CPUs.

Two new symbols are introduced which are intended to eventually be
defined on all architectures to make things easier for generic relocation
and reduce special-case code for each architecture:

__image_copy_start is the start of the text area (equivalent to the
existing _start on ARM). It marks the start of the region which must be
copied to a new location during relocation. This symbol is called
__text_start on x86 and microblaze.

__image_copy_end is the end of the region which must be copied to a new
location during relocation. It is normally equal to the start of the BSS
region, but this can vary in some cases (SPL?). Making this an explicit
symbol on its own removes any ambiguity and permits common code to always
do the right thing.

This new script makes use of CPUDIR, now defined by both Makefile and
spl/Makefile, to find the directory containing the start.o object file,
which is always placed first in the image.

To permit MMU setup prior to relocation (as used by pxa) we add an area
to the link script which contains space for this. This is taken
from commit 7f4cfcf. CPUs can put the contents in there using their
start.S file. BTW, shouldn't that area be 16KB-aligned?

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoarm: Remove unneeded setting of LDCSRIPT
Simon Glass [Mon, 21 Nov 2011 10:49:41 +0000 (10:49 +0000)]
arm: Remove unneeded setting of LDCSRIPT

This is set by the top level Makefile anyway, so drop it. This does
have the effect of changing the order - now the board link script will
have preference over the CPU one. But this seems more correct anyway.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoDefine CPUDIR for the .lds link script
Simon Glass [Mon, 21 Nov 2011 10:49:40 +0000 (10:49 +0000)]
Define CPUDIR for the .lds link script

Most link scripts differ only in the directory containing the start.o
file. Make this a #define to remove this last difference.

(Note that if start.o were disallowed outside the CPU start directory then
we wouldn't even need this. But that is a separate discussion.)

Signed-off-by: Simon Glass <sjg@chromium.org>