]> git.kernelconcepts.de Git - karo-tx-uboot.git/log
karo-tx-uboot.git
12 years agoIXP NPE: add support for fixed-speed MII ports
Michael Schwingen [Sun, 22 May 2011 22:00:08 +0000 (00:00 +0200)]
IXP NPE: add support for fixed-speed MII ports

Signed-off-by: Michael Schwingen <michael@schwingen.org>
12 years agoupdate/fix AcTux4 board
Michael Schwingen [Sun, 22 May 2011 22:00:07 +0000 (00:00 +0200)]
update/fix AcTux4 board

Signed-off-by: Michael Schwingen <michael@schwingen.org>
12 years agoupdate/fix AcTux3 board
Michael Schwingen [Sun, 22 May 2011 22:00:06 +0000 (00:00 +0200)]
update/fix AcTux3 board

Signed-off-by: Michael Schwingen <michael@schwingen.org>
12 years agoupdate/fix AcTux2 board
Michael Schwingen [Sun, 22 May 2011 22:00:05 +0000 (00:00 +0200)]
update/fix AcTux2 board

Signed-off-by: Michael Schwingen <michael@schwingen.org>
12 years agoupdate/fix AcTux1 board
Michael Schwingen [Sun, 22 May 2011 22:00:04 +0000 (00:00 +0200)]
update/fix AcTux1 board

Signed-off-by: Michael Schwingen <michael@schwingen.org>
12 years agouse -ffunction-sections / --gc-sections on IXP42x
Michael Schwingen [Sun, 22 May 2011 22:00:03 +0000 (00:00 +0200)]
use -ffunction-sections / --gc-sections on IXP42x

Signed-off-by: Michael Schwingen <michael@schwingen.org>
12 years agosupport CONFIG_SYS_LDSCRIPT on ARM
Michael Schwingen [Sun, 22 May 2011 22:00:02 +0000 (00:00 +0200)]
support CONFIG_SYS_LDSCRIPT on ARM

Signed-off-by: Michael Schwingen <michael@schwingen.org>
12 years agofix "depend" target in npe directory
Michael Schwingen [Sun, 22 May 2011 22:00:01 +0000 (00:00 +0200)]
fix "depend" target in npe directory

Signed-off-by: Michael Schwingen <michael@schwingen.org>
12 years agoFix IXP code to work after relocation was added
Michael Schwingen [Sun, 22 May 2011 22:00:00 +0000 (00:00 +0200)]
Fix IXP code to work after relocation was added

 - jump to real flash location after reset before turning off flash mirror
 - fix timer system to use HZ == 1000, remove broken interrupt-based code

Signed-off-by: Michael Schwingen <michael@schwingen.org>
12 years agotrigger hardware watchdog in IXP42x serial driver
Michael Schwingen [Sun, 22 May 2011 21:59:59 +0000 (23:59 +0200)]
trigger hardware watchdog in IXP42x serial driver

Signed-off-by: Michael Schwingen <michael@schwingen.org>
12 years agoadd support for IXP42x Rev. B1 and newer
Michael Schwingen [Sun, 22 May 2011 21:59:58 +0000 (23:59 +0200)]
add support for IXP42x Rev. B1 and newer

Signed-off-by: Michael Schwingen <michael@schwingen.org>
12 years agoadd XScale sub architecture (IXP/PXA) to maintainer list
Michael Schwingen [Sun, 22 May 2011 21:59:57 +0000 (23:59 +0200)]
add XScale sub architecture (IXP/PXA) to maintainer list

Signed-off-by: Michael Schwingen <michael@schwingen.org>
12 years agoPrepare v2011.06-rc3 v2011.06-rc3
Wolfgang Denk [Wed, 22 Jun 2011 09:39:24 +0000 (11:39 +0200)]
Prepare v2011.06-rc3

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoBuild fix/update of AFEB9260
Sergey Lapin [Thu, 9 Jun 2011 05:45:31 +0000 (05:45 +0000)]
Build fix/update of AFEB9260

Make AFEB9260 build again.
Based on fix for AT91SAM9260EK.

Signed-off-by: Sergey Lapin <slapin@ossfans.org>
12 years agomacb: fix compile warning
andreas.devel@googlemail.com [Thu, 9 Jun 2011 02:08:46 +0000 (02:08 +0000)]
macb: fix compile warning

This patch fixes following compile warning:

---8<---
macb.c: In function 'macb_write_hwaddr':
macb.c:525:2: warning: dereferencing type-punned pointer will break strict-aliasing rules
--->8---

Signed-off-by: Andreas Bießmann <andreas.devel@gmail.com>
12 years agoat91_emac: fix compile warning
andreas.devel@googlemail.com [Thu, 9 Jun 2011 00:22:54 +0000 (00:22 +0000)]
at91_emac: fix compile warning

This patch removes the warning

---8<---
at91_emac.c: In function 'at91emac_write_hwaddr':
at91_emac.c:487:2: warning: dereferencing type-punned pointer will break strict-aliasing rules
--->8---

Signed-off-by: Andreas Bießmann <andreas.devel@gmail.com>
12 years agoinclude/asm/arch-at91: update several .h files to ATMEL_xxx name scheme
Eric Benard [Mon, 6 Jun 2011 22:48:26 +0000 (22:48 +0000)]
include/asm/arch-at91: update several .h files to ATMEL_xxx name scheme

Signed-off-by: Eric Bénard <eric@eukrea.com>
12 years agocpuat91: fix board support
Eric Benard [Mon, 6 Jun 2011 22:48:29 +0000 (22:48 +0000)]
cpuat91: fix board support

Signed-off-by: Eric Bénard <eric@eukrea.com>
12 years agocpu9260/9G20: fix board support
Eric Benard [Mon, 6 Jun 2011 22:48:28 +0000 (22:48 +0000)]
cpu9260/9G20: fix board support

Signed-off-by: Eric Bénard <eric@eukrea.com>
12 years agoarm926ejs/at91/lowlevel_init.S: fix defines
Eric Benard [Mon, 6 Jun 2011 22:48:27 +0000 (22:48 +0000)]
arm926ejs/at91/lowlevel_init.S: fix defines

atmel rework changed define names which broke this file

Signed-off-by: Eric Bénard <eric@eukrea.com>
12 years agoATMEL spi_dataflash driver - fix to build again
Reinhard Meyer [Mon, 6 Jun 2011 00:05:56 +0000 (00:05 +0000)]
ATMEL spi_dataflash driver - fix to build again

The rework effort for ATMEL (AT91/AVR32) accidentially broke build of
this driver. Fix this to make it build again. However this driver should
be reworked as soon as possible!

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
12 years agoAT91 rework: fix TOP9000 files to build again
Reinhard Meyer [Mon, 6 Jun 2011 00:16:42 +0000 (00:16 +0000)]
AT91 rework: fix TOP9000 files to build again

Fix EMK TOP9000 board to build again:
- changes required due to ATMEL rework

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
12 years agoAT91 rework: fix at91sam(9260/9g20/9xe)ek board port to build again:
Reinhard Meyer [Mon, 6 Jun 2011 00:13:10 +0000 (00:13 +0000)]
AT91 rework: fix at91sam(9260/9g20/9xe)ek board port to build again:

Make ATMEL's at91sam9260/9g20/9xe-ek boards build again

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
12 years agoAdd support for Bluewater Systems Snapper 9260/9G20 modules
Ryan Mallon [Sun, 5 Jun 2011 07:21:22 +0000 (07:21 +0000)]
Add support for Bluewater Systems Snapper 9260/9G20 modules

Add support for Bluewater Systems AT91 based Snapper 9260 and 9G20
single board computer modules. Includes NAND flash and Ethernet
support.

Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
12 years agoupdate arm/at91rm9200 work with rework rework110202
Jens Scharsig [Sat, 19 Feb 2011 06:17:02 +0000 (06:17 +0000)]
update arm/at91rm9200 work with rework rework110202

* convert at91rm9200ek and eb_cpux9k2 board to ATMEL_xxx name scheme
 * Fix: timer.c compile error io.h not found with arm/at91rm9200
 * update arm920t/at91 to ATMEL_xxx name scheme
 * update arm920t/at91 soc lib
 * update at91_emac driver

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
Tested-by: Andreas Bießmann <andreas.devel@gmail.com>
12 years agomx31pdk: Add DHCP command
Fabio Estevam [Wed, 15 Jun 2011 03:36:23 +0000 (03:36 +0000)]
mx31pdk: Add DHCP command

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agomxc_spi.c: typo fixed
Helmut Raiger [Wed, 15 Jun 2011 01:45:45 +0000 (01:45 +0000)]
mxc_spi.c: typo fixed

Signed-off-by: Helmut Raiger <helmut.raiger@hale.at>
12 years agoimx31_phycore: Fix build by using new relocation scheme
Fabio Estevam [Sat, 11 Jun 2011 15:16:11 +0000 (15:16 +0000)]
imx31_phycore: Fix build by using new relocation scheme

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agomx1ads: Fix build by using new relocation scheme
Fabio Estevam [Sat, 11 Jun 2011 15:16:32 +0000 (15:16 +0000)]
mx1ads: Fix build by using new relocation scheme

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agoMX31: QONG: drop config.mk
Stefano Babic [Thu, 9 Jun 2011 14:43:26 +0000 (16:43 +0200)]
MX31: QONG: drop config.mk

Remove obsolete config.mk from QONG board.

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoomap730p2: fix build breaks
Aneesh V [Thu, 9 Jun 2011 12:54:57 +0000 (08:54 -0400)]
omap730p2: fix build breaks

Provide SDRAM base address and use SRAM for initial stack

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
12 years agoomap2420h4: fix build breaks
Aneesh V [Thu, 9 Jun 2011 12:54:55 +0000 (08:54 -0400)]
omap2420h4: fix build breaks

DRAM base address and use SRAM for initial stack

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
12 years agoomap1610inn: fix build breaks
Aneesh V [Thu, 9 Jun 2011 12:54:53 +0000 (08:54 -0400)]
omap1610inn: fix build breaks

Provide SDRAM base address and use SRAM for initial stack

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
12 years agoomap1510inn: fix build breaks
Aneesh V [Thu, 9 Jun 2011 12:54:51 +0000 (08:54 -0400)]
omap1510inn: fix build breaks

Provide SDRAM base address and use SRAM for initial stack

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
12 years agoomap5912osk: fix build breaks
Aneesh V [Thu, 9 Jun 2011 12:54:48 +0000 (08:54 -0400)]
omap5912osk: fix build breaks

Provide SDRAM base address and use SRAM for initial stack

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
12 years agoomap1610h2: fix build breaks
Aneesh V [Thu, 9 Jun 2011 12:54:45 +0000 (08:54 -0400)]
omap1610h2: fix build breaks

Provide SDRAM base address and use SRAM for initial stack

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
12 years agopowerpc/p1022ds: set the clock-frequency prop only if the clock is enabled
Timur Tabi [Wed, 8 Jun 2011 17:10:49 +0000 (12:10 -0500)]
powerpc/p1022ds: set the clock-frequency prop only if the clock is enabled

The clock-frequency property in an audio codec's device tree node is set to
the input clock frequency for that codec.  On the Freescale P1022DS board,
the input clock is enabled only if the hwconfig 'audclk' option is set.
Therefore, the property should only be set in the device tree if the clock
is actually enabled.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Wed, 8 Jun 2011 21:29:04 +0000 (23:29 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

* 'master' of git://git.denx.de/u-boot-arm:
  SMDK6400: fix the compiler error
  imx27lite: Remove local config.mk
  mx31ads: Fix environment location on flash
  imx31_litekit: Remove local config.mk
  mx31litekit: Fix boot with the new relocation scheme.
  mx31ads: Use the new relocation scheme

12 years agoSMDK6400: fix the compiler error
Minkyu Kang [Thu, 2 Jun 2011 21:27:01 +0000 (21:27 +0000)]
SMDK6400: fix the compiler error

This patch adds _end for fix following compiler error

arch/arm/cpu/arm1176/start.o: In function `_end_ofs':
arch/arm/cpu/arm1176/start.S:61: undefined reference to `_end'

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoimx27lite: Remove local config.mk
Fabio Estevam [Mon, 6 Jun 2011 05:25:20 +0000 (05:25 +0000)]
imx27lite: Remove local config.mk

Local board config.mk should be avoided.

Place CONFIG_SYS_TEXT_BASE definition into the board config file instead.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agomx31ads: Fix environment location on flash
Felix Radensky [Mon, 6 Jun 2011 05:06:07 +0000 (05:06 +0000)]
mx31ads: Fix environment location on flash

At the moment u-boot and u-boot environment on flash
have overlapping addresses, so each u-boot update erases
the environment. Fix this by placing evironment right
after u-boot. Also, remove confusing comment about environment
location.

Signed-off-by: Felix Radensky <felix@embedded-sol.com>
12 years agoimx31_litekit: Remove local config.mk
Fabio Estevam [Mon, 6 Jun 2011 03:13:36 +0000 (03:13 +0000)]
imx31_litekit: Remove local config.mk

Local board config.mk should be avoided.

Place CONFIG_SYS_TEXT_BASE definition into the board config file instead.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
12 years agomx31litekit: Fix boot with the new relocation scheme.
Fabio Estevam [Sun, 5 Jun 2011 14:56:02 +0000 (14:56 +0000)]
mx31litekit: Fix boot with the new relocation scheme.

imx31_litekit has been converted to the new relocation scheme, but it does not boot.

Make the boot functional by using board_early_init_f .

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Magnus Lilja <lilja.magnus@gmail.com>
12 years agomx31ads: Use the new relocation scheme
Fabio Estevam [Sun, 5 Jun 2011 06:26:49 +0000 (06:26 +0000)]
mx31ads: Use the new relocation scheme

This fixes the MX31ADS build by using the new relocation scheme.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Felix Radensky <felix@embedded-sol.com>
12 years agoBlackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings
Harald Krapfenbauer [Tue, 17 May 2011 19:45:36 +0000 (15:45 -0400)]
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings

The recent commit ea882baf9c1 broke embedding environments in the middle
of a sector, so relocate it to the start of the 2nd sector.

Signed-off-by: Harald Krapfenbauer <harald.krapfenbauer@bluetechnix.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: boards: build zlib dir with -O2
Mike Frysinger [Mon, 16 May 2011 18:25:42 +0000 (14:25 -0400)]
Blackfin: boards: build zlib dir with -O2

Now that the zlib code has been relocated to a dedicated subdir, make
sure we still build it with -O2 for boards that want speed over size.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: bf548-ezkit/bf561-ezkit: update env location
Mike Frysinger [Mon, 9 May 2011 19:43:27 +0000 (15:43 -0400)]
Blackfin: bf548-ezkit/bf561-ezkit: update env location

Relocate the env to one of the small end sectors to avoid issues with
embedding it, such as support being broken (by recent commit ea882baf9c1),
and for taking a while to save updates.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: use on-chip reset func with newer parts
Mike Frysinger [Sat, 30 Apr 2011 08:35:21 +0000 (04:35 -0400)]
Blackfin: use on-chip reset func with newer parts

Turns out the documentation is wrong and doing "RAISE 1" does not result
in a software reset, only a core reset.  So when the on-chip rom has a
functioning reset helper, use it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: use common LDSCRIPT logic
Mike Frysinger [Fri, 8 Apr 2011 04:52:06 +0000 (00:52 -0400)]
Blackfin: use common LDSCRIPT logic

Now that common code is a bit smarter when it comes to default LDSCRIPT
values, rename the default Blackfin file and drop the Blackfin-specific
config.mk logic.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoPrepare v2011.06-rc2 v2011.06-rc2
Wolfgang Denk [Thu, 2 Jun 2011 21:19:27 +0000 (23:19 +0200)]
Prepare v2011.06-rc2

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoMinor coding style cleanup
Wolfgang Denk [Thu, 2 Jun 2011 21:18:32 +0000 (23:18 +0200)]
Minor coding style cleanup

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agocommon/cmd_fdt.c: fix wrong data displayed in fdt print
Haojian Zhuang [Sun, 22 May 2011 21:53:30 +0000 (21:53 +0000)]
common/cmd_fdt.c: fix wrong data displayed in fdt print

All data in dtb is big endian. Some ARM devices are little-endian.
In print_data(), it displays data with big-endian format. For ARM device,
data should be converted to little-endian first.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Gerald Van Baren <vanbaren@cideas.com>
12 years agosntp: avoid use of uninitialized variable
Luuk Paulussen [Mon, 16 May 2011 18:27:11 +0000 (18:27 +0000)]
sntp: avoid use of uninitialized variable

When we use the ntpserverip environment variable argv[1] may not be set.
Printing the error message using the NetNtpServerIP variable ensures the
correct output in both cases.

Signed-off-by: Luuk Paulussen <luuk.paulussen@alliedtelesis.co.nz>
Acked-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Cc: Ben Warren <biggerbadderben@gmail.com>
Acked-by: Detlev Zundel <dzu@denx.de>
12 years agosf: kick watchdog when polling
Patrick Sestier [Fri, 15 Apr 2011 14:25:25 +0000 (14:25 +0000)]
sf: kick watchdog when polling

The status polling can take a while, so make sure we kick the
watchdog after each successful poll.

Signed-off-by: Patrick Sestier <psestier@mircom.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agonet/net.c: Update ipaddr if the environment has changed
Enric Balletbo i Serra [Tue, 31 May 2011 21:01:47 +0000 (21:01 +0000)]
net/net.c: Update ipaddr if the environment has changed

At least on ARM the ipaddr is only set in board_init_r function. The
problem is if ipaddr is not defined in environment importing another
environment defined don't update the ipaddr value.

For example, suppose we've a default environment without net variables
defined and we want to import an uEnv.txt environment from SD-card like
this:

  ipaddr=192.168.2.240
  netmask=255.255.255.0
  gatewayip=192.168.2.1
  serverip=192.168.2.114

Then if you try boot from NFS results in:

  Importing environment from mmc ...
  Running uenvcmd ...
  smc911x: detected LAN9221 controller
  smc911x: phy initialized
  smc911x: MAC ac:de:48:00:00:00
  *** ERROR: `ipaddr' not set

The ipaddr at this point is NULL beacause is only set at board_init_r
function. This patch updates the ipaddr value if the environment has
changed.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Wed, 1 Jun 2011 20:16:21 +0000 (22:16 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  sh: sh7785lcr: Update BSC of USB area

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Wolfgang Denk [Wed, 1 Jun 2011 20:16:19 +0000 (22:16 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

* 'master' of git://git.denx.de/u-boot-sh:
  sh: sh7785lcr: Update BSC of USB area

12 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Wed, 1 Jun 2011 20:04:29 +0000 (22:04 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  SMDKV310: Fix incorrect conditional compilation for MIU linear mapping
  SMDKV310: CPU fequency and mmc_pre_ratio modified
  armv7: Add support for ST-Ericsson U8500 href platform
  I2C: Add driver for ST-Ericsson U8500 i2c
  armv7: Add ST-Ericsson u8500 arch
  Kirkwood: boards cleanup for deprecated CONFIG_CMD_AUTOSCRIPT
  ARMV7: Vexpress: Add missing MMC header
  arm/km: update mgcoge3un board support
  mvgbe: enable configurability of PORT_SERIAL_CONTROL_VALUE
  arm/km: rename mgcoge2un to mgcoge3un
  arm/km: add second serial interface for kirkwood
  arm/km: disable ls (through jffs2 support)
  arm/km: introduce bootcount env variable and clean km_arm
  arm/km: move CONFIG_EXTRA_ENV_SETTINGS from board to km_arm file
  arm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h
  ARMV7: MMC SPL Boot support for SMDKV310 board
  ARMV7: Add support for Samsung SMDKV310 Board
  S5PC2XX: clock: support pwm clock for evt1 (cpu revision 1)
  S5P: add set_mmc_clk for external clock control
  S5PC2XX: Support the cpu revision
  S5P:SROM config code moved to s5p-common directory
  Add _end for the end of u-boot image for SMDK6400
  MMC S5P: Fix typo
  S5P: GPIO Macro Values Corrected.
  SMDK2410: various cleanup/code style fixes
  SMDK2410: use the CFI driver (and remove the old one)
  SMDK2410: remove unneeded config.mk
  SMDK2410: activate ARM relocation feature
  BeagleBoard: fixed typo in typecast
  mvsata: issue hard reset on initialization
  VCMA9: use ARM relocation feature to fix build error
  MX31: drop warnings due to missing prototype for mxc_watchdog_reset()
  MX5: drop config.mk from efikamx board
  MX31: Make get_reset_cause() static and drop unreachable code
  MX53: Remove CONFIG_SYS_BOOTMAPSZ from mx53 config files.
  MX53: Handle silicon revision 2.1 case
  mx5: board: code clean up for checkboard code
  MX51: vision2: Fix build for vision2 board.
  MX51: vision: Let video mode struct be independant of watchdog.
  MX53: Add initial support for MX53SMD board.
  MX53: support for freescale MX53LOCO board
  mx5: Fix CONFIG_OF_LIBFDT redefined warning
  mx5: Remove unnecessary CONFIG_SYS_BOOTMAPSZ definition
  mx31pdk: Clean up mx31pdk.h file

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Wed, 1 Jun 2011 20:04:12 +0000 (22:04 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

* 'master' of git://git.denx.de/u-boot-arm:
  SMDKV310: Fix incorrect conditional compilation for MIU linear mapping
  SMDKV310: CPU fequency and mmc_pre_ratio modified
  armv7: Add support for ST-Ericsson U8500 href platform
  I2C: Add driver for ST-Ericsson U8500 i2c
  armv7: Add ST-Ericsson u8500 arch
  Kirkwood: boards cleanup for deprecated CONFIG_CMD_AUTOSCRIPT
  ARMV7: Vexpress: Add missing MMC header
  arm/km: update mgcoge3un board support
  mvgbe: enable configurability of PORT_SERIAL_CONTROL_VALUE
  arm/km: rename mgcoge2un to mgcoge3un
  arm/km: add second serial interface for kirkwood
  arm/km: disable ls (through jffs2 support)
  arm/km: introduce bootcount env variable and clean km_arm
  arm/km: move CONFIG_EXTRA_ENV_SETTINGS from board to km_arm file
  arm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h
  ARMV7: MMC SPL Boot support for SMDKV310 board
  ARMV7: Add support for Samsung SMDKV310 Board
  S5PC2XX: clock: support pwm clock for evt1 (cpu revision 1)
  S5P: add set_mmc_clk for external clock control
  S5PC2XX: Support the cpu revision
  S5P:SROM config code moved to s5p-common directory
  Add _end for the end of u-boot image for SMDK6400
  MMC S5P: Fix typo
  S5P: GPIO Macro Values Corrected.
  SMDK2410: various cleanup/code style fixes
  SMDK2410: use the CFI driver (and remove the old one)
  SMDK2410: remove unneeded config.mk
  SMDK2410: activate ARM relocation feature
  BeagleBoard: fixed typo in typecast
  mvsata: issue hard reset on initialization
  VCMA9: use ARM relocation feature to fix build error
  MX31: drop warnings due to missing prototype for mxc_watchdog_reset()
  MX5: drop config.mk from efikamx board
  MX31: Make get_reset_cause() static and drop unreachable code
  MX53: Remove CONFIG_SYS_BOOTMAPSZ from mx53 config files.
  MX53: Handle silicon revision 2.1 case
  mx5: board: code clean up for checkboard code
  MX51: vision2: Fix build for vision2 board.
  MX51: vision: Let video mode struct be independant of watchdog.
  MX53: Add initial support for MX53SMD board.
  MX53: support for freescale MX53LOCO board
  mx5: Fix CONFIG_OF_LIBFDT redefined warning
  mx5: Remove unnecessary CONFIG_SYS_BOOTMAPSZ definition
  mx31pdk: Clean up mx31pdk.h file

12 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Wed, 1 Jun 2011 20:01:10 +0000 (22:01 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  powerpc/fsl_pci: Fix device tree fixups for newer platforms

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Wed, 1 Jun 2011 20:01:07 +0000 (22:01 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  powerpc/fsl_pci: Fix device tree fixups for newer platforms

12 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Wed, 1 Jun 2011 19:59:27 +0000 (21:59 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  cmd_nand: fix help of nand erase subcommand
  env_nand: zero-initialize variable nand_erase_options

12 years agoMove wepep250,delta,xsengine to scrapyard
Marek Vasut [Fri, 20 May 2011 23:48:25 +0000 (01:48 +0200)]
Move wepep250,delta,xsengine to scrapyard

Drop wepep250 board from MAINTAINERS and add all these three boards to
doc/README.scrapyard

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoSMDKV310: Fix incorrect conditional compilation for MIU linear mapping
Thomas Abraham [Tue, 31 May 2011 03:52:25 +0000 (03:52 +0000)]
SMDKV310: Fix incorrect conditional compilation for MIU linear mapping

Fix the incorrect macro check for MIU linear mapping conditional compilation.

Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoSMDKV310: CPU fequency and mmc_pre_ratio modified
Chander Kashyap [Thu, 26 May 2011 01:10:34 +0000 (01:10 +0000)]
SMDKV310: CPU fequency and mmc_pre_ratio modified

Modifies CPU Frequency to 1GHz and removes hard coding of mmc_pre_ratio for
MMC Channel2 in FSYS2 register.

Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoarmv7: Add support for ST-Ericsson U8500 href platform
John Rigby [Tue, 19 Apr 2011 10:42:42 +0000 (10:42 +0000)]
armv7: Add support for ST-Ericsson U8500 href platform

Minimal platform support to boot linux from SD.

Supported devices/hw limited to external MMC/SD slot,
GPIO, I2C and minimal PRCMU.

Signed-off-by: John Rigby <john.rigby@linaro.org>
CC: Albert Aribaud <albert.aribaud@free.fr>
12 years agoI2C: Add driver for ST-Ericsson U8500 i2c
Michael Brandt [Tue, 19 Apr 2011 10:42:41 +0000 (10:42 +0000)]
I2C: Add driver for ST-Ericsson U8500 i2c

Signed-off-by: John Rigby <john.rigby@linaro.org>
CC: Heiko Schocher <hs@denx.de>
12 years agoarmv7: Add ST-Ericsson u8500 arch
John Rigby [Tue, 19 Apr 2011 10:42:40 +0000 (10:42 +0000)]
armv7: Add ST-Ericsson u8500 arch

Based on ST-Ericsson internal git repo.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: John Rigby <john.rigby@linaro.org>
CC: Albert Aribaud <albert.aribaud@free.fr>
12 years agosh: sh7785lcr: Update BSC of USB area
Nobuhiro Iwamatsu [Mon, 4 Apr 2011 06:47:03 +0000 (15:47 +0900)]
sh: sh7785lcr: Update BSC of USB area

A value of BSC of the USB was wrong.
This updates this.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agoKirkwood: boards cleanup for deprecated CONFIG_CMD_AUTOSCRIPT
Albert ARIBAUD [Tue, 31 May 2011 21:51:55 +0000 (23:51 +0200)]
Kirkwood: boards cleanup for deprecated CONFIG_CMD_AUTOSCRIPT

12 years agoARMV7: Vexpress: Add missing MMC header
Dirk Behme [Mon, 23 May 2011 07:40:26 +0000 (07:40 +0000)]
ARMV7: Vexpress: Add missing MMC header

Add a header file with the missing function prototype to fix

ca9x4_ct_vxp.c: In function 'cpu_mmc_init':
ca9x4_ct_vxp.c:93: warning: implicit declaration of function 'arm_pl180_mmci_init'

introduced by commit "ARMV7: Vexpress: Add MMC support"
(f0c64526b7e51ba997a0f1baf9e74e6d497b957e)

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
CC: Andy Fleming <afleming@freescale.com>
CC: Matt Waddel <matt.waddel@linaro.org>
12 years agoarm/km: update mgcoge3un board support
Holger Brunck [Tue, 31 May 2011 02:12:52 +0000 (02:12 +0000)]
arm/km: update mgcoge3un board support

We change default settings for egiga on mgcoge3un.
The reason we need this is that we have the gig port on mgcoge3un
connected using a back-to-back pair of PHYs. There are no magnetics and
because of that the port has to be run with a fixd configuration and
auto-negotiation must be disabled. In the default mode the egiga driver
uses autoneg to determine port speed - which defaults to 1G (we need
100M full duplex).

Add wait for the GPIO line connected to mgcoge3ne before
starting mgcoge3un. A board specific ethernet present function
was added, because on this board ethernet is always present.
The BOCO FPGA access was enhanced and changed to use register
definitions.

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

12 years agomvgbe: enable configurability of PORT_SERIAL_CONTROL_VALUE
Valentin Longchamp [Tue, 31 May 2011 02:12:51 +0000 (02:12 +0000)]
mvgbe: enable configurability of PORT_SERIAL_CONTROL_VALUE

This allows this configuration to be defined differently for some
boards that request it.

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

12 years agoarm/km: rename mgcoge2un to mgcoge3un
Valentin Longchamp [Tue, 31 May 2011 02:12:50 +0000 (02:12 +0000)]
arm/km: rename mgcoge2un to mgcoge3un

The mgcoge2un target was only an intermediate step to mgcoge3un.
For this reason the mgcoge2un support was moved to mgcoge3un,
because it isn't needed to support both targets.

We add the BootROM init file for the mgcoge3un memphis RAM.

We also move the suen3 and suen8 boards into the correct category
in the MAINTAINERS file.

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

12 years agoarm/km: add second serial interface for kirkwood
Holger Brunck [Tue, 31 May 2011 02:12:49 +0000 (02:12 +0000)]
arm/km: add second serial interface for kirkwood

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

12 years agoarm/km: disable ls (through jffs2 support)
Valentin Longchamp [Tue, 31 May 2011 02:12:48 +0000 (02:12 +0000)]
arm/km: disable ls (through jffs2 support)

This is not supported on our km-arm boards since we have defined
CONFIG_SYS_NO_FLASH for our NAND Flash chip.

With CONFIG_CMD_JFFS2, the ls command is present and works very badly
on our km-arm boards.

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

12 years agoarm/km: introduce bootcount env variable and clean km_arm
Valentin Longchamp [Tue, 31 May 2011 02:12:47 +0000 (02:12 +0000)]
arm/km: introduce bootcount env variable and clean km_arm

This environment variable is used to set the bootcount address
for the kernel.

last_stage_init is not available for arm platforms. So the
calls to set_km_var and set_bootcount_addr are done in
misc_init_r.

Additionally some unneeded printouts were removed.

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

12 years agoarm/km: move CONFIG_EXTRA_ENV_SETTINGS from board to km_arm file
Valentin Longchamp [Tue, 31 May 2011 02:12:46 +0000 (02:12 +0000)]
arm/km: move CONFIG_EXTRA_ENV_SETTINGS from board to km_arm file

Since all the boards define the same env settings, this simplifies
the board files.

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

12 years agoarm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h
Valentin Longchamp [Tue, 31 May 2011 02:12:45 +0000 (02:12 +0000)]
arm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h

This define is marvell specific, so it should be present in km_arm.
It is however not needed there either, since we set it to the default
value that is already set in include/asm/arch-kirkwood/config.h

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

12 years agoARMV7: MMC SPL Boot support for SMDKV310 board
Chander Kashyap [Tue, 24 May 2011 20:02:57 +0000 (20:02 +0000)]
ARMV7: MMC SPL Boot support for SMDKV310 board

Added MMC SPL boot support for SMDKV310. This framework design is
based on nand_spl support.

Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoARMV7: Add support for Samsung SMDKV310 Board
Chander Kashyap [Tue, 24 May 2011 20:02:56 +0000 (20:02 +0000)]
ARMV7: Add support for Samsung SMDKV310 Board

SMDKV310 board is based on Samsung S5PV310 SOC. This SOC is very much
similar to S5PC210.

Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoS5PC2XX: clock: support pwm clock for evt1 (cpu revision 1)
Minkyu Kang [Wed, 18 May 2011 07:57:55 +0000 (16:57 +0900)]
S5PC2XX: clock: support pwm clock for evt1 (cpu revision 1)

The source of pwm clock is fixed at evt1.
And some registers for pwm clock are removed.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoS5P: add set_mmc_clk for external clock control
Jaehoon Chung [Tue, 17 May 2011 21:19:17 +0000 (21:19 +0000)]
S5P: add set_mmc_clk for external clock control

This patch added set_mmc_clk for external clock control.

c210 didn't support host clock control.
So We need external_clock_control function for c210.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
12 years agoS5PC2XX: Support the cpu revision
Minkyu Kang [Mon, 16 May 2011 10:45:54 +0000 (19:45 +0900)]
S5PC2XX: Support the cpu revision

S5PC210 SoC have two cpu revisions, and have some difference.
So, support the cpu revision for each revision.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
12 years agoS5P:SROM config code moved to s5p-common directory
Chander Kashyap [Thu, 14 Apr 2011 19:05:18 +0000 (19:05 +0000)]
S5P:SROM config code moved to s5p-common directory

SROM config code is made common for S5P series of boards.
smdkc100.c now refers to s5p-common/sromc.c for SROM related
subroutines.

Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoAdd _end for the end of u-boot image for SMDK6400
seedshope [Sun, 1 May 2011 07:05:37 +0000 (07:05 +0000)]
Add _end for the end of u-boot image for SMDK6400

Since we rename _end to __bss_end__, But we need add _end symbol for
the end of u-boot image.

Signed-off-by: Zhong Hongbo <bocui107@gmail.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoMMC S5P: Fix typo
Dirk Behme [Sun, 15 May 2011 05:39:28 +0000 (05:39 +0000)]
MMC S5P: Fix typo

Fix typo resulting in the compilation error

s5p_mmc.c: In function 's5p_mmc_initialize':
s5p_mmc.c:469: error: 'struct mmc' has no member named 'm_bmax'

introduced by commit "MMC: make b_max unconditional"
(8feafcc49c0b7a9c541904f95a43dbef2fecc38b)

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
CC: John Rigby <john.rigby@linaro.org>
CC: Andy Fleming <afleming@freescale.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoS5P: GPIO Macro Values Corrected.
Chander Kashyap [Mon, 18 Apr 2011 00:08:43 +0000 (00:08 +0000)]
S5P: GPIO Macro Values Corrected.

S5PC2XX: Macro values for Pull Up and Driver Strength were wrong.
S5PC1XX: Macro values for Driver Strength were wrong.

Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoSMDK2410: various cleanup/code style fixes
David Müller (ELSOFT AG) [Thu, 24 Mar 2011 22:28:06 +0000 (22:28 +0000)]
SMDK2410: various cleanup/code style fixes

Signed-off-by: David Müller <d.mueller@elsoft.ch>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoSMDK2410: use the CFI driver (and remove the old one)
David Müller (ELSOFT AG) [Thu, 24 Mar 2011 22:28:05 +0000 (22:28 +0000)]
SMDK2410: use the CFI driver (and remove the old one)

Signed-off-by: David Müller <d.mueller@elsoft.ch>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoSMDK2410: remove unneeded config.mk
David Müller (ELSOFT AG) [Thu, 24 Mar 2011 22:28:04 +0000 (22:28 +0000)]
SMDK2410: remove unneeded config.mk

Signed-off-by: David Müller <d.mueller@elsoft.ch>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoSMDK2410: activate ARM relocation feature
David Müller (ELSOFT AG) [Thu, 24 Mar 2011 22:28:03 +0000 (22:28 +0000)]
SMDK2410: activate ARM relocation feature

Signed-off-by: David Müller <d.mueller@elsoft.ch>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agocmd_nand: fix help of nand erase subcommand
Daniel Hobi [Thu, 19 May 2011 17:28:54 +0000 (19:28 +0200)]
cmd_nand: fix help of nand erase subcommand

Since commit 30486322 (nand erase: .spread, .part, .chip subcommands)
the arguments off and size are no longer optional.

Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
12 years agoenv_nand: zero-initialize variable nand_erase_options
Daniel Hobi [Wed, 18 May 2011 13:21:08 +0000 (15:21 +0200)]
env_nand: zero-initialize variable nand_erase_options

Commit 30486322 (nand erase: .spread, .part, .chip subcommands)
added a new field to struct nand_erase_options, but forgot to
update common/env_nand.c.

Depending on the stack state and bad block distribution, saveenv()
can thus erase more than CONFIG_ENV_RANGE bytes which may corrupt
the following NAND sectors/partitions.

Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
Signed-off-by: Scott Wood <scottwood@freescale.com>
12 years agoBeagleBoard: fixed typo in typecast
Jason Kridner [Wed, 20 Apr 2011 13:52:26 +0000 (13:52 +0000)]
BeagleBoard: fixed typo in typecast

Without this patch, you should get a warning.

Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
Acked-by: Dirk Behme <dirk.behme@de.bosch.com>
12 years agomvsata: issue hard reset on initialization
Michael Walle [Wed, 11 May 2011 12:22:46 +0000 (12:22 +0000)]
mvsata: issue hard reset on initialization

Before the actual initialization do a hard reset of the SATA port and the
connected device.

changes v1->v2:
 - add comment for udelay

Signed-off-by: Michael Walle <michael@walle.cc>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
12 years agoVCMA9: use ARM relocation feature to fix build error
David Müller (ELSOFT AG) [Sun, 1 May 2011 21:52:48 +0000 (21:52 +0000)]
VCMA9: use ARM relocation feature to fix build error

Signed-off-by: David Müller <d.mueller@elsoft.ch>
12 years agoMX31: drop warnings due to missing prototype for mxc_watchdog_reset()
Stefano Babic [Fri, 20 May 2011 09:01:40 +0000 (11:01 +0200)]
MX31: drop warnings due to missing prototype for mxc_watchdog_reset()

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoMX5: drop config.mk from efikamx board
Stefano Babic [Thu, 19 May 2011 15:40:01 +0000 (17:40 +0200)]
MX5: drop config.mk from efikamx board

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Marek Vasut <marek.vasut@gmail.com>
12 years agoMX31: Make get_reset_cause() static and drop unreachable code
Stefano Babic [Tue, 17 May 2011 11:45:41 +0000 (13:45 +0200)]
MX31: Make get_reset_cause() static and drop unreachable code

get_reset_cause() should not be exported. Drop code in the function
after return statement that can generate warnings due to unreachable code.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>