summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-05-19Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk
2008-05-19ppc4xx: Canyonlands: Disable PCIe0/SATA in dev-tree depending on selectionStefan Roese
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>
2008-05-19i386: Fix multiple definitions of __show_boot_progressJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-19sc530_spunk: add missing SOBJS entryJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-19sc520_spunk: Fix flashJean-Christophe PLAGNIOL-VILLARD
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>
2008-05-19drivers/pcmcia: add missing i82365Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-19i386/bootm: remove unused varJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-19example/gitignore: update with all generated examplesJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-15TQM8272: fix out-of-tree buildingWolfgang Denk
...and add to MAKEALL script Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-14environment: fix bug introduced by commit a8409f4f1ac8Wolfgang Denk
env_get_char is not a function, but a pointer to one. Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-14Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk
2008-05-14Fix config files for out-of-tree buildingWolfgang Denk
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>
2008-05-14ppc4xx: Fix bogus Canyonlands config.mkStefan Roese
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>
2008-05-14ppc4xx: Individual handling of ddr2_fixed.c for canyonlands_nand buildStefan Roese
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>
2008-05-14environment: cleanup prototype declarations of env functions.Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-14linkstation_HGLAN: Fix out of tree building.Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-14ppc4xx: Individual handling of ddr2_fixed.c for canyonlands_nand buildStefan Roese
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>
2008-05-13Makefile: fix "error: version_autogenerated.h: No such file or directory"Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-13ppc4xx: Add 405EX(r) revision C PVR definitions and detection codeStefan Roese
Signed-off-by: Stefan Roese <sr@denx.de>
2008-05-12Revert "pci: Add CONFIG_PCI_SKIP_HOST_BRIDGE config option"Wolfgang Denk
This reverts commit 55774b512fdf63c0516d441cc5da7c54bbffb7f2 which broke many PowerPC boards.
2008-05-12Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk
2008-05-12Revert "Avoid initrd and logbuffer area overlaps"Wolfgang Denk
This reverts commit 1b5605ca57fbb364f4d78eeee28b974ed875e888 which breaks building on all PPC boards that don't use a log buffer.
2008-05-12Fix offset calculation for multi-type legacy images.Nick Spence
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>
2008-05-12Revert "Change env_get_char from a global function ptr to a function."Wolfgang Denk
This reverts commit c0559be371b2a64b1a817088c3308688e2182f93 which is known to break booting from dataflash and NAND.
2008-05-12API: remove duplicate syscall checkJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-10ppc4xx: Kilauea: Add CONFIG_BOOTP_SUBNETMASK to Kilauea board configMarkus Klotzbücher
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>
2008-05-10ppc4xx: Update Makalu defconfig to use device-tree booting as defaultStefan Roese
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>
2008-05-10PPC: fix map_physmem build warningBecky Bruce
map_physmem currently generates a warning when CONFIG_PHYS_64BIT is enabled. This quiets the warning. Signed-off-by: Becky Bruce <Becky.Bruce@freescale.com>
2008-05-10Update pci code to use phys_addr_tBecky Bruce
Physical addrs need to be represented by phys_addr_t, not unsigned long. Otherwise, systems that use CONFIG_PHYS_64BIT are going to fail mightily. Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
2008-05-10Support legacy multi-type images without FDT section.Nick Spence
This patch enables legacy multi-type images containing only a Linux kernel and root file system to be loaded, maintaining compatibility with previous versions of u-boot. This is required when using old image files such as a Linux 2.4 kernel / filesystem. Signed-off-by: Nick Spence <nick.spence@freescale.com> Acked-by: Bartlomiej Sieka <tur@semihalf.com>
2008-05-10Update CHANGELOG.Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-10post/cpu/ppc4xx/Makefile: line length cleanupWolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-10Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xxWolfgang Denk
2008-05-10Fix @ -> <at> substitutionStelian Pop
When applying the AT91CAP9 patches upstream, something transformed the '@' character into the ' <at> ' sequence. The patch below restores the original form in all the places where it has been modified (the AT91CAP9 files, the AT91SAM9260 files which were copied from AT91CAP9, and a couple of other files where the ' <at> ' sequence was present). Signed-off-by: Stelian Pop <stelian@popies.net>
2008-05-10Update origin and copyright information in arch-at91sam9 header filesStelian Pop
When doing the AT91CAP9/AT91SAM9 port, a number of header files were copied from the Linux kernel sources. This patch explicitly specifies this origin for all the copied headers, and for those missing copyright information, adds it. Additionaly, the header file 'at91sam926x_mc.h' has been superceeded in the latest kernel sources by 'at91sam9_smc.h'. The copyright information has been confirmed by the AT91 Linux kernel maintainer, Andrew Victor <avictor.za@gmail.com>. Signed-off-by: Stelian Pop <stelian@popies.net>
2008-05-10Add copyright information in Atmel boards partition.cStelian Pop
When Ulf did the dataflash.c cleanup, he didn't add his copyright on the new created files. This patch fixes the problem. Signed-off-by: Stelian Pop <stelian@popies.net>
2008-05-10mx31ads: fix 32kHz clock handlingGuennadi Liakhovetski
According to schematics and to RedBoot sources, the MX31ADS uses a 32768Hz oscillator as a SKIL source. Fix previously wrongly assumed 32000Hz value. Also fix a typo when verifying a jumper configuration. While at it, make two needlessly global functions static. Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
2008-05-10Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xxWolfgang Denk
2008-05-10Avoid initrd and logbuffer area overlapsMarian Balakowicz
Add logbuffer to reserved LMB areas to prevent initrd allocation from overlaping with it. Make sure to use correct logbuffer base address. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
2008-05-10ppc: Cleanup get_effective_memsize() useMarian Balakowicz
Removed duplicated effective memory size calculation code. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
2008-05-10Fix build errors when CONFIG_LOGBUFFER and CONFIG_FIT are enabledMarian Balakowicz
Recent modifcations to LOGBUFFER handling code were incorrecly introduced to fit_check_kernel() routine during "Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing", commit 27f33e9f45ef7f9685cbdc65066a1828e85dde4f. This patch cleans up this merge issue. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
2008-05-09Propagate Error Status to the Shell on fw_printenv ErrorsGrant Erickson
Changed implementation such that fw_printenv returns failure status when one or more specified variables do not exist or when incorrect command syntax is used. This aids scripting fw_printenv such that the script can key of the return status rather than relying on standard error "scraping". Signed-off-by: Grant Erickson <gerickson@nuovations.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-09Fix Compilation Errors with 'tools/env/fw_printenv'Grant Erickson
In the current top-of-tree, 1.3.3.-rc2, the optional tool 'tools/env/fw_printenv' fails to compile for two reasons: 1) The header watchdog.h cannot be found. 2) The header zlib.h is picked up from the tool chain rather than the project causing a prototype conflict for crc32. This patch addresses both of these issues. Platforms Tested On: - AMCC "Kilauea" Signed-off-by: Grant Erickson <gerickson@nuovations.com>
2008-05-09Merge branch 'master' of git://www.denx.de/git/u-boot-mipsWolfgang Denk
2008-05-09Merge branch 'master' of /home/wd/git/u-boot/master/Wolfgang Denk
2008-05-09Merge branch 'master' of /home/wd/git/u-boot/master/Wolfgang Denk
2008-05-09Fix readline_into_buffer() with CONFIG_CMDLINE_EDITING before relocatingJames Yang
When CONFIG_CMDLINE_EDITING is enabled, readline_into_buffer() doesn't work before relocating to RAM because command history is written into a global array that is not writable before relocation. This patch defers to the no-editing and no-history code in readline_into_buffer() if it is called before relocation. Signed-off-by: James Yang <James.Yang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2008-05-09cosmetic: Adjust coding style for switch statements to be consistentDetlev Zundel
Signed-off-by: Detlev Zundel <dzu@denx.de>
2008-05-09Fix disk type output in disk/part.cDetlev Zundel
Signed-off-by: Detlev Zundel <dzu@denx.de>
2008-05-09Mail address change, documentation modifiedVlad Lungu
Signed-off-by: Vlad Lungu <vlad.lungu@windrvier.com>
generated by cgit (git 2.34.1) at 2024-12-27 06:59:55 +0000