summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2010-12-14-8/+11
|\
| * DaVinci DM6446: Config UpdateSandeep Paulraj2010-12-11-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | tsec: Revert to setting TBICR_ANEG_ENABLE by default for SGMIIKumar Gala2010-12-13-8/+20
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following commit: commit 46e91674fb4b6d06c6a4984c0b5ac7d9a16923f4 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>
* Merge branch 'master' of git://git.denx.de/u-boot-imxWolfgang Denk2010-12-09-3/+4
|\
| * mx51evk: savenv or env save command does not workJason Liu2010-11-21-3/+4
| | | | | | | | | | | | | | | | fix saveenv or env save command not work on mx51evk board. with this patch, we can use savenv or env save to store enviroments to mmc card slot 0 Signed-off-by: Jason Liu <r64343@freescale.com>
* | include/linux/mii.h: update for supporting GEMacpaul Lin2010-12-09-74/+107
| | | | | | | | | | | | | | | | This file has been synced (copy) from Linux source code. This commit was based on kernel 2.6.32. It updates gigabit related phy registers and basic definitions. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2010-12-08-1/+331
|\ \
| * | arm920t/at91/timer: replace bss variables by gdAndreas Bießmann2010-12-07-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | at91rm9200ek: add configure target for RAM bootAndreas Bießmann2010-12-07-0/+14
| | | | | | | | | | | | | | | | | | | | | 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>
| * | at91rm9200ek: fix SDRAM initialistation valuesAndreas Bießmann2010-12-07-1/+1
| | | | | | | | | | | | Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | AT91: add TOP9000 supportReinhard Meyer2010-12-07-0/+314
| | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2010-12-06-1/+0
|\ \ \
| * | | mpc512x: aria: cleanup board config fileAnatolij Gustschin2010-12-01-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | powerpc/85xx: Enable HWCONFIG on MPC8572DSKumar Gala2010-12-01-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | We need HWCONFIG to allow configuration of DDR params Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | | powerpc/8xxx: Fix _POST_WORD_ADDR on 85xx & 86xx systemsKumar Gala2010-12-01-2/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | We intended to use the PIC TFRR register however we where missing adding in the PIC register base offset from IMMR when we defined _POST_WORD_ADDR. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2010-11-30-1/+36
|\ \ \
| * \ \ Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2010-11-30-1/+36
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of git://git.denx.de/u-boot-samsungWolfgang Denk2010-11-30-0/+4
| | |\ \
| | | * | S5P: goni: fix for relocationMinkyu Kang2010-11-30-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| | | * | S5P: smdkc100: fix for relocationMinkyu Kang2010-11-30-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| | * | | OMAP3: Zoom2: Fix ARM relocation supportDirk Behme2010-11-30-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| | * | | OMAP3: Zoom1: Fix ARM relocation supportDirk Behme2010-11-30-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| | * | | OMAP3: SDP3430: Fix ARM relocation supportDirk Behme2010-11-30-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| | * | | AM3517:Build FIX: undef CONFIG_CMD_NFS supportVaibhav Hiremath2010-11-29-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | AM3517:Fix for ARM Relocation supportVaibhav Hiremath2010-11-29-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | omap3evm: Use GENERATED_GBL_DATA_SIZESanjeev Premi2010-11-29-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: 31bfcf1c5776df3d90286aa15104c45096d53dc6 Signed-off-by: Sanjeev Premi <premi@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| | * | | ARMV7: OMAP3: Fix build failure for igep0030 machineEnric Balletbo i Serra2010-11-29-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | OMAP4: SDP4430: Disable CMD_NFSDirk Behme2010-11-28-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the SDB4430 build after commit 6d8962e814c15807dd6ac5757904be2a02d187b8 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>
* | | | | powerpc/85xx: Introduce CONFIG_SYS_EXTRA_ENV_RELOCKumar Gala2010-11-30-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2010-11-30-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of git://git.denx.de/u-boot-shWolfgang Denk2010-11-30-1/+0
| |\ \ \ \
| | * | | | sh: r7780mp: Remove CONFIG_DRIVER_NE2000 from configNobuhiro Iwamatsu2010-11-30-1/+0
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | | | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2010-11-30-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | mpc83xx: Fix for MPC8360 ATM Quad OC3 External PhysStefan Popa2010-11-30-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Added PCI_DEVICE_ID_PLX_9030.Horst Kronstorfer2010-11-28-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Added PCI device ID for the PLXTech PCI 9030 bridge. Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
* | | | Remove duplicate #defines in atngw100.h and mimc200.hSemih Hazar2010-11-28-4/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | DaVinci: DM355 Leopard : Fix for ARM Relocation supportSandeep Paulraj2010-11-28-0/+6
| | | | | | | | | | | | | | | | | | Fix for ARM Relocation support Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* | | DaVinci DM365: Fix for ARM Relocation supportSandeep Paulraj2010-11-28-0/+6
| | | | | | | | | | | | | | | | | | Fix for ARM Relocation support Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* | | DaVinci DM355: Fix for ARM Relocation supportSandeep Paulraj2010-11-28-0/+6
| | | | | | | | | | | | | | | | | | Fix for ARM Relocation support Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* | | Devkit8000: Fix build after introduction of GENERATED_GBL_DATA_SIZEThomas Weber2010-11-28-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the issue by defining and using CONFIG_SYS_INIT_RAM_SIZE and CONFIG_SYS_INIT_RAM_ADDR. This patch adopts the commit 31bfcf1c5776df3d90286aa15104c45096d53dc6 from Steve Sakoman and Sandeep Paulraj on Devkit8000. Signed-off-by: Thomas Weber <weber@corscience.de>
* | | Coding Style (white space) cleanupWolfgang Denk2010-11-27-6/+6
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | 74xx_7xx: Cleanup for partial linking and --gc-sectionsWolfgang Denk2010-11-27-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* | | 8260: Cleanup for partial linking and --gc-sectionsWolfgang Denk2010-11-27-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* | | 824x: Cleanup for partial linking and --gc-sectionsWolfgang Denk2010-11-27-0/+3
| | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* | | 5xxx: Cleanup for partial linking and --gc-sectionsWolfgang Denk2010-11-27-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* | | 5xx: Cleanup for partial linking and --gc-sectionsWolfgang Denk2010-11-27-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* | | 8xx: Cleanup for partial linking and --gc-sectionsWolfgang Denk2010-11-27-13/+7
| | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* | | ppc4xx: Cleanup for partial linking and --gc-sectionsWolfgang Denk2010-11-27-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adapts 4xx boards for partial linking with --gc-sections. Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: Tirumala Marri <tmarri@apm.com> Cc: David Updegraff <dave@cray.com> Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Cc: Dirk Eibach <eibach@gdsys.de> Cc: Larry Johnson <lrj@acm.org> Cc: Peter De Schrijver <p2@mind.be> Cc: Niklaus Giger <niklaus.giger@netstal.com> Cc: Daniel Poirot <dan.poirot@windriver.com> Acked-by: Stefan Roese <sr@denx.de>
* | | 83xx: Fix NAND_SPL link addressScott Wood2010-11-27-24/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the same fix for 83xx as was done for 85xx in commit 96196a1f7546904563994d2d041804a816d7c139. Without this, NAND SPLs are built with the text base intended for the main image, resulting in a broken, very large u-boot-nand.bin. The block of defines for NAND boot is moved closer to where CONFIG_SYS_TEXT_BASE is defined. We can't directly use CONFIG_SYS_NAND_U_BOOT_DST in the definition of CONFIG_SYS_TEXT_BASE because autoconf.mk will include the literal text "CONFIG_SYS_NAND_U_BOOT_DST", but at least keep them close and point out that they're supposed to be the same. Signed-off-by: Scott Wood <scottwood@freescale.com>
* | | PPChameleonEVB and CATcenter need a custom linker scriptWolfgang Denk2010-11-26-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These boards use an embedded environment, which is not supported by the generic arch/powerpc/cpu/ppc4xx/u-boot.lds script. The breakage was introduced by commit 2cd95a2 "ppc4xx: Remove board specific linker scripts from most PPC4xx boards" Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: Andrea Marson <andrea.marson@dave-tech.it> Acked-by: Stefan Roese <sr@denx.de>