summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-testingWolfgang Denk2008-05-21-9/+9
|\
| * Fix some whitespace issuesWolfgang Denk2008-05-21-9/+9
| | | | | | | | | | | | introduced by 53677ef18 "Big white-space cleanup." Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Merge branch 'socrates' of /home/wd/git/u-boot/projectsWolfgang Denk2008-05-21-9/+1160
|\ \
| * | socrates: fix second TSEC configuration (it is actually TSEC3)Sergei Poselenov2008-05-20-6/+6
| | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
| * | Fixed reset for socratesSergei Poselenov2008-05-20-9/+14
| | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
| * | socrates: changes to support FDTSergei Poselenov2008-05-20-33/+50
| | | | | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | Initial support for "Socrates" boardSergei Poselenov2008-05-20-0/+1129
| | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
* | | Merge branch 'lwmon5' of /home/wd/git/u-boot/projectsWolfgang Denk2008-05-21-8/+155
|\ \ \
| * | | POST: replace the LOGBUFF_INITIALIZED flag in gd->post_log_word (1 << 31) ↵Yuri Tikhonov2008-05-20-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with the GD_FLG_LOGINIT flag in gd->flags. This way we become able to utilize the full post_log_word for POST activities (overwise, POST ECC, which has 0x8000 ID, could be erroneously treated as started in post_output_backlog() even if there was actually no POST ECC run (because of OCM POST failure, for example). Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * | | POST: mark OCM test as POST_STOPYuri Tikhonov2008-05-20-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Ilya Yanok <yanok@emcraft.com>
| * | | POST: add POST_STOP flagYuri Tikhonov2008-05-20-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't run futher tests in case of a test fails that is marked as POST_STOP. Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * | | POST: switch CFG_POST_OCM with CFG_POST_CODEC (workaround)Yuri Tikhonov2008-05-20-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch the OCM testid with the codec one. The reason is that current implementation requires the POST_ROM testid to fit into lower 16 bits, and the codec test will never run with POST_ROM hopefully. Signed-off-by: Ilya Yanok <yanok@emcraft.com>
| * | | lwmon5: enable OCM post test on lwmon5 boardYuri Tikhonov2008-05-20-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Ilya Yanok <yanok@emcraft.com>
| * | | POST: OCM test added.Yuri Tikhonov2008-05-20-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added OCM test to POST layer. This version runs before all other tests but doesn't yet interrupt post sequence on failure. Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * | | POST: typo fixYuri Tikhonov2008-05-20-1/+1
| |/ / | | | | | | | | | Signed-off-by: Ilya Yanok <yanok@emcraft.com>
* | | Make ads5121 out-of-tree compiling safeYork Sun2008-05-21-1/+6
| | | | | | | | | | | | | | | | | | Reuse the existing DIU driver in board/freescale/common. Signed-off-by: York Sun <yorksun@freescale.com>
* | | Adding DIU support for Freescale 5121ADSYork Sun2008-05-21-21/+261
| | | | | | | | | | | | | | | | | | | | | | | | Add DIU and cfb console support to FSL 5121ADS board. Use #define CONFIG_VIDEO in config file to enable fb console. Signed-off-by: York Sun <yorksun@freescale.com>
* | | Replace DPRINTF with debugYork Sun2008-05-21-35/+29
| | | | | | | | | | | | | | | | | | Remove DPRINTF macro and replace it with generic debug macro. Signed-off-by: York Sun <yorksun@freescale.com>
* | | Move pixel clock setting to board fileYork Sun2008-05-21-34/+25
| |/ |/| | | | | | | | | | | The clock divider has different format in 5121 and 8610. This patch moves it to board specific code. Signed-off-by: York Sun <yorksun@freescale.com>
* | Big white-space cleanup.Wolfgang Denk2008-05-21-13519/+13530
|/ | | | | | | | | | | This commit gets rid of a huge amount of silly white-space issues. Especially, all sequences of SPACEs followed by TAB characters get removed (unless they appear in print statements). Also remove all embedded "vim:" and "vi:" statements which hide indentation problems. Signed-off-by: Wolfgang Denk <wd@denx.de>
* common/usb.c: fix incorrect escape sequenceHebbar2008-05-20-1/+1
| | | | Signed off by: Gururaja Hebbar <gururajakr@sanyo.co.in>
* Fix 8313ERDB board configurationYork Sun2008-05-19-8/+6
| | | | | | | | | Change LCRR clock ratio from 2 to 4 to commodate VSC7385. Correct TSEC1 vs TSEC2 assignment. Define ETHADDR and ETH1ADDR always. Signed-off-by: York Sun <yorksun@freescale.com> Signed-off-by: Timur Tabi <timur@freescale.com>
* Release v1.3.3Wolfgang Denk2008-05-19-1/+299
| | | | | | Update CHANGELOG for release. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk2008-05-19-1/+30
|\
| * ppc4xx: Canyonlands: Disable PCIe0/SATA in dev-tree depending on selectionStefan Roese2008-05-19-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When SATA is selected (via jumper J6) we need to disable the first PCIe node in the device tree, so that Linux doesn't initialize it. Otherwise the Linux SATA driver will fail to detect the devices. The same goes the other way around too. So if PCIe is selected we need to disable the SATA node in the device tree. This is because PCIe port 0 and SATA on 460EX share the same pins (multiplexed) and we have to configure in U-Boot which peripheral is enabled. Signed-off-by: Stefan Roese <sr@denx.de>
* | i386: Fix multiple definitions of __show_boot_progressJean-Christophe PLAGNIOL-VILLARD2008-05-19-14/+14
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | sc530_spunk: add missing SOBJS entryJean-Christophe PLAGNIOL-VILLARD2008-05-19-1/+1
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | sc520_spunk: Fix flashJean-Christophe PLAGNIOL-VILLARD2008-05-19-24/+6
| | | | | | | | | | | | | | flash.c:593: warning: dereferencing type-punned pointer will break strict-aliasing rules flash.c:398: error: label at end of compound statement Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | drivers/pcmcia: add missing i82365Jean-Christophe PLAGNIOL-VILLARD2008-05-19-4/+1
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | i386/bootm: remove unused varJean-Christophe PLAGNIOL-VILLARD2008-05-19-1/+0
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | example/gitignore: update with all generated examplesJean-Christophe PLAGNIOL-VILLARD2008-05-19-0/+4
|/ | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* TQM8272: fix out-of-tree buildingWolfgang Denk2008-05-15-8/+16
| | | | | | ...and add to MAKEALL script Signed-off-by: Wolfgang Denk <wd@denx.de>
* environment: fix bug introduced by commit a8409f4f1ac8Wolfgang Denk2008-05-14-2/+2
| | | | | | env_get_char is not a function, but a pointer to one. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk2008-05-14-19/+40
|\
| * ppc4xx: Fix bogus Canyonlands config.mkStefan Roese2008-05-14-9/+1
| | | | | | | | | | | | | | This patch fixes the canyonlands config.mk file to enable correct out-of-tree builds. Thanks to Wolfgang Denk for spotting this. Signed-off-by: Stefan Roese <sr@denx.de>
| * ppc4xx: Individual handling of ddr2_fixed.c for canyonlands_nand buildStefan Roese2008-05-14-1/+7
| | | | | | | | | | | | | | | | Canyonlands has a file ddr2_fixed.c which needs special treatment when building in separate directory. It has to be linked to build directory otherwise it is not seen. Signed-off-by: Stefan Roese <sr@denx.de>
| * ppc4xx: Add 405EX(r) revision C PVR definitions and detection codeStefan Roese2008-05-13-11/+40
| | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
* | Fix config files for out-of-tree buildingWolfgang Denk2008-05-14-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several board/<...>/config.mk files include dynamically built (by the Makefile) config files but used the wrong file name of $(TOPDIR)/board/$(BOARDDIR)/config.tmp instead if the correct $(OBJTREE)/board/$(BOARDDIR)/config.tmp The bug is nasty because the build result is correct for the (normal) in-tree builds, and because 'sinclude' is used no errors get raised even for out-of-tree build tests. But out-of-tree builds use an incomplete and thus usually incorrect configuration... Signed-off-by: Wolfgang Denk <wd@denx.de>
* | ppc4xx: Individual handling of ddr2_fixed.c for canyonlands_nand buildStefan Roese2008-05-14-1/+7
| | | | | | | | | | | | | | | | Canyonlands has a file ddr2_fixed.c which needs special treatment when building in separate directory. It has to be linked to build directory otherwise it is not seen. Signed-off-by: Stefan Roese <sr@denx.de>
* | environment: cleanup prototype declarations of env functions.Wolfgang Denk2008-05-14-25/+11
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | linkstation_HGLAN: Fix out of tree building.Wolfgang Denk2008-05-14-6/+9
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Makefile: fix "error: version_autogenerated.h: No such file or directory"Wolfgang Denk2008-05-13-4/+12
|/ | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Revert "pci: Add CONFIG_PCI_SKIP_HOST_BRIDGE config option"Wolfgang Denk2008-05-12-10/+3
| | | | | This reverts commit 55774b512fdf63c0516d441cc5da7c54bbffb7f2 which broke many PowerPC boards.
* Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-05-12-11/+19
|\
| * ppc4xx: Kilauea: Add CONFIG_BOOTP_SUBNETMASK to Kilauea board configMarkus Klotzbücher2008-05-10-0/+1
| | | | | | | | | | | | | | | | | | | | When using dhcp/bootp the "netmask" environment variable is not set because CONFIG_BOOTP_SUBNETMASK is not defined. But usually this is desireable, so the following patch adds this this option to the board config. Signed-off-by: Markus Klotzbuecher <mk@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
| * ppc4xx: Update Makalu defconfig to use device-tree booting as defaultStefan Roese2008-05-10-11/+18
| | | | | | | | | | | | | | | | | | | | This patch reworks the default environment on Makalu. Now "net_nfs" for example uses the device-tree style booting formerly know as "net_nfs_fdt". Also the addresses in RAM were changed because of the new image booting support, which check for image overwriting. So the addresses needed to get adjusted. Signed-off-by: Stefan Roese <sr@denx.de>
* | Revert "Avoid initrd and logbuffer area overlaps"Wolfgang Denk2008-05-12-20/+1
| | | | | | | | | | This reverts commit 1b5605ca57fbb364f4d78eeee28b974ed875e888 which breaks building on all PPC boards that don't use a log buffer.
* | Fix offset calculation for multi-type legacy images.Nick Spence2008-05-12-9/+4
| | | | | | | | | | | | | | | | Calculation of tail was incorrect when size % 4 == 0. New code removes the conditional and does the same thing but with arithmetic Signed-off-by: Nick Spence <nick.spence@freescale.com>
* | Revert "Change env_get_char from a global function ptr to a function."Wolfgang Denk2008-05-12-14/+14
| | | | | | | | | | This reverts commit c0559be371b2a64b1a817088c3308688e2182f93 which is known to break booting from dataflash and NAND.
* | API: remove duplicate syscall checkJean-Christophe PLAGNIOL-VILLARD2008-05-12-1/+1
|/ | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>