summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* powerpc, mpc83xx: add missing functions to include/common.hHeiko Schocher2011-04-30-0/+5
| | | | | | | | | | | | | | | | | add following functions to common.h, to prevent extern declarations: void disable_addr_trans(void); void enable_addr_trans(void); void ddr_enable_ecc(unsigned int dram_size); Signed-off-by: Heiko Schocher <hs@denx.de> Acked-by: Kim Phillips <kim.phillips@freescale.com> cc: Kim Phillips <kim.phillips@freescale.com> cc: Holger Brunck <holger.brunck@keymile.com> cc: Wolfgang Denk <wd@denx.de> cc: Detlev Zundel <dzu@denx.de> cc: Valentin Longchamp <valentin.longchamp@keymile.com>
* Merge branch 'master' of git://git.denx.de/u-boot-mmcWolfgang Denk2011-04-29-24/+26
|\
| * mmc: coding style fix and tabify of mmc.hThomas Chou2011-04-29-22/+22
| | | | | | | | Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
| * MMC: make b_max unconditionalJohn Rigby2011-04-29-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make existing field b_max field in struct mmc unconditional and use it instead of CONFIG_SYS_MMC_MAX_BLK_COUNT in mmc_bread and mmc_bwrite. Initialize b_max to CONFIG_SYS_MMC_MAX_BLK_COUNT in mmc_register if it has not been initialized by the hw driver. Initialize b_max to 0 in all callers to mmc_register. Signed-off-by: John Rigby <john.rigby@linaro.org> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * ARMV7: Vexpress: Add MMC supportMatt Waddel2011-04-29-0/+4
| | | | | | | | | | | | Added the board specific definitions to use the MMCI device. Signed-off-by: Matt Waddel <matt.waddel@linaro.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2011-04-28-48/+15
|\ \
| * | powerpc: use 'video-mode' environment variable to configure DIUTimur Tabi2011-04-28-48/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the 'video-mode' environment variable (for Freescale chips that have a DIU display controller) to designate the full video configuration. Previously, the DIU driver used the 'monitor' variable, and it was used only to determine the output video port. The old definition of the "monitor" environment variable only determines which video port to use for output. This variable was set to a number (0, 1, or sometimes 2) to specify a DVI, LVDS, or Dual-LVDS port. The resolution was hard-coded into board-specific code. The Linux command-line arguments needed to be hard-coded to the proper video definition string. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-i2cWolfgang Denk2011-04-28-2/+0
|\ \
| * | i2c: add i2c deblock sequence before and after every mux configStefan Bigler2011-04-28-2/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure that the mux can be configured a deblocking sequence is done before the mux configuration. After the mux switch the new leaf of, the i2c tree must be again deblocked. Signed-off-by: Stefan Bigler <stefan.bigler@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> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
* | Add CONFIG_OF_LIBFDT to more boards.Grant Likely2011-04-28-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following boards gain device tree support with this patch: ca9x4_ct_vxp - Versatile Express i.mx5 boards: efikamx mx51evk mx53evk OMAP boards: devkit8000 igep0020 igep0030 omap3_overo omap3_pandora omap4_sdp3430 omap3_zoom1 omap3_zoom2 omap4_panda omap4_sdp4430 Tegra boards: Harmony Signed-off-by: Grant Likely <grant.likely@linaro.org>
* | arm: a320: fix compile error caused by commit 00d10ebPo-Yu Chuang2011-04-28-1/+0
|/ | | | Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com>
* common: add a grepenv commandKim Phillips2011-04-28-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | u-boot environments, esp. when boards are shared across multiple users, can get pretty large and time consuming to visually parse. The grepenv command this patch adds can be used in lieu of printenv to facilitate searching. grepenv works like printenv but limits its output only to environment strings (variable name and value pairs) that match the user specified substring. the following examples are on a board with a 5313 byte environment that spans multiple screen pages: Example 1: summarize ethernet configuration: => grepenv eth TSEC etact=FM1@DTSEC2 eth=FM1@DTSEC4 ethact=FM1@DTSEC2 eth1addr=00:E0:0C:00:8b:01 eth2addr=00:E0:0C:00:8b:02 eth3addr=00:E0:0C:00:8b:03 eth4addr=00:E0:0C:00:8b:04 eth5addr=00:E0:0C:00:8b:05 eth6addr=00:E0:0C:00:8b:06 eth7addr=00:E0:0C:00:8b:07 eth8addr=00:E0:0C:00:8b:08 eth9addr=00:E0:0C:00:8b:09 ethaddr=00:E0:0C:00:8b:00 netdev=eth0 uprcw=setenv ethact $eth;setenv filename p4080ds/R_PPSXX_0xe/rcw_0xe_2sgmii_rev2_high.bin;setenv start 0xe8000000;protect off all;run upimage;protect on all upuboot=setenv ethact $eth;setenv filename u-boot.bin;setenv start eff80000;protect off all;run upimage;protect on all upucode=setenv ethact $eth;setenv filename fsl_fman_ucode_P4080_101_6.bin;setenv start 0xef000000;protect off all;run upimage;protect on all usdboot=setenv ethact $eth;tftp 1000000 $dir/$bootfile;tftp 2000000 $dir/initramfs.cpio.gz.uboot;tftp c00000 $dir/p4080ds-usdpaa.dtb;setenv bootargs root=/dev/ram rw console=ttyS0,115200 $othbootargs;bootm 1000000 2000000 c00000; => Example 2: detect unused env vars: => grepenv etact etact=FM1@DTSEC2 => Example 3: reveal hardcoded variables; e.g., for fdtaddr: => grepenv fdtaddr fdtaddr=c00000 nfsboot=setenv bootargs root=/dev/nfs rw nfsroot=$serverip:$rootpath ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off console=$consoledev,$baudrate $othbootargs;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr - $fdtaddr ramboot=setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr => grep $fdtaddr fdtaddr=c00000 my_boot=bootm 0x40000000 0x41000000 0x00c00000 my_dtb=tftp 0x00c00000 $prefix/p4080ds.dtb nohvboot=tftp 1000000 $dir/$bootfile;tftp 2000000 $dir/$ramdiskfile;tftp c00000 $dir/$fdtfile;setenv bootargs root=/dev/ram rw ramdisk_size=0x10000000 console=ttyS0,115200;bootm 1000000 2000000 c00000; => This patch also enables the grepenv command by default on corenet_ds based boards (and repositions the DHCP command entry to keep the list sorted). Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Cc: Kumar Gala <kumar.gala@freescale.com> Cc: Andy Fleming <afleming@freescale.com>
* mpc52xx, digsy_mtc: change phy addr for rev5 boards.Heiko Schocher2011-04-28-0/+4
| | | | | | | | | | - rev5 board has phy addr 1 -> adapt CONFIG_PHY_ADDR define in board config file. - also fixup the phy addr entry in dts, before booting Linux. Signed-off-by: Heiko Schocher <hs@denx.de> Acked-by: Detlev Zundel <dzu@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2011-04-27-313/+1644
|\
| * nhk8815: add support for relocationAlessandro Rubini2011-04-27-0/+5
| | | | | | | | | | | | | | | | | | | | This patch defines all the needed symbols in the header file and removes the now-unused config.mk in board directory. Changes to board C file as requested. Signed-off-by: Alessandro Rubini <rubini@gnudd.com> Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
| * cpuat91: fix board supportEric Benard2011-04-27-63/+78
| | | | | | | | | | | | | | | | - fix board support following relocation changes - switch to boards.cfg - disable i2c to keep size under 128kiB (1 sector) Signed-off-by: Eric Bénard <eric@eukrea.com>
| * ftsmc020: move ftsmc020 static mem controller to driver/mtdMacpaul Lin2011-04-27-1/+82
| | | | | | | | | | | | | | | | | | | | | | Move the header file and definitions of ftsmc020 static memory control unit from a320 SoC folder to "drivers/mtd" folder. This change will let other SoC which also use ftsmc020 could share the same header file. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
| * ftsdmc020: move ftsdmc020.h to include/faradayMacpaul Lin2011-04-27-0/+103
| | | | | | | | | | | | | | | | | | | | Move the header file "ftsdmc020.h" (SDRAM Controller) to "include/faraday" folder. This change will let other SoC which also use ftsdmc020 could share the same header file. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
| * cpu9260: update board supportEric Benard2011-04-27-98/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - update to new relocation code - switch to boards.cfg - get rid of LEGACY (still a little hack in .h to compile) - add nand boot configuration - boot tested for the following configurations : 9260 (64MB RAM & nor boot) 9260_nand (64MB RAM & nand boot) 9G20_128M (128MB RAM & nor boot) 9G20_nand_128M (128MB RAM & nand boot) (nor boot is using lowlevel init) Signed-off-by: Eric Bénard <eric@eukrea.com>
| * ARMV7: OMAP3: Add support for Comelit DIG297 boardLuca Ceresoli2011-04-27-0/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Board support for the DIG297 board manufactured by Comelit Group SpA. It is a custom board based on the BeagleBoard <http://beagleboard.org/> by Texas Instruments. The board support is based on the BeagleBoard implementation. Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Cc: Albert Aribaud <albert.aribaud@free.fr> Cc: Sandeep Paulraj <s-paulraj@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * ARMV7: OMAP3: Cleanup extern variables in mem.cLuca Ceresoli2011-04-27-123/+53
| | | | | | | | | | | | | | | | | | | | | | | | Removed boot_flash_* extern variables. boot_flash_type was totally unused. The other ones were actually constants, so they have been replaced with #defines in the board config files. Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Cc: Albert Aribaud <albert.aribaud@free.fr> Cc: Sandeep Paulraj <s-paulraj@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * arm: Tegra2: add support for A9 CPU initTom Warren2011-04-27-0/+4
| | | | | | | | Signed-off-by: Tom Warren <twarren@nvidia.com>
| * omap3_beagle: enable EHCI and USB storage.Alexander Holler2011-04-27-0/+6
| | | | | | | | | | | | | | | | | | | | The reset sequence/configuration for ehci is highly board specific, so this will be done in the source for the board, instead of introducing several CONFIG_* which would be needed to make those few lines in beagle.c usable across different OMAP boards. Signed-off-by: Alexander Holler <holler@ahsoftware.de> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * ARM: OMAP3: Revamp IGEP module default configurationEnric Balletbo i Serra2011-04-27-5/+52
| | | | | | | | | | | | | | | | The default IGEP configuration doesn't do anything useful; using some boot.scr search logic like BeagleBoard is much more useful. Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * ARM: OMAP3: Revamp IGEP v2 defaultEnric Balletbo i Serra2011-04-27-5/+52
| | | | | | | | | | | | | | | | | | | | | | configuration The default IGEP configuration doesn't do anything useful; using some boot.scr search logic like BeagleBoard is much more useful. Signed-off-by: Loïc Minier <loic.minier@linaro.org> Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * Replace obsolete e-mail addressAlbert ARIBAUD2011-04-27-1/+1
| | | | | | | | Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
| * fttmr010: move fttmr010 header to include/faradayMacpaul Lin2011-04-27-0/+73
| | | | | | | | | | | | | | | | | | | | | | Move the header file and definitions of fttmr010 power control unit from a320 SoC folder to "include/faraday" folder. This change will let other SoC which also use fttmr010 could share the same header file. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
| * ftpmu010.h: add asm support used by lowlevel_initMacpaul Lin2011-04-27-0/+62
| | | | | | | | | | | | | | Add asm support which is ususally used in lowlevel_init to set power related parameters to sdram controller and static memory controller. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
| * ftpmu010: fix relocation and enhance featuresMacpaul Lin2011-04-27-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. ftpmu010.h: fix and add definitions Enhanced for more features and asm related support according to datasheet. Note: - FTPMU010_PDLLCR0_HCLKOUTDIS is "incorrect" in datasheet. - FTPMU010_PDLLCR0_DLLFRANG is only 1 bit at bit #19. (not 20-19) - FTPMU010_PDLLCR0_HCLKOUTDIS is 4 bits at bit #20. (not 24-21) 2. ftpmu010.c: enhance features and fix relocation - The following functions is added for pmu features. ftpmu010_mfpsr_select_dev() ftpmu010_sdramhtc_set() - This patch also fix the declare statement for relocation. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
| * I2C: add i2c support for Armada100 platformLei Wen2011-04-27-0/+1
| | | | | | | | | | | | | | | | Add i2c support to aspenite board with Armada100 soc. Acked-by: Heiko Schocher <hs@denx.de> Acked-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Lei Wen <leiwen@marvell.com>
| * I2C: add i2c support for Pantheon platformLei Wen2011-04-27-0/+2
| | | | | | | | | | | | | | | | Add i2c support to dkb board with pantheon soc. Acked-by: Heiko Schocher <hs@denx.de> Acked-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Lei Wen <leiwen@marvell.com>
| * mv_i2c: use structure to replace the direclty defineLei Wen2011-04-27-0/+2
| | | | | | | | | | | | | | | | | | | | Add i2c_clk_enable in the cpu specific code, since previous platform it, while new platform don't need. In the pantheon and armada100 platform, this function is defined as NULL one. Acked-by: Heiko Schocher <hs@denx.de> Acked-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Lei Wen <leiwen@marvell.com>
| * pxa: move i2c driver to the common placeLei Wen2011-04-27-0/+2
| | | | | | | | | | | | | | | | | | For better sharing with other platform other than pxa's, it is more convenient to put the driver to the common place. Acked-by: Heiko Schocher <hs@denx.de> Acked-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Lei Wen <leiwen@marvell.com>
| * ARMV7: Vexpress: Remove config.mkMatt Waddel2011-04-27-0/+1
| | | | | | | | | | | | Remove obsolete board config.mk. Signed-off-by: Matt Waddel <matt.waddel@linaro.org>
| * arm: a320: use new ftpmu010 APIPo-Yu Chuang2011-04-27-0/+5
| | | | | | | | | | | | | | ftpmu010 related code has been moved to drivers/power/. Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com> Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
| * power: ftpmu010: move drivers/power/ftpmu010.h to include/faradayPo-Yu Chuang2011-04-27-0/+150
| | | | | | | | | | | | | | Also add API declarations. Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com> Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
| * OMAP3: CM-T35: Add support for CM-T3730Igor Grinberg2011-04-27-6/+6
| | | | | | | | | | | | | | | | CM-T3730 is exactly the same board as CM-T35, but it has TI DM3730 SoC onboard and therefore some changes have to take place Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * OMAP3: CM-T35: enable the green LEDIgor Grinberg2011-04-27-0/+15
| | | | | | | | | | Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * OMAP3: CM-T35: fix mmcIgor Grinberg2011-04-27-2/+1
| | | | | | | | | | | | | | Use CONFIG_OMAP3_MMC in cm-t35 configuration file. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * OMAP3: CM-T35: update board files header informationIgor Grinberg2011-04-27-3/+3
| | | | | | | | | | Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * OMAP3: CM-T35: update configIgor Grinberg2011-04-27-1/+4
| | | | | | | | | | | | | | update config for OMAP3 CM-T35 Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * ARMV7: AM3517/05: Add support for CraneBoard.Srinath2011-04-27-0/+340
| | | | | | | | | | | | | | | | It is a low cost reference design based on Sitara AM3517 SoC from Texas Instruments Please refer to <www.craneboard.org> for more details. Signed-off-by: Srinath <srinath@mistralsolutions.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * OMAP3: BeagleBoard: add xM rev B to ID tableKoen Kooi2011-04-27-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Patch was updated by Jason Kridner <jkridner@beagleboard.org>: * Use tabs to match style of other board revisions * Only include board revisions that exist * Default to the same configuration as the latest revision, but without setting 'beaglerev' Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Jason Kridner <jkridner@beagleboard.org> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * omap3_beagle: enable the use of a plain text fileAlexander Holler2011-04-27-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the new env import command it is possible to use plain text files instead of script-images. Plain text files are much easier to handle. E.g. If your boot.scr contains the following: ----------------------------------- setenv dvimode 1024x768-16@60 run loaduimage run mmcboot ----------------------------------- you could create a file named uEnv.txt and use that instead of boot.scr: ----------------------------------- dvimode=1024x768-16@60 uenvcmd=run loaduimage; run mmcboot ----------------------------------- The variable uenvcmd (if existent) will be executed (using run) after uEnv.txt was loaded. If uenvcmd doesn't exist the default boot sequence will be started, therefore you could just use ----------------------------------- dvimode=1024x768-16@60 ----------------------------------- as uEnv.txt because loaduimage and mmcboot is part of the default boot sequence Signed-off-by: Jason Kridner <jkridner@beagleboard.org> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * BeagleBoard: Added LED driverJason Kridner2011-04-27-0/+13
| | | | | | | | | | | | | | | | | | | | Added LED driver using status_led. USR0 is set to monitor the boot status. USR1 is set to be the green LED. Included adding configuration and command to the default configuration. Signed-off-by: Jason Kridner <jkridner@beagleboard.org> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * IMX: MX31: Cleanup include files and drop nasty #ifdef in driversStefano Babic2011-04-27-4/+4
| | | | | | | | | | | | | | | | | | | | As exception among the i.MX processors, the i.MX31 has headers without general names (mx31-regs.h, mx31.h instead of imx-regs.h and clock.h). This requires several nasty #ifdef in the drivers to include the correct header. The patch cleans up the driver and renames the header files as for the other i.MX processors. Signed-off-by: Stefano Babic <sbabic@denx.de>
| * MX5: Enable flat-device-tree support on mx51/53 evk boardLiu Hui-R643432011-04-27-0/+6
| | | | | | | | | | | | | | | | device tree for uboot arm support has already been enabled in the master branch. This patch enable device tree support for mx51/53 evk board for DT test. Signed-off-by: Jason Liu <r64343@freescale.com>
| * MX31: qong: add watchdogStefano Babic2011-04-27-0/+1
| | | | | | | | Signed-off-by: Stefano Babic <sbabic@denx.de>
| * MX51: drop config.mk from mx51evkStefano Babic2011-04-27-0/+2
| | | | | | | | | | | | | | | | The config.mk file in board directory is now obsolete and should be removed. Add option for the IMX image into boards.cfg Signed-off-by: Stefano Babic <sbabic@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-fdtWolfgang Denk2011-04-27-12/+5
|\ \