summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* autoconfig.mk: avoid apostophes around hex valuesWolfgang Denk2010-10-18-2/+6
| | | | | | | | | | | When generating include/autoconfig.mk, hex numbers would be quoted. This caused some false positives during automatic testing of the builds, and is known to cause some real issues for some Blackfin configurations. Don't use apostophes for decimal and hex numbers (nor for octal numbers). Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Rename TEXT_BASE into CONFIG_SYS_TEXT_BASEWolfgang Denk2010-10-18-1435/+1493
| | | | | | | | | | | | The change is currently needed to be able to remove the board configuration scripting from the top level Makefile and replace it by a simple, table driven script. Moving this configuration setting into the "CONFIG_*" name space is also desirable because it is needed if we ever should move forward to a Kconfig driven configuration system. Signed-off-by: Wolfgang Denk <wd@denx.de>
* mkconfig: change CONFIG_MK_ prefix into plain CONFIG_Wolfgang Denk2010-10-18-59/+54
| | | | | | | | | | | | | | | | | | | | When planning for more generalization and Makefile cleanup it became obvious that the introduction of a separate CONFIG_MK_ name space for config options that were set through scripting in the Makefile was not a good idea. Originally the idea was to provide a script-free approach to supply configuration options - there was no real need for a separate name space. But when we now convert the existing Makefile entries to make use of this approach, it would mean that we have to touch a large number of board config files and add #ifdef / #define sequences to "convert" from the CONFIG_MK_ to the CONFIG_ name space. It seems much cleaner to get rid of this somewhat arbitrary _MK string now for the few boards that actually use it. Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Mike Frysinger <vapier@gentoo.org>
* Build: Add "board options" column to boards.cfgMarek Vasut2010-10-18-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some boards where it's currently not possible to detect all board information at runtime, therefore a new column was added to boards.cfg . This column can contain multiple options: a board configuration name, optionally followed by a colon (':') and a list of options, which are separated by comma (','). In case of simple options like '256M_U_BOOT', these expand to "#define CONFIG_MK_256M_U_BOOT 1" in config.h . In case of assignments like 'RAM=8192', these expand to "#define CONFIG_MK_RAM 8192" in config.h . Example: FOO:HAS_BAR,BAZ=64 means: - the name of the board config file is include/configs/FOO.h - the generated file include/config.h will contain these lines: #define CONFIG_HAS_BAR 1 #define CONFIG_BAZ 64 Signed-off-by: Marek Vasut <marek.vasut@gmail.com> [wd@denx.de: edited commit message; added code to deal with an optional board configuration name] Signed-off-by: Wolfgang Denk <wd@denx.de>
* Makefile: clean MatrixVision buildsWolfgang Denk2010-10-18-0/+1
| | | | | | | | | | | | "make clean" after builds of MatrixVision boards would leave stale files around: board/matrix_vision/mvblm7/bootscript.img board/matrix_vision/mvsmr/bootscript.img Fix this. Signed-off-by: Wolfgang Denk <wd@denx.de>
* mpc83xx: fix 837x MDS PCI HOST buildKim Phillips2010-10-18-1/+1
| | | | | | | | | | | | | | commit 6aa3d3bfaa986f1aff5e21a9b9f68d087715b1a9 "83xx: Remove warmboot parameter from PCI init functions" missed one mpc83xx_pcie_init callsite, causing this build error: Configuring for MPC837XEMDS_HOST board... pci.c: In function 'pci_init_board': pci.c:141: error: too many arguments to function 'mpc83xx_pcie_init' this patch extends the commit to include that callsite. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* MPC832XEMDS: fix pci.c build warningWolfgang Denk2010-10-18-3/+0
| | | | | | | | | Doubled use of DECLARE_GLOBAL_DATA_PTR caused compile warning: pci.c:71: warning: register used for two global register variables Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Kim Phillips <kim.phillips@freescale.com>
* logodl: remove code for yet another corpseWolfgang Denk2010-10-18-1771/+1
| | | | | | | | | | | The logodl board has long been unmaintained and left broken. As obviously nobody is interestedin that code any more, we may as well remove it. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: August Hoeraendl <august.hoerandl@gmx.at> Cc: Robert Schwebel <r.schwebel@pengutronix.de> Cc: Marek Vasut <marek.vasut@gmail.com>
* schmoogie: fix build error due to removal of forceenv()Wolfgang Denk2010-10-18-4/+5
| | | | | | | | | | | | commit 6d014adf dropped support for the forceenv() function, but failed to remove references to it from board/davinci/schmoogie/schmoogie.c Replace forceenv() by setenv() and set CONFIG_ENV_OVERWRITE instead in the board config file to allow overwriting the serial number. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Sergey Kubushyn <ksi@koi8.net> Acked-by: Sergey Kubushyn <ksi@koi8.net>
* FPGA: fix support for non-Lattice devicesWolfgang Denk2010-10-18-0/+12
| | | | | | | | | | | | | | | | | | | | | Commit 3b8ac464 "FPGA: add support for downloading Lattice bitstream" added support for Lattice devices, but failed to add #ifdef's that are needed when building for non-Lattice devices, which results in build failures like these: Configuring for GEN860T board... drivers/fpga/libfpga.a(fpga.o): In function `fpga_dev_info': /home/wd/git/u-boot/work/drivers/fpga/fpga.c:145: undefined reference to `lattice_info' drivers/fpga/libfpga.a(fpga.o): In function `fpga_dump': /home/wd/git/u-boot/work/drivers/fpga/fpga.c:269: undefined reference to `lattice_dump' drivers/fpga/libfpga.a(fpga.o): In function `fpga_load': /home/wd/git/u-boot/work/drivers/fpga/fpga.c:233: undefined reference to `lattice_load' make: *** [u-boot] Error 1 Add the missing code. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefano Babic <sbabic@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2010-10-17-105/+6472
|\
| * da850evm: fix linux bootparam addressBen Gardiner2010-10-17-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the LINUX_BOOT_PARAM_ADDR define to be based off of PHYS_SDRAM_1 instead of CONFIG_SYS_MEMTEST_START. On da830 they are the same thing but on da850 the CONFIG_SYS_MEMSTART define is offset from the PHYS_SDRAM_1 start. Without this patch it is not possible to boot linux on da850 -- bootm hangs at "Uncompressing Linux... done, booting the kernel." Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * da850evm: basic MII EMAC supportBen Gardiner2010-10-17-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current da850evm support in u-boot/master omits any use of the davinci EMAC. This patch adds basic support for the EMAC using the MII PHY found on the baseboard of the EVM. The MAC address is read from the environment variable 'ethadd'. Note that this is different from the da850evm support in the u-boot omapl1 tree where the MAC address is read from SPI flash. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> CC: Sandeep Paulraj <s-paulraj@ti.com> CC: Sudhakar Rajashekhara <sudhakar.raj@ti.com> CC: Ben Warren <biggerbadderben@gmail.com> CC: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * da850evm: add mtdpart and ubi commands with NAND supportBen Gardiner2010-10-17-0/+8
| | | | | | | | | | | | | | | | | | This patch enables also the mtdpart, ubi and ubifs commands when NAND support is enabled. Signed-off-by: Ben Gardiner<bengardiner@nanometrics.ca> To: Sudhakar Rajashekhara <sudhakar.raj@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * da850evm: setup NAND support under CONFIG_USE_NANDBen Gardiner2010-10-17-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current da850evm config is missing the pieces for NAND support that can be found in Sandeep's u-boot-davinci tree [1]. This patch adds NAND support in the spirit of the support in the u-boot-davinci tree where NAND support for the da850evm can be enabled by putting a single '#define CONFIG_USE_NAND' at the top of the include/configs/da850evm.h file. [1] http://arago-project.org/git/people/?p=sandeep/u-boot-davinci.git;a=tree Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * da850evm: setup the NAND flash timingsBen Gardiner2010-10-17-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | The default NAND flash timings are very conservative. This patch assigns the timings reccomended in the recent linux kernel patch [1] from Sekhar Nori. The speedup, as reported in that patch, is 5.3x for reads. [1] http://www.spinics.net/lists/arm-kernel/msg100278.html Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> CC: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * da850evm : enable NAND even when not in NAND boot modeBen Gardiner2010-10-17-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is currently no NAND pinmux enabled by the da850evm board setup code. This is fine when booting from NAND since the early boot code (UBL) will setup the pinmux; however, when the boot mode is any other setting NAND is unusable when enabled in the config. This patch adds a pinmux list for NAND and enables it when NAND is enabled in the config. Tested by booting from SPI on the da850evm and verifying NAND was usable. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> CC: Nick Thompson <nick.thompson@ge.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * davinci_nand, trivial : use symbolic ECC start commandBen Gardiner2010-10-17-1/+2
| | | | | | | | | | | | | | | | | | | | | | The ECC calculations were started by writing 1 << 13 to the nand FCR register; that value is also defined as DAVINCI_NANDFCR_4BIT_CALC_START in emif_defs.h. This patch substitutes the macro DAVINCI_NANDFCR_4BIT_CALC_START for the magic number '1 << 13'. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * OMAP3: Add support for the OMAP3 IGEP module.Enric Balletbo i Serra2010-10-17-0/+519
| | | | | | | | | | | | | | | | | | | | The IGEP module is a low-power, high performance production-ready system-on-module (SOM) based on TI's OMAP3 family.The IGEP module solution based upon TI OMAP3 provides a low-power/low-cost platform for a variety of consumer/industrial/medical devices. Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * OMAP3: Add support for the IGEP v2 board.Enric Balletbo i Serra2010-10-17-0/+601
| | | | | | | | | | | | | | | | | | | | | | | | The IGEP v2 board is a low-cost, fan-less and industrial temperature range single board computer that unleashes laptop-like performance and expandability without the bulk, expense, or noise of typical desktop machines. Its architecture shares much in common with other OMAP3 boards. Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com> Acked-by: Steve Sakoman <steve.sakoman@linaro.org> Tested-by: Steve Sakoman <steve.sakoman@linaro.org> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * OMAP3: SDRC: Introduce Numonyx DDR typeEnric Balletbo i Serra2010-10-17-0/+43
| | | | | | | | | | | | | | | | | | | | Introduce Numonyx DDR timings and provide CONFIG_OMAP3_NUMONYX_DDR config options to allow for platform files to setup their timings. Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com> Acked-by: Steve Sakoman <steve.sakoman@linaro.org> Tested-by: Steve Sakoman <steve.sakoman@linaro.org> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * ARMV7: OMAP4: Implement relocation for Panda and OMAP4430SDPSteve Sakoman2010-10-17-17/+13
| | | | | | | | | | | | | | This patch fixes the build breakage introduced by the recent relocation changes for ARMV7 Signed-off-by: Steve Sakoman <steve@sakoman.com>
| * ARMV7: OMAP3: Fix bug in get_sdr_cs_offset()Steve Sakoman2010-10-17-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a typo in the routine to calculate the cs offset based upon the contents of the SDRC cs_cfg register. This function mistakenly shifts the CS1STARTLOW field 17 bits right instead of 17 bits left. This hasn't been an issue to date because all OMAP3 boards currently are configured to have zeros in this field. Reported-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Steve Sakoman <steve.sakoman@linaro.org>
| * ARMV7: OMAP3: Enable cache support on OveroSteve Sakoman2010-10-17-0/+1
| | | | | | | | Signed-off-by: Steve Sakoman <steve@sakoman.com>
| * ARMV7: OMAP3: Implement relocation for OveroSteve Sakoman2010-10-17-1/+4
| | | | | | | | | | | | | | This patch fixes the build breakage introduced by the recent relocation changes for ARMV7 Signed-off-by: Steve Sakoman <steve@sakoman.com>
| * ARMV7: OMAP4: Enable saveenv to eMMC for SDP4430Sukumar Ghorai2010-10-17-5/+8
| | | | | | | | | | | | | | | | | | | | The SDP4430 does not have onboard NAND, it has eMMC on the second MMC slot. This patch adds support for saving the u-boot environment to eMMC. Signed-off-by: Aneesh V <aneesh@ti.com> Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com> Tested-by: Steve Sakoman <steve@sakoman.com>
| * ARMV7: OMAP4: Use generic mmc driver on OveroSteve Sakoman2010-10-17-4/+15
| | | | | | | | | | | | This patch switches from the legacy mmc driver to the new generic mmc driver Signed-off-by: Steve Sakoman <steve@sakoman.com>
| * ARMV7: OMAP4: Use generic mmc driver on BeagleSteve Sakoman2010-10-17-4/+15
| | | | | | | | | | | | This patch switches from the legacy mmc driver to the new generic mmc driver Signed-off-by: Steve Sakoman <steve@sakoman.com>
| * ARMV7: OMAP4: Use generic mmc driver on SDP4430Sukumar Ghorai2010-10-17-5/+15
| | | | | | | | | | | | | | This patch switches from the legacy mmc driver to the new generic mmc driver Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com> Tested-by: Steve Sakoman <steve@sakoman.com>
| * ARMV7: OMAP4: Use generic mmc driver on PandaSukumar Ghorai2010-10-17-5/+13
| | | | | | | | | | | | | | This patch switches from the legacy mmc driver to the new generic mmc driver Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com> Tested-by: Steve Sakoman <steve@sakoman.com>
| * ARMV7: OMAP: Add new mmc driver compatible with CONFIG_GENERIC_MMCSukumar Ghorai2010-10-17-0/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | OMAP boards currently use a legacy mmc driver. This patch adds a new mmc driver which will work with the generic mmc driver in u-boot. This new driver will work with both OMAP3 and OMAP4 boards. This patch does not remove the old driver. It should remain in the tree until all boards that use it switch to the new driver. Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com> Tested-by: Steve Sakoman <steve@sakoman.com>
| * MMC: Fix for capacity calculation on eMMCSukumar Ghorai2010-10-17-0/+11
| | | | | | | | | | | | | | | | | | | | The current mmc driver returns erroneous capacity information for eMMC. The capacity of eMMC devices is available only in the ext-CSD register. This patch add code to read the ext-CDSD register and correctly calculate eMMC capacity. Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com> Acked-by: Steve Sakoman <steve@sakoman.com>
| * ARMV7: OMAP: Use default vendor/product ID for USB gadgetSteve Sakoman2010-10-17-15/+0
| | | | | | | | | | | | | | TI hasn't reserved a USB Product ID for gadgets, so use the default vendor and product ID to avoid confusion. Signed-off-by: Steve Sakoman <steve@sakoman.com>
| * Merge branch 'master' of git://git.denx.de/u-boot-imxWolfgang Denk2010-10-17-35/+4619
| |\
| | * mx51evk: add u-boot.imx to ALL targetLoic Minier2010-10-14-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Loic Minier <loic.minier@linaro.org> CC: stefano babic <sbabic@denx.de>
| | * MX31: Add USB Host support to the QONG boardStefano Babic2010-10-13-1/+50
| | | | | | | | | | | | Signed-off-by: Stefano Babic <sbabic@denx.de>
| | * MX31: Add support for MXC EHCI controllerStefano Babic2010-10-13-0/+131
| | | | | | | | | | | | | | | | | | The patch adds the EHCI controller for the i.MX31 Soc. Signed-off-by: Stefano Babic <sbabic@denx.de>
| | * MX31: add support for setting pin padsStefano Babic2010-10-13-31/+421
| | | | | | | | | | | | | | | | | | | | | The patch adds a utility function and defines to set the pad as it is done in linux. Signed-off-by: Stefano Babic <sbabic@denx.de>
| | * MX31: Add support to update FPGA bitstreamStefano Babic2010-10-13-3/+111
| | | | | | | | | | | | | | | | | | | | | | | | The patch adds the possibility to update the QONG FPGA (a Lattice XP2-5E) with u-boot using some GPIOs to drive the JTAG interface. Signed-off-by: Stefano Babic <sbabic@denx.de>
| | * MX31: Adding missing iomux pin to MX.31 registersStefano Babic2010-10-13-0/+7
| | | | | | | | | | | | Signed-off-by: Stefano Babic <sbabic@denx.de>
| | * FPGA: add support for downloading Lattice bitstreamStefano Babic2010-10-13-0/+3898
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch adds support to load a Lattice's bitstream image (called VME file) into a Lattice FPGA. The code containing the state machine delivered as part of Lattice's ispVMtools is integrated. The FPGA is programmed using the JTAG interface. The board maintainer must provide accessors to drive the JTAG signals TCK, TMS, TDI and to get the value of the input signal TDO. Signed-off-by: Stefano Babic <sbabic@denx.de>
| * | env_mmc: Fix crashing bug encountered after enabling ARM relocationSteve Sakoman2010-10-13-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash was occuring in env_relocate because it was being called prior to mmc_initialize. This patch moves the MMC initialization earlier in the init process. This patch also cleans up the env_relocate_spec code in env_mmc.c Signed-off-by: Steve Sakoman <steve.sakoman@linaro.org> Acked-by: Stefano Babic <sbabic@denx.de>
* | | Blackfin: workaround anomaly 05000440Mike Frysinger2010-10-14-1/+5
| | | | | | | | | | | | | | | | | | | | | We cannot rely on the syscontrol rom func to program PLL_DIV with anomaly 05000440 is in effect, so manually program the MMR when necessary. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | Blackfin: update anomaly lists to latest sheetsMike Frysinger2010-10-14-10/+35
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | env_mmc: fix cannot save env issueLei Wen2010-10-13-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The env change its implementation after this log, while env mmc didn't change it immediately, which cause issue. Follow to the new style to fix it. commit ea882baf9c17cd142c99e3ff640d3ab01daa5cec Author: Wolfgang Denk <wd@denx.de> Date: Sun Jun 20 23:33:59 2010 +0200 New implementation for internal handling of environment variables. Signed-off-by: Lei Wen <leiwen@marvell.com>
* | | ns16550: Add WATCHDOG_RESET to putc for short watchdog timeout boardsStefan Roese2010-10-13-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call watchdog_reset() upon newline. This is done here in putc since the environment code uses a single puts() to print the complete envrironment upon "printenv". So we can't put this watchdog call in puts(). This is needed for boards with a very short watchdog timeout, like the lwmon5 with a 100ms timeout. Without this patch this board resets in the commands with long outputs, like "printenv" or "fdt print". Note that the image size is not increased with this patch when CONFIG_HW_WATCHDOG or CONFIG_WATCHDOG are not defined since the compiler optimizes this additional code away. Signed-off-by: Stefan Roese <sr@denx.de> Fix typo in comment. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | ppc: Conditionally compile bat_rw.cPeter Tyser2010-10-13-1/+7
| | | | | | | | | | | | | | | | | | | | | Only a few PPC boards actually use the common BAT manipulation functions, so only compile it for them. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* | | Fix define for MPC5121 ADS board.mark.vels@team-embedded.nl2010-10-13-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Originally the Makefile defines CONFIG_ADS5121_REV2 when configuring for board mpc5121ads_rev2. The config in include/configs/mpc5121ads.h expects a define CONFIG_MPC5121ADS_REV2 for this. Therefore there are two defines used but only 1 is defined. This patch renames references to CONFIG_ADS5121_REV2 to CONFIG_MPC5121ADS_REV2 to have one common define. This patch fixes faulty mem size detection caused by wrong config in include/configs/mpc5121ads.h Signed-off-by: Mark Vels <mark.vels@team-embedded.nl>
* | Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2010-10-13-1295/+2954
|\ \
| * | board/armltd/integrator/split_by_variant.sh: fix 'echo -n'Andreas Bießmann2010-10-13-72/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes an error when running MAKEALL for ARM9. On OS X /bin/sh uses builtin echo which does not utilise '-n' switch. GNU manual for builtins recomend to use here-document style to solve this portability issue. This patch removes the usage of 'echo -n' and replace by here-document style or a oneline echo command. Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> CC: Peter Pearse <peter.pearse@arm.com>