Commit Graph

3524 Commits

Author SHA1 Message Date
Wolfgang Denk
006915fbb0 Merge branch 'master' of ../master into next 2010-12-16 23:00:53 +01:00
Heiko Schocher
98e6956702 mpc52xx: add support for tqm52xx based board charon
- serial console in PSC1
- 128MiB DRAM
- 32MiB Flash
- FEC Ethernet
- 2 I2C busses
- FPGA on CS3
- IDE
- VGA SMI501

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Wolfgang Denk <wd@denx.de>
2010-12-16 22:58:59 +01:00
Wolfgang Denk
b5d58d8500 Merge branch 'master' of git://git.denx.de/u-boot-arm 2010-12-16 22:49:16 +01:00
Asen Dimov
6741b5310f pm9261: enable cache command
Signed-off-by: Asen Dimov <dimov@ronetix.at>
2010-12-16 22:46:06 +01:00
Asen Dimov
4f81bf4368 pm9261: ARM relocation support
Signed-off-by: Asen Dimov <dimov@ronetix.at>
2010-12-16 22:46:05 +01:00
Asen Dimov
6e110d295f pm9263: enable cache command
Signed-off-by: Asen Dimov <dimov@ronetix.at>
2010-12-16 22:45:30 +01:00
Asen Dimov
9a2a05a4a3 pm9263: ARM relocation support
Signed-off-by: Asen Dimov <dimov@ronetix.at>
2010-12-16 22:45:29 +01:00
Asen Dimov
37ee3ccce7 pm9g45: enable cache command
Signed-off-by: Asen Dimov <dimov@ronetix.at>
2010-12-16 22:45:00 +01:00
Asen Dimov
510f794c89 pm9g45: ARM relocation support
Signed-off-by: Asen Dimov <dimov@ronetix.at>
2010-12-16 22:44:02 +01:00
Wolfgang Denk
63440c4a80 Merge branch 'master' of git://git.denx.de/u-boot-arm 2010-12-14 00:06:00 +01:00
Kumar Gala
72c96a6802 tsec: Revert to setting TBICR_ANEG_ENABLE by default for SGMII
The following commit:

commit 46e91674fb
Author: Peter Tyser <ptyser@xes-inc.com>
Date:   Tue Nov 3 17:52:07 2009 -0600

    tsec: Force TBI PHY to 1000Mbps full duplex in SGMII mode

Removed setting Auto-Neg by default, however this is believed to be
proper default configuration for initialization of the TBI interface.

Instead we explicitly set CONFIG_TSEC_TBICR_SETTINGS for the
XPedite5370 & XPedite5500 boards that use a Broadcomm PHY which require
Auto-Neg to be disabled to function properly.

This addresses a breakage on the P2020 DS & MPC8572 DS boards when used
with an SGMII riser card.  We also remove setting
CONFIG_TSEC_TBICR_SETTINGS on the P1_P2_RDB family of boards as now the
default setting is sufficient for them.

Additionally, we clean up the code a bit to remove an unnecessary second
define.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Peter Tyser <ptyser@xes-inc.com>
Tested-by: Peter Tyser <ptyser@xes-inc.com>
2010-12-13 09:32:15 -06:00
Dirk Behme
53736baaff OMAP3: SPI driver
CC: Ruslan N. Araslanov <byaaka@yandex.ru>
Signed-off-by: Ruslan Araslanov <ruslan.araslanov@vitecmm.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-12-11 11:01:00 -05:00
Balaji T K
3e664f6d50 ARMV7: OMAP4: twl6030 add battery charging support
Add battery charging support twl6030 driver.
Add support for battery voltage and current measurements.
Add command to get battery status and start/stop battery charging from USB.

Signed-off-by: Balaji T K <balajitk@ti.com>
Tested-by: Steve Sakoman <steve.sakoman@linaro.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-12-11 10:56:01 -05:00
Sandeep Paulraj
aac0b4b6c1 DaVinci DM6446: Config Update
The DM6446 does not build due to the ARM
relocation patch.

Also the board does not build in the NOR
mode. Changed default to NAND to ensure
no build failure.
While at it removed CONFIG_CMD_KGDB

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-12-11 10:47:30 -05:00
Wolfgang Denk
ac8983bcba Merge branch 'master' of git://git.denx.de/u-boot-imx 2010-12-09 20:52:44 +01:00
Wolfgang Denk
2ced53e1ad Move LDSCRIPT definitions to board config files.
Recent cleanup actions resulted in a number of config.mk files that
contained only LDSCRIPT definitions.  Move these into th respective
board config files and remove the now empty config.mk files.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Cc: Detlev Zundel <dzu@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
Cc: Peter De Schrijver <p2@mind.be>
Acked-by: Detlev Zundel < dzu@denx.de>
Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Acked-by: Heiko Schocher<hs@denx.de>
Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
2010-12-09 10:27:41 +01:00
Stefano Babic
76bfe76b54 Davinci: add support for the ea20 board
This board uses the OMAP-L138 SOM stacked on a
custom baseboard. It supports SPI Flash, Ethernet
with RMII.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-12-09 10:24:12 +01:00
Sudhakar Rajashekhara
df48676aea da850: Add RMII support for EMAC
This patch is a port of the work by Sudhakar Rajeshekhara in commit
ab3effbcad8851cc65dc5241a01c064d2030a3b2 of
git://arago-project.org/git/people/sandeep/u-boot-davinci.git.

The da850 UI board has on it an RMII PHY which can be used if the MDC line
to the MII PHY on the baseboard is disabled and the RMII PHY is enabled by
configuring the values of some GPIO pins on the IO expander of the UI board.
This patch implements disabling that line via GPIO2[6], configuring the UI
board's IO expander and setting only the pinmux settings that are needed for
RMII operation.

Tested on da850evm by adding a define for CONFIG_DRIVER_TI_EMAC_USE_RMII.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
CC: Sandeep Paulraj <s-paulraj@ti.com>
CC: Ben Warren <biggerbadderben@gmail.com>
CC: Mike Frysinger <vapier@gentoo.org>
CC: Sughosh Ganu <urwithsughosh@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-12-09 10:24:12 +01:00
Sughosh Ganu
dfddb5e6ba Add board support for hawkboard
The patch adds basic board support for TI's OMAP-L138 based
Hawkboard. This board is pretty similar to the da850 EVM. Support for
nand and network access is added in this version.

The following bootup procedure is used.

At reset, the Rom Boot Loader(RBL), initialises the ddr and the nand
controllers and copies the second stage bootloader(nand_spl) to
RAM. The secondary bootloader then copies u-boot from a predefined
location in the nand flash to the RAM, and passes control to the
u-boot image.

Three config options are supported
* hawkboard_config - Used to create the u-boot.bin. Tftp the
 u-boot.bin image to the RAM from u-boot, and flash to the nand flash
 at address 0xe0000.

* hawkboard_nand_config - Used to generate the secondary
 bootloader(nand_spl) image. This creates an elf file u-boot-spl
 under nand_spl/. Create an AIS signed image using this file, and
 flash it to the nand flash at address 0x20000. The ais file should
 fit in one block.

* hawkboard_uart_config - This is same as the first image, but with
 the TEXT_BASE as expected by the RBL(0xc1080000). Create the AIS

Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-12-09 10:24:11 +01:00
Stefano Babic
b5d9791f8c da850: Enable SPI Flash
The patch was already posted to the arago project,
but not yet to mainline. It allows to save environment into
the spi flash. Tested on LogiPD tmdxl138.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Detlev Zundev <dzu@denx.de>
CC: Ben Gardiner <bengardiner@nanometrics.ca>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-12-09 10:24:11 +01:00
Wolfgang Denk
b097b9282c Merge branch 'master' of git://git.denx.de/u-boot-arm 2010-12-08 23:17:57 +01:00
Andreas Bießmann
a429db7e3c arm920t/at91/timer: replace bss variables by gd
Reuse the gd->tbl value for timestamp and add gd->lastinc for lastinc
bss values in arm920t/at91/timer driver.
The usage of bss values in driver before initialisation of bss is
forbidden. In that special case some data in .rel.dyn gets corrupted by
the arm920t/at91/timer driver.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
2010-12-07 22:08:07 +01:00
Andreas Bießmann
3a4ff8b3cd at91rm9200ek: add configure target for RAM boot
This patch also removes now unnecessary config.mk in board directory and
make usage of new features in boards.cfg.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
2010-12-07 22:08:06 +01:00
Andreas Bießmann
066df1a5d6 at91rm9200ek: fix SDRAM initialistation values
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
2010-12-07 22:08:06 +01:00
Reinhard Meyer
d55c5c3f81 AT91: add TOP9000 support
Adds support for the EMK TOP9000 CPU Module which is
based on ATMELs ARM926EJS AT91SAM9XE SoC.

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
2010-12-07 16:36:41 +01:00
Wolfgang Denk
f12af1f38d Merge branch 'master' of git://git.denx.de/u-boot-video 2010-12-06 23:45:35 +01:00
Anatolij Gustschin
f550c521e1 mpc512x: aria: cleanup board config file
CONFIG_FSL_DIU_LOGO_BMP has been removed while refactoring
MPC8610 and MPC5121 DIU code, so remove it.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
2010-12-01 20:48:38 +01:00
Kumar Gala
558710b98b powerpc/85xx: Enable HWCONFIG on MPC8572DS
We need HWCONFIG to allow configuration of DDR params

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2010-12-01 06:45:23 -06:00
Wolfgang Denk
49733aa0b9 Merge branch 'master' of /home/wd/git/u-boot/custodians 2010-11-30 22:13:32 +01:00
Wolfgang Denk
f8264e015e Merge branch 'master' of git://git.denx.de/u-boot-arm 2010-11-30 22:12:36 +01:00
Kumar Gala
a55bb8340b powerpc/85xx: Introduce CONFIG_SYS_EXTRA_ENV_RELOC
Some systems need to relocate the env_addr pointer early because the
location it points to will get invalidated before env_relocate is
called.  One example is on systems that might use a L2 or L3 cache
in SRAM mode and initialize that cache from SRAM mode back to being
a cache in cpu_init_r.

We set this on the 85xx boards that have support for NAND, SPI, or
SDHC/MMC boot support as they use a secondary cache in SRAM mode and
need the env_addr pointer relocated since we change from SRAM to normal
cache mode in cpu_init_r.

Also removed CONFIG_SYS_SPL as its not used anywhere.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2010-11-30 22:09:09 +01:00
Wolfgang Denk
52eb2c7911 Merge branch 'master' of git://git.denx.de/u-boot-samsung 2010-11-30 21:30:13 +01:00
Wolfgang Denk
83b622aa88 Merge branch 'master' of /home/wd/git/u-boot/custodians 2010-11-30 21:28:10 +01:00
Wolfgang Denk
3410a994e5 Merge branch 'master' of git://git.denx.de/u-boot-sh 2010-11-30 21:28:03 +01:00
Wolfgang Denk
a7bf3ecc71 Merge branch 'master' of /home/wd/git/u-boot/custodians 2010-11-30 21:15:25 +01:00
Stefan Popa
0b72585796 mpc83xx: Fix for MPC8360 ATM Quad OC3 External Phys
Changed the CS4 and CS5 addresses on Local Bus for matching the PMC0
and PMC1 addresses.

Signed-off-by: Stefan Popa <Stefan.Popa@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2010-11-30 21:15:01 +01:00
Dirk Behme
998f4caf6f OMAP3: Zoom2: Fix ARM relocation support
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-11-30 11:10:48 -05:00
Dirk Behme
25435c6cce OMAP3: Zoom1: Fix ARM relocation support
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-11-30 11:10:45 -05:00
Dirk Behme
5ec789f6cb OMAP3: SDP3430: Fix ARM relocation support
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-11-30 11:10:40 -05:00
Nobuhiro Iwamatsu
e2b5afc1bf sh: r7780mp: Remove CONFIG_DRIVER_NE2000 from config
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2010-11-30 09:30:26 +09:00
Minkyu Kang
177feff303 S5P: goni: fix for relocation
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
2010-11-30 08:45:25 +09:00
Minkyu Kang
98877c3c0e S5P: smdkc100: fix for relocation
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
2010-11-30 08:45:19 +09:00
Vaibhav Hiremath
aa82d5f2a6 AM3517:Build FIX: undef CONFIG_CMD_NFS support
Without CONFIG_CMD_NET support CONFIG_CMD_NFS leads
to linking error, so disable CONFIG_CMD_NFS option.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-11-29 16:36:07 -05:00
Vaibhav Hiremath
13acfc6f7f AM3517:Fix for ARM Relocation support
Also change the CONFIG_SYS_TEXT_BASE to 0x80008000, required
with relocation support. This is the load address for primary
boot loader (x-loader).

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-11-29 16:36:04 -05:00
Sanjeev Premi
f899198a7f omap3evm: Use GENERATED_GBL_DATA_SIZE
The macro CONFIG_SYS_GBL_DATA_SIZE has been replaced
with GENERATED_GBL_DATA_SIZE.

Also define macros: CONFIG_SYS_INIT_RAM_ADDR and
CONFIG_SYS_INIT_RAM_SIZE.

Based on changes for omap3_beagle in the commit:
 31bfcf1c57

Signed-off-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-11-29 16:32:47 -05:00
Enric Balletbo i Serra
84c611d33b ARMV7: OMAP3: Fix build failure for igep0030 machine
Seems that if CONFIG_CMD_NET is undefined we should also
undefine CONFIG_CMD_NFS, otherwise build fails with various
undefined reference like:

  net/libnet.o: In function `rpc_req':
  u-boot/net/nfs.c:193: undefined reference to `NetEthHdrSize'
  u-boot/net/nfs.c:202: undefined reference to `NetSendUDPPacket'
  u-boot/net/nfs.c:203: undefined reference to `NetTxPacket'
  u-boot/net/nfs.c:203: undefined reference to `NetServerEther'

This patch adds the undef CONFIG_CMD_NFS in configuration file.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-11-29 16:30:47 -05:00
Dirk Behme
35cf884de2 OMAP4: SDP4430: Disable CMD_NFS
This patch fixes the SDB4430 build after commit 6d8962e814
by explicitly disabling CMD_NFS.

>From the commit message for "Switch from archive libraries to partial linking":

This commit reveals board configurations that exclude some features but
include source files that depend these disabled features in the build,
resulting in undefined symbols.  Known such cases include:

- disabling CMD_NET but not CMD_NFS;
- enabling CONFIG_OF_LIBFDT but not CONFIG_QE.

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-11-28 20:00:12 -05:00
Semih Hazar
de9b5b12a7 Remove duplicate #defines in atngw100.h and mimc200.h
Two configuration include files had duplicate CONFIG_DOS_PARTITION
definitions with the same value.

This patch does not effect anything, just trims unnecessary text.

Signed-off-by: Semih Hazar <semih.hazar@indefia.com>
2010-11-28 22:32:13 +01:00
Sandeep Paulraj
b485faa602 DaVinci: DM355 Leopard : Fix for ARM Relocation support
Fix for ARM Relocation support

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-11-28 17:58:13 +01:00
Sandeep Paulraj
47fefac4c9 DaVinci DM365: Fix for ARM Relocation support
Fix for ARM Relocation support

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
2010-11-28 17:58:12 +01:00