Wolfgang Denk [Mon, 27 Jun 2011 20:22:42 +0000 (22:22 +0200)]
Prepare v2011.06
Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk [Mon, 27 Jun 2011 20:20:37 +0000 (22:20 +0200)]
Minor coding style fixes.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Mike Frysinger [Sat, 25 Jun 2011 01:12:36 +0000 (21:12 -0400)]
usb: convert to partial linking
Looks like this was missed during the conversion to partial linking.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Zhao Chenhui [Tue, 19 Apr 2011 02:47:05 +0000 (10:47 +0800)]
ehci-pci: Fix PCI EHCI driver for 36-bit
Convert the PCI base address into a virtual address.
Signed-off-by: Zhao Chenhui <b35336@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Cliff Cai [Thu, 21 Apr 2011 16:42:10 +0000 (12:42 -0400)]
musb: process control messages after roothub accepted it
When dealing with non-multipoint devices, if the software root hub code
accepted the message, then we still need to process it normally. So only
return quickly when the root hub skipped the message or is otherwise in
an error state.
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Wolfgang Denk [Thu, 23 Jun 2011 13:37:33 +0000 (15:37 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm
* 'master' of git://git.denx.de/u-boot-arm:
run arm_pci_init after relocation
IXP42x PCI rewrite
update/fix PDNB3 board
update/fix IXDP425 / IXDPG425 boards
add dvlhost (dLAN 200 AV Wireless G) board
IXP NPE: add support for fixed-speed MII ports
update/fix AcTux4 board
update/fix AcTux3 board
update/fix AcTux2 board
update/fix AcTux1 board
use -ffunction-sections / --gc-sections on IXP42x
support CONFIG_SYS_LDSCRIPT on ARM
fix "depend" target in npe directory
Fix IXP code to work after relocation was added
trigger hardware watchdog in IXP42x serial driver
add support for IXP42x Rev. B1 and newer
add XScale sub architecture (IXP/PXA) to maintainer list
Conflicts:
arch/arm/lib/board.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Michael Schwingen [Sun, 22 May 2011 22:00:13 +0000 (00:00 +0200)]
run arm_pci_init after relocation
Signed-off-by: Michael Schwingen <michael@schwingen.org>
Michael Schwingen [Sun, 22 May 2011 22:00:12 +0000 (00:00 +0200)]
IXP42x PCI rewrite
clean up IXP PCI handling: get rid of IXP-private bus scan, BAR assign etc.
code and use u-boot's PCI infrastructure instead. Move board-specific PCI
setup code (clock/reset) to board directory.
Signed-off-by: Michael Schwingen <michael@schwingen.org>
Michael Schwingen [Sun, 22 May 2011 22:00:11 +0000 (00:00 +0200)]
update/fix PDNB3 board
Signed-off-by: Michael Schwingen <michael@schwingen.org>
Michael Schwingen [Sun, 22 May 2011 22:00:10 +0000 (00:00 +0200)]
update/fix IXDP425 / IXDPG425 boards
Signed-off-by: Michael Schwingen <michael@schwingen.org>
Michael Schwingen [Sun, 22 May 2011 22:00:09 +0000 (00:00 +0200)]
add dvlhost (dLAN 200 AV Wireless G) board
Signed-off-by: Michael Schwingen <michael@schwingen.org>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Mike Frysinger [Sun, 19 Jun 2011 08:27:39 +0000 (08:27 +0000)]
tools: make it possible to build tools unconfigured
On Sunday, June 19, 2011 13:55:13 Ilya Yanok wrote:
> On 18.06.2011 23:03, Mike Frysinger wrote:
> >> - tools/Makefile put common/env_embedded.o and envcrc.o to object list
> >>
> >> conditionally. This fixes errors during dependency generation.
> >
> > pretty sure this breaks board builds. if the only thing this fixes is a
>
> I'm sorry but I can't see how this can break the builds. Could you
> please be more specific? I've tried to build some boards, it actually
> works...
i might be thinking of a different env_embedded situation. a different
problem with your patch to tools/Makefile: you copied the same logic multiple
times which means more bitrot.
why dont you do something like:
> > harmless warning when generating dependency files, then i say ignore it.
> > after all, this is how it has always worked in the past and no one really
> > cared.
>
> Yep, they are harmless but they are not warnings but rather scary errors
> actually. ;) I think it's better to fix them.
i guess my threshold for being scared is a bit higher :p
-mike
Ilya Yanok [Mon, 20 Jun 2011 12:45:38 +0000 (12:45 +0000)]
Makefile: move $(VERSION_FILE) rule out of ifeq configured
mkimage relies on autogenerated version so we need to move
$(VERSION_FILE) rule out of ifeq and make tools rule depend on it to be
able to run 'make tools' from the unconfigured tree.
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Ilya Yanok [Mon, 20 Jun 2011 12:45:37 +0000 (12:45 +0000)]
config.mk: move LDSCRIPT processing to the top-level Makefile
LDSCRIPT is used only from the top-level Makefile and only when the
system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT
related logic into the top level Makefile and under configured condition
to avoid errors when building tools from unconfigured tree.
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Wolfgang Denk [Sun, 1 May 2011 18:44:23 +0000 (20:44 +0200)]
ARM: drop unsupported 'trab' board
The 'trab' board configuration is broken, and there is nobody who is
interested and willing to fix it. Drop it.
This includes support for VFD displays which have always been used by
this board only.
Signed-off-by: Wolfgang Denk <wd@denx.de>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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
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
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
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
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
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
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>
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>
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>
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>
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>
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>
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>
Albert ARIBAUD [Tue, 31 May 2011 21:51:55 +0000 (23:51 +0200)]
Kirkwood: boards cleanup for deprecated CONFIG_CMD_AUTOSCRIPT
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>