summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* pcnet.c: fix a merge issueWolfgang Denk2008-04-28-54/+0
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* NAND: fix some strict-aliasing compiler warningsWolfgang Denk2008-04-28-14/+15
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/masterWolfgang Denk2008-04-28-0/+1
|\
| * ppc4xx: Fix compile warning of hcu4 boardStefan Roese2008-04-28-0/+1
| | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/masterWolfgang Denk2008-04-28-4/+2
|\ \ | |/
| * mx31ads: fix loadaddr environment variable defineGuennadi Liakhovetski2008-04-28-4/+2
| | | | | | | | | | | | | | | | Arithmetic expressions do not get evaluated under stringification. Remove default network configuration, add DHCP command support. Thanks to Felix Radensky for reporting. Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
| * katmai: fix section overlap problemWolfgang Denk2008-04-28-3/+7
| | | | | | | | | | | | | | | | | | | | | | Since we didn't want to remove features from the configuration, we decided to increase the U-Boot image size (add one flash sector). Also changed the default environment definition to make it independent of such changes. Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* | MPC8323ERDB: fix implicit declaration of function 'mac_read_from_eeprom'Wolfgang Denk2008-04-28-2/+0
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | katmai: fix section overlap problemWolfgang Denk2008-04-28-3/+7
|/ | | | | | | | | | | Since we didn't want to remove features from the configuration, we decided to increase the U-Boot image size (add one flash sector). Also changed the default environment definition to make it independent of such changes. Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* post: Fix building with O=Kumar Gala2008-04-28-5/+5
| | | | Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* Prepare v1.3.3-rc1Wolfgang Denk2008-04-26-2/+21
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* post/Makefile: make sure to use the correct flagsWolfgang Denk2008-04-26-0/+1
| | | | | | | ARFLAGS was not set, which caused "ppc_8xx-ar: creating libgenpost.a" messages to be printed. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Coding Style cleanup, update CHANGELOGWolfgang Denk2008-04-26-17/+860
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* i.MX31: Enable SPI and MC13783/RTC support for the Litekit boardMagnus Lilja2008-04-26-0/+20
| | | | | | This patch enables SPI and MC13783/RTC support for the Litekit board. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
* MPC8544DS: decode pcie3 end-point configuration correctly.Ed Swarthout2008-04-26-1/+1
| | | | | Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* MPC8544DS: Removes the unknown flash message informationRoy Zang2008-04-26-0/+1
| | | | | | | | | | This patch removes the unknown flash message information: '## Unknown FLASH on Bank 1 - Size = 0xdeadbeef = -286261248 MB' This unknown flash message is caused by PromJet. Some of the board user is unhappy with this information. Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xxWolfgang Denk2008-04-26-29/+20
|\
| * mpc83xx: bump loadaddr over fdtaddr to 0x500000Kim Phillips2008-04-25-10/+10
| | | | | | | | | | | | | | | | this seems as a good compromise between human memory, typing, and last but not least, to accommodate for current and future kernel bloat. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Acked-by: Dave Liu <daveliu@freescale.com>
| * mpc83xx: clean up the readme for 83xx boardsDave Liu2008-04-25-11/+10
| | | | | | | | | | | | | | 1. correct the typo 2. correct the memory map for 837xerdb board Signed-off-by: Dave Liu <daveliu@freescale.com>
| * mpc83xx: remove the unused CPM's stuffDave Liu2008-04-25-8/+0
| | | | | | | | | | | | The MPC83xx family never have CPM block, so remove it from 83xx. Signed-off-by: Dave Liu <daveliu@freescale.com>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flashWolfgang Denk2008-04-26-0/+17
|\ \
| * | cfi-flash: Add CFG_FLASH_AUTOPROTECT_LISTMatthias Fuchs2008-04-25-0/+17
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a configurable flash auto protection list that can be used to make U-Boot protect flash regions in flash_init(). The idea has been discussed on the u-boot mailing list starting on Nov 18th, 2007. Even this patch brings a new feature it is used as a bugfix for 4xx platforms where flash_init() does not completely protect the monitor's flash range in all situations. U-Boot protects the flash range from CFG_MONITOR_BASE to (CFG_MONITOR_BASE + monitor_flash_len - 1) by default. This does not include the reset vector at 0xfffffffc. Example: #define CFG_FLASH_AUTOPROTECT_LIST {{0xfff80000, 0x80000}} This config option will auto protect the last 512k of flash that contains the bootloader on board like APC405 and PMC405. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
* | 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>