summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk2008-04-26-4/+64
|\
| * ppc4xx: Add bootcount limit handling for APC405 boardsMatthias Fuchs2008-04-25-3/+18
| | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
| * ppc4xx: Pass PCIe root-complex/endpoint configuration to Linux via the fdtStefan Roese2008-04-25-1/+46
| | | | | | | | | | | | | | | | | | | | The PCIe root-complex/endpoint setup as configured via the "pcie_mode" environment variable will now get passed to the Linux kernel by setting the device_type property of the PCIe device tree node. For normal root- complex configuration it will keep its defaults value of "pci" and for endpoint configuration it will get changed to "pci-endpoint". Signed-off-by: Stefan Roese <sr@denx.de>
* | ppc4xx: Remove double defines in lwmon5.hStefan Roese2008-04-25-9/+0
| | | | | | | | | | | | introduced with latest lwmon5/POST merge Signed-off-by: Stefan Roese <sr@denx.de>
* | Use watchdog-aware functions when calculating hashes of images - take twoBartlomiej Sieka2008-04-25-36/+31
| | | | | | | | | | | | | | | | | | Some files didn't get updated properly with the "Use watchdog-aware functions when calculating hashes of images" commit, this commit fixes this. Signed-off-by: Bartlomiej Sieka <tur@semihalf.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Use watchdog-aware functions when calculating hashes of imagesBartlomiej Sieka2008-04-25-1/+1
| | | | | | | | Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
* | USB: fix more GCC 4.2.x aliasing warningsWolfgang Denk2008-04-25-6/+6
| | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Markus Klotzbuecher <mk@denx.de>
* | lib_generic/crc32.c: add missing #include <watchdog.h>Wolfgang Denk2008-04-25-0/+1
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | lib_generic/crc32.c: fix compile problemWolfgang Denk2008-04-25-5/+4
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | lwmon5: watchdog POST fixYuri Tikhonov2008-04-25-5/+13
| | | | | | | | | | | | | | | | | | Use the GPT0_MASKx registers as the temporary storage for watch-dog timer POST test instead of GPT0_COMPx. The latter (GPT0_COMP1..GPT0_COMP5) are used for the log-buffer header. Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com> Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
* | Merge branch 'master' of /home/wd/git/u-boot/lwmon5Wolfgang Denk2008-04-25-273/+153
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: common/cmd_bootm.c common/cmd_log.c include/common.h post/board/lwmon5/Makefile post/board/lwmon5/dsp.c post/board/lwmon5/dspic.c post/board/lwmon5/fpga.c post/board/lwmon5/gdc.c post/board/lwmon5/sysmon.c post/board/lwmon5/watchdog.c Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | Added watchdog triggering calls in the "mtest" test function.Sergei Poselenov2008-04-22-0/+7
| | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
| * | lwmon5 watchdog: limit trigger rateYuri Tikhonov2008-04-22-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit the rate of h/w watch-dog triggering on the LWMON5 board by the CONFIG_WD_MAX_RATE value. Note that an earlier version of this patch which used microseconds instead of ticks dis not work. The problem was that we used usec2ticks() to convert microseconds into ticks. usec2ticks() uses get_tbclk(), which in turn calls get_sys_info(). It turns out that this function does a lot of prolonged operations (like divisions) which take too much time so we do not trigger the watchdog in time, and it resets the system. Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * | POST: move CONFIG_POST to MakefilesYuri Tikhonov2008-04-22-29/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce the new logical option CONFIG_HAS_POST which is set when the platform has CONFIG_POST set. Use CONFIG_HAS_POST in the post/ Makefiles to determine should the POST libs be compiled for the selected target platform, or not. To avoid breaking u-boot linking process, the empty post/libpost.a file is created for platforms which do not have POSTs. Signed-off-by: Yuri Tikhonov <yur@emcraft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | POST: preparations for moving CONFIG_POST to MakefilesYuri Tikhonov2008-04-22-182/+2
| | | | | | | | | | | | | | | | | | | | | Remove CONFIG_POST ifdefs from the post/ source files. Signed-off-by: Yuri Tikhonov <yur@emcraft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | lwmon5: Fix register test logic to match the specific GDC h/w.Yuri Tikhonov2008-03-18-6/+12
| | | | | | | | | | | | | | | Signed-off-by: Dmitry Rakhchev <rda@emcraft.com> Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * | Fix backlight in the lwmon5 POST.Yuri Tikhonov2008-03-18-38/+29
| | | | | | | | | | | | | | | | | | | | | Backlight was switcehd on even when temperature was too low. Signed-off-by: Dmitry Rakhchev <rda@emcraft.com> Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * | The patch introduces the alternative configuration of the log buffer forYuri Tikhonov2008-03-18-6/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the lwmon5 board: the storage for the log-buffer itself is OCM(on-chip memory), the log-buffer header is moved to six GPT registers (PPC440EPX_GPT0_COMP1, ..., PPC440EPX_GPT0_COMP5). To enable this, alternative, configuration the U-Boot board configuration file for lwmon5 includes the definitions of alternative addresses for header (CONFIG_ALT_LH_ADDR) and buffer (CONFIG_ALT_LB_ADDR). The Linux shall be configured with the CONFIG_ALT_LB_LOCATION option set, and has the BOARD_ALT_LH_ADDR and BOARD_ALT_LB_ADDR constants defined in the lwmon5 board-specific header (arch/ppc/platforms/4xx/lwmon5.h). Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * | Add support for the lwmon5 board reset via GPIO58.Yuri Tikhonov2008-03-18-0/+7
| | | | | | | | | | | | | | | Signed-off-by: Dmitry Rakhchev <rda@emcraft.com> Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * | Some fixes to dspic, fpga, and gdc post tests for lwmon5.Yuri Tikhonov2008-03-18-2/+6
| | | | | | | | | | | | | | | | | | | | | Disable external watch-dog for now. Signed-off-by: Dmitry Rakhchev <rda@emcraft.com> Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * | The patch introduces the CRITICAL feature of POST tests. If the testYuri Tikhonov2008-03-18-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | marked as POST_CRITICAL fails then the alternative, post_critical, boot-command is used. If this command is not defined then U-Boot enters into interactive mode. Signed-off-by: Dmitry Rakhchev <rda@emcraft.com> Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * | The patch adds new POST tests for the Lwmon5 board.Yuri Tikhonov2008-03-18-4/+931
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are: * External Watchdog test; * dsPIC tests; * FPGA test; * GDC test; * Sysmon tests. Signed-off-by: Dmitry Rakhchev <rda@emcraft.com> Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * | Enable CODEC POST with CFG_POST_CODEC rather than with CFG_POST_DSP.Yuri Tikhonov2008-03-18-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitry Rakhchev <rda@emcraft.com>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flashWolfgang Denk2008-04-25-10/+71
|\ \ \
| * | | PATCH - Fix oob data copied into supplied bufferTroy Kisky2008-04-21-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch correctly sets the oobavail variable and fixes a bug where the oob data was not valid when there where multiple groups in oobfree. First segment fixes a typo Second segment fixes a bug where oob data may be copied incorrectly. Third segment adds an error message when exiting due to write protect. Forth segment fixes a bug where oobavail may be set incorrectly. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
| * | | nand_spl: Update nand_spl to support 2k page size NAND devicesStefan Roese2008-04-18-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for booting from 2k page sized NAND device (e.g. Micron 29F2G08AAC). Tested on AMCC Canyonlands. Signed-off-by: Stefan Roese <sr@denx.de>
* | | | Merge branch 'master' of git://www.denx.de/git/u-boot-at91Wolfgang Denk2008-04-25-47/+23
|\ \ \ \
| * | | | ARM: Davinci: Fix DM644x timer overflow handling and cleanupDirk Behme2008-04-22-47/+23
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ARM based DaVinci DM644x timer overflow handling and cleanup timer code. Changes: - Remove *_masked() functions as noted by Wolfgang - Adapt register naming to recent TI spec (sprue26, March 2007) - Fix reset_timer() handling - As reported by Pieter [1] the overflow fix introduced a delay of factor 16 (e.g 2 seconds became 32). While the overflow fix is basically okay, it missed to divide udelay by 16, too. Fix this. [1] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/38179 - Remove software division of timer count value (DIV(x) macro) and do it in hardware (TIM_CLK_DIV). Many thanks to Troy Kisky <troy.kisky@boundarydevices.com> and Pieter Voorthuijsen <pieter.voorthuijsen@Prodrive.nl> for the hints & testing! Patch is compile tested with davinci_dvevm & sonata & schmoogie configuration and tested by Pieter on DaVinci EVM hardware. Signed-off-by: Dirk Behme <dirk.behme@gmail.com> Acked-by: Pieter Voorthuijsen <pieter.voorthuijsen@Prodrive.nl>
* | | | lib_ppc: Revert "Make MPC83xx one step closer to full relocation."Kim Phillips2008-04-25-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 70431e8a7393b6b793f77957f95b999fc9a269b8 which has proven problematic getting right from the start at least on 83xx and 4xx. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | | | Realining some header definitions.Detlev Zundel2008-04-25-10/+10
| | | | | | | | | | | | | | | | Signed-off-by: Detlev Zundel <dzu@denx.de>
* | | | NE2000: coding style cleanupJean-Christophe PLAGNIOL-VILLARD2008-04-25-319/+348
| | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | | qemu-mips.h: Add CFI supportJean-Christophe PLAGNIOL-VILLARD2008-04-25-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_ENV_OVERWRITE is also added. This patch is originally created by Jean-Christophe PLAGNIOL-VILLARD. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
* | | | doc/README.mips: Add MIPS notesShinya Kuribayashi2008-04-25-0/+57
| | | | | | | | | | | | | | | | Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
* | | | Add support for calculating hashes with watchdog triggeringBartlomiej Sieka2008-04-25-0/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement watchodg-aware variants of hash calculation functions: - crc32_wd() - md5_wd() - sha1_csum_wd() The above functions calculate the hash of the input buffer in chunks, triggering the watchdog after processing each chunk. The chunk size is given as a function call parameter. Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
* | | | qemu-mips: Cleanup whitespace, indentation, etc.Shinya Kuribayashi2008-04-24-33/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional change. This patch was originally submitted by Jean-Christophe PLAGNIOL-VILLARD. Then I re-created from scratch, and changed more lines than the original. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
* | | | Fixed pcnet io_baseVlad Lungu2008-04-24-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | Bus and phys address are not always the same Signed-off-by: Vlad Lungu <vlad@comsys.ro>
* | | | drivers/net/pcnet.c: Coding Style cleanup.Wolfgang Denk2008-04-24-360/+370
| | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | | Added Am79C970A chip id to pcnetVlad Lungu2008-04-24-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Vlad Lungu <vlad@comsys.ro>
* | | | i.MX31: Fix architecture numbers for ADS and Litekit boardsMagnus Lilja2008-04-24-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Correct the Linux architecture number for i.MX31 Litekit and ADS boards. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
* | | | i.MX31: Use symbolic names for Litekit membases.Magnus Lilja2008-04-24-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Use symbolic names instead of hard coded addresses for Litekit membases. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
* | | | Fix show_boot_progress prototypeJean-Christophe PLAGNIOL-VILLARD2008-04-24-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in commit fad634071 "make show_boot_progress () weak." show_boot_progress is supposed to be declared as weak but declared as inline instead. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | | Memory footprint optimizationsBartlomiej Sieka2008-04-24-47/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by Wolfgang Denk: - image printing functions: - remove wrappers - remove indentation prefix from functions' signatures - merge getenv_verify and getenv_autostart into one parametrized function Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
* | | | MX31ADS environment variable update, spi and rtc supportGuennadi Liakhovetski2008-04-24-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update MX31ADS default environment to better match the flash layout and the memory map, support SPI and RTC. Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
* | | | 85xx: Round up frequency calculations to get reasonable outputKumar Gala2008-04-24-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eg. because of rounding error we can get 799Mhz instead of 800Mhz. Introduced DIV_ROUND_UP and roundup taken from linux kernel. Signed-off-by: Dejan Minic <minic@freescale.com> Signed-off-by: Srikanth Srinivasan <srikanth.srinivasan@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Andy Fleming <afleming@freescale.com>
* | | | Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xxWolfgang Denk2008-04-24-3/+34
|\ \ \ \
| * | | | 85xx: Fix size of cpu-release-addr propertyKumar Gala2008-04-18-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The cpu-release-addr is defined as always being a 64-bit quanity regardless if we are running on a 32-bit or 64-bit machine.
| * | | | Fix calculation of I2C clock for some 85xx chipsTimur Tabi2008-04-18-2/+33
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some 85xx chips use CCB as the base clock for the I2C. Some use CCB/2, and some use CCB/3. There is no pattern that can be used to determine which chips use which frequency, so the only way to determine is to look up the actual SOC designation and use the right value for that SOC. Update immap_85xx.h to include the GUTS PORDEVSR2 register. Signed-off-by: Timur Tabi <timur@freescale.com>
* | | | fsl_pci: Only modify registers if we have themKumar Gala2008-04-24-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | pme_msg_det exists only on PCIe controllers only set it if we are a "bridge". Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | | Merge branch 'master' of git://www.denx.de/git/u-boot-videoWolfgang Denk2008-04-24-0/+5
|\ \ \ \
| * | | | video: Add missing free for logo memoryMatthias Fuchs2008-04-21-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds two missing free()s. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>