summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* video: parse the video-mode environment variableTimur Tabi2011-04-28-0/+86
| | | | | | | | | | | | | | | | | Add function video_get_video_mode(), which parses the "video-mode" environment variable and returns each of its components. The format matches the video= command-line option used for Linux: video-mode=<driver>:<xres>x<yres>-<depth>@<freq><,option=string> <driver> The video driver, ignored by U-Boot <xres> The X resolution (in pixels) to use. <yres> The Y resolution (in pixels) to use. <depth> The color depth (in bits) to use. <freq> The frequency (in Hz) to use. <options> A comma-separated list of device-specific options Signed-off-by: Timur Tabi <timur@freescale.com>
* cfb_console: fix RLE bitmap drawing codeAnatolij Gustschin2011-04-28-4/+15
| | | | | | | | | | | | | | | | | | | | There seems to be tools producing incorrect 'end of bitmap data' markers '0100' in a RLE bitmap. Drawing such bitmaps can result in overwriting memory above the frame buffer. E.g. on MPC5121e based boards this memory can contain U-Boot environment. We may not rely on the correct end of bitmap data marker 0001 only, but also have to check whether we are going to draw a valid frame buffer scan line. The patch provides a fix by maintaining a pixel counter which is incremented by the amount of pixels we are going to draw. If the counter exceeds frame buffer pixels limit we stop the drawing with the error message. Reported-by: Michael Weiss <michael.weiss@ifm.com> Signed-off-by: Anatolij Gustschin <agust@denx.de> Tested-by: Anatolij Gustschin <agust@denx.de>
* common: add a grepenv commandKim Phillips2011-04-28-4/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* powerpc: fix implementation of out_8 to match the other out_XX functionsTimur Tabi2011-04-28-1/+4
| | | | Signed-off-by: Timur Tabi <timur@freescale.com>
* env: fix env var autocompletionKim Phillips2011-04-28-1/+1
| | | | | | | | | | | | | | | | commit 560d424b6d7cd4205b062ad95f1b104bd4f8bcc3 "env: re-add support for auto-completion" fell short of its description - the 'used' logic in hmatch_r was reversed - 'used' is 0 if the hash table entry is not used, or -1 if deleted. This patch makes hmatch_r actually match on valid ('used') entries, instead of skipping them and failing to match anything. typing 'printenv tft' and hitting 'tab' now displays valid choices for variable names. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Cc: Mike Frysinger <vapier@gentoo.org> Tested-by: Mike Frysinger <vapier@gentoo.org>
* mpc52xx, digsy_mtc: protect default flash sectorsHeiko Schocher2011-04-28-0/+2
| | | | | | call flash_protect_default() to protect default sectors. Signed-off-by: Heiko Schocher <hs@denx.de>
* mpc52xx, digsy_mtc: change phy addr for rev5 boards.Heiko Schocher2011-04-28-0/+9
| | | | | | | | | | - 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>
* NET: Correct potential missing goto label in case statement.Gray Remlin2011-04-28-1/+2
| | | | | | | | If neither CONFIG_CMD_PING or CONFIG_CMD_SNTP are defined but CONFIG_CMD_DNS is, a compile-time error will occur due to the absence of a goto label. Signed-off-by: Gray Remlin <gryrmln@gmail.com>
* fix redundant environment for serial flashthomas.langer@lantiq.com2011-04-28-27/+12
| | | | | | | | | | | | This patch fixes problems in the handling of redundant environment in env_sf.c The major problem are double calls of free() on the allocated buffers, which damages the internal data of malloc and crashes on next call. In addition, the selection of the active environment had errors and compiler warnings, which are corrected by this patch. Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
* Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2011-04-27-1328/+5293
|\
| * Don't grab memory for LCD if FB address is definedMinkyu Kang2011-04-27-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | If FB address is defined specific address then don't grab memory for LCD Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Cc: Albert Aribaud <albert.aribaud@free.fr> Cc: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: Kim Phillips <kim.phillips@freescale.com> Cc: Andy Fleming <afleming@gmail.com> Cc: Kumar Gala <kumar.gala@freescale.com>
| * nhk8815: move config targets from Makefile to boards.cfgAlessandro Rubini2011-04-27-9/+2
| | | | | | | | | | Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
| * nhk8815: add support for relocationAlessandro Rubini2011-04-27-28/+12
| | | | | | | | | | | | | | | | | | | | 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>
| * nhk8815: remove platform.S, which was unused at link timeAlessandro Rubini2011-04-27-341/+1
| | | | | | | | | | | | | | | | | | | | | | This source file, which I got by the vendor in their own port, was not actually executing because lib-based compilation didn't call lowlevel_init (we have CONFIG_SKIP_LOWLEVEL_INIT). With the change to object-based linking, an undefined symbol in this file started hitting in the final link. Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
| * cpuat91: fix board supportEric Benard2011-04-27-82/+87
| | | | | | | | | | | | | | | | - 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-4/+6
| | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | 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-208/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * Fix the issue of _end symbol not being found while buildingSughosh Ganu2011-04-27-0/+2
| | | | | | | | | | | | Fix the nand_spl build for the hawkboard Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
| * ARMV7: OMAP3: Add support for Comelit DIG297 boardLuca Ceresoli2011-04-27-0/+936
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-155/+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: Move clk/mux init to board_early_init_f, add GPIO initTom Warren2011-04-27-11/+113
| | | | | | | | Signed-off-by: Tom Warren <twarren@nvidia.com>
| * arm: Tegra2: GPIO: Add basic GPIO definitionsTom Warren2011-04-27-0/+60
| | | | | | | | Signed-off-by: Tom Warren <twarren@nvidia.com>
| * arm: Tegra2: Add missing PLLX initTom Warren2011-04-27-2/+33
| | | | | | | | Signed-off-by: Tom Warren <twarren@nvidia.com>
| * ARM: fix stack pointer adjustment in board_init_f()Eric Cooper2011-04-27-1/+1
| | | | | | | | | | | | | | | | Since addr_sp is a byte address, it should be adjusted by 12 here. Signed-off-by: Eric Cooper <ecc@cmu.edu> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Acked-by: Wolfgang Denk <wd@denx.de>
| * arm: Tegra2: add support for A9 CPU initTom Warren2011-04-27-1/+669
| | | | | | | | Signed-off-by: Tom Warren <twarren@nvidia.com>
| * ARMV7: OMAP3: Add GPMC_CONFIGx register value definitionsLuca Ceresoli2011-04-27-0/+95
| | | | | | | | | | Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * ARMV7: OMAP3: Fix preprocessor check for CONFIG_OMAP34XXLuca Ceresoli2011-04-27-1/+1
| | | | | | | | | | | | | | | | | | | | CONFIG_OMAP34XX must be checked for existence, not value. 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>
| * omap3_beagle: enable EHCI and USB storage.Alexander Holler2011-04-27-0/+170
| | | | | | | | | | | | | | | | | | | | 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>
| * OMAP3: Add support for DPLL5 (usbhost)Alexander Holler2011-04-27-5/+85
| | | | | | | | | | Signed-off-by: Alexander Holler <holler@ahsoftware.de> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * OMAP3: Change some USB related MUX valuesAlexander Holler2011-04-27-13/+14
| | | | | | | | | | 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-18/+18
| | | | | | | | Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
| * a320evb: fix include path of timer fttmr010Macpaul Lin2011-04-27-1/+1
| | | | | | | | | | | | Fix include path of timer fttmr010 in a320evb. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
| * fttmr010: move fttmr010 header to include/faradayMacpaul Lin2011-04-27-0/+0
| | | | | | | | | | | | | | | | | | | | | | 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-5/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Orion5x: Correct DRAM bank detectionRogan Dawes2011-04-27-1/+2
| |
| * I2C: add i2c support for Armada100 platformLei Wen2011-04-27-18/+56
| | | | | | | | | | | | | | | | 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: mv_i2c: add multi bus supportLei Wen2011-04-27-1/+35
| | | | | | | | | | | | | | | | Add the ability to support multiple i2c bus for mv_i2c 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-3/+35
| | | | | | | | | | | | | | | | 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-137/+164
| | | | | | | | | | | | | | | | | | | | 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>
| * mv_i2c: fix timeout value to be consistent with commentsLei Wen2011-04-27-1/+1
| | | | | | | | | | | | | | | | | | The original 10000 value would be 100ms, which is not the comments said. 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-73/+58
| | | | | | | | | | | | | | | | | | 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>
| * MX25: tx25: Add _end section on nand_splFabio Estevam2011-04-27-0/+2
| | | | | | | | | | | | | | | | | | Commit f326cbb (arm: fix incorrect monitor protection region in FLASH) missed to update nand_spl/board/karo/tx25/u-boot.lds. Add the _end section. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * MX31: mx31pdk: fix nand_splStefano Babic2011-04-27-0/+2
| | | | | | | | | | | | | | | | | | | | Commit f326cbba98bae21d41df8daac0bd78121d557af1 breaks mx31pdk, as the _end section in u-boot.lds is missing for the nand_spl production. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Fabio Estevam <fabio.estevam@freescale.com> Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
| * ARMV7: Vexpress: Remove config.mkMatt Waddel2011-04-27-22/+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-20/+8
| | | | | | | | | | | | | | 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-1/+5
| | | | | | | | | | | | | | Also add API declarations. Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com> Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>