summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* 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>
* PPC: fix map_physmem build warningBecky Bruce2008-05-10-1/+1
| | | | | | | 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>
* Update pci code to use phys_addr_tBecky Bruce2008-05-10-9/+9
| | | | | | | | 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>
* Support legacy multi-type images without FDT section.Nick Spence2008-05-10-3/+2
| | | | | | | | | | | | 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>
* Update CHANGELOG.Wolfgang Denk2008-05-10-6/+452
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* post/cpu/ppc4xx/Makefile: line length cleanupWolfgang Denk2008-05-10-1/+7
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xxWolfgang Denk2008-05-10-0/+10
|\
| * mpc83xx: system performance settings for MPC8349EMDS.Lee Nipper2008-05-06-0/+10
| | | | | | | | | | | | | | | | These same settings are used on MPC8349ITX, and improve performance on MPC8349EMDS. Signed-off-by: Lee Nipper <lee.nipper@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | Fix @ -> <at> substitutionStelian Pop2008-05-10-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Update origin and copyright information in arch-at91sam9 header filesStelian Pop2008-05-10-154/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add copyright information in Atmel boards partition.cStelian Pop2008-05-10-0/+6
| | | | | | | | | | | | | | 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>
* | mx31ads: fix 32kHz clock handlingGuennadi Liakhovetski2008-05-10-9/+7
| | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xxWolfgang Denk2008-05-10-1/+6
|\ \
| * | 85xx: Limit CPU2 workaround to parts that have the errataAndy Fleming2008-05-07-1/+6
| |/ | | | | | | | | Signed-off-by: Ebony Zhu <ebony.zhu@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
* | Avoid initrd and logbuffer area overlapsMarian Balakowicz2008-05-10-1/+20
| | | | | | | | | | | | | | | | | | 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>
* | ppc: Cleanup get_effective_memsize() useMarian Balakowicz2008-05-10-11/+0
| | | | | | | | | | | | Removed duplicated effective memory size calculation code. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | Fix build errors when CONFIG_LOGBUFFER and CONFIG_FIT are enabledMarian Balakowicz2008-05-10-15/+0
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Propagate Error Status to the Shell on fw_printenv ErrorsGrant Erickson2008-05-09-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix Compilation Errors with 'tools/env/fw_printenv'Grant Erickson2008-05-09-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-mipsWolfgang Denk2008-05-09-2/+4
|\ \
| * | [MIPS] cpu/mips/cache.S: Fix build warningShinya Kuribayashi2008-05-06-2/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some old GNU assemblers, such as v2.14 (ELDK 3.1.1), v2.16 (ELDK 4.1.0), warns illegal global symbol references by bal (and jal also) instruction. This does not happen with the latest binutils v2.18. Here's an example on gth2_config: mips_4KC-gcc -D__ASSEMBLY__ -g -Os -D__KERNEL__ -DTEXT_BASE=0x90000000 -I/home/skuribay/devel/u-boot.git/include -fno-builtin -ffreestanding -nostdinc -isy stem /opt/eldk311/usr/bin/../lib/gcc-lib/mips-linux/3.3.3/include -pipe -DCONFIG_MIPS -D__MIPS__ -G 0 -mabicalls -fpic -pipe -msoft-float -march=4kc -mtune=4k c -EB -c -o cache.o cache.S cache.S: Assembler messages: cache.S:243: Warning: Pretending global symbol used as branch target is local. cache.S:250: Warning: Pretending global symbol used as branch target is local. In principle, gas might be sensitive to global symbol references in PIC code because they should be processed through GOT (global offset table). But if `bal' instruction is used, it results in PC-based offset jump. This is the cause of this warning. In practice, we know it doesn't matter whether PC-based reference or GOT- based. As for this case, both will work before/after relocation. But let's fix the code. This patch explicitly sets up a target address, then jump there. Here's an example of disassembled code with/without this patch. 90000668: 1485ffef bne a0,a1,90000628 <mips_cache_reset+0x20> 9000066c: ac80fffc sw zero,-4(a0) 90000670: 01402821 move a1,t2 -90000674: 0411ffba bal 90000560 <mips_init_icache> -90000678: 01803021 move a2,t4 -9000067c: 01602821 move a1,t3 -90000680: 0411ffcc bal 900005b4 <mips_init_dcache> -90000684: 01a03021 move a2,t5 -90000688: 03000008 jr t8 -9000068c: 00000000 nop +90000674: 01803021 move a2,t4 +90000678: 8f8f83ec lw t7,-31764(gp) +9000067c: 01e0f809 jalr t7 +90000680: 00000000 nop +90000684: 01602821 move a1,t3 +90000688: 01a03021 move a2,t5 +9000068c: 8f8f81e0 lw t7,-32288(gp) +90000690: 01e0f809 jalr t7 +90000694: 00000000 nop +90000698: 03000008 jr t8 +9000069c: 00000000 nop Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
* | Merge branch 'master' of /home/wd/git/u-boot/master/Wolfgang Denk2008-05-09-10/+23
|\ \
| * | Fix readline_into_buffer() with CONFIG_CMDLINE_EDITING before relocatingJames Yang2008-05-09-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'master' of /home/wd/git/u-boot/master/Wolfgang Denk2008-05-09-61/+122
|\ \ \ | |/ /
| * | cosmetic: Adjust coding style for switch statements to be consistentDetlev Zundel2008-05-09-24/+36
| | | | | | | | | | | | Signed-off-by: Detlev Zundel <dzu@denx.de>
| * | Fix disk type output in disk/part.cDetlev Zundel2008-05-09-18/+14
| | | | | | | | | | | | Signed-off-by: Detlev Zundel <dzu@denx.de>
| * | Mail address change, documentation modifiedVlad Lungu2008-05-09-3/+7
| | | | | | | | | | | | Signed-off-by: Vlad Lungu <vlad.lungu@windrvier.com>
| * | microblaze: Repare intc handlingMichal Simek2008-05-09-4/+38
| | | | | | | | | | | | Signed-off-by: Michal Simek <monstr@monstr.eu>
| * | include/gitignore: update to all architecturesJean-Christophe PLAGNIOL-VILLARD2008-05-09-2/+2
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | ide: Remove spurious second include of io.hMarcel Ziswiler2008-05-09-4/+0
| | | | | | | | | | | | | | | | | | Removed the second include, with all the #ifdef around as suggested by Wolfgang. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
| * | Fix some typosAdrian Filipi2008-05-09-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes three typos. The first is a repetition of CONFIG_CMD_BSP. The second makes the #endif comment match its #if. The third is a spelling error. Signed-off-by: Adrian Filipi <adrian.filipi@eurotech.com>
| * | Recognize 'powerpc' As an Alias for IH_ARCH_PPCGrant Erickson2008-05-09-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add support for the recognition of 'powerpc' as an alias for the PowerPC architecture type since Linux is already trending in that direction, preferring 'powerpc' to 'ppc'. Signed-off-by: Grant Erickson <gerickson@nuovations.com>
| * | 7450 and 86xx L2 cache invalidate bug correctionsWheatley Travis2008-05-09-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 7610 and related parts have an L2IP bit in the L2CR that is monitored to signal when the L2 cache invalidate is complete whereas the 7450 and related parts utilize L2I for this purpose. However, the current code does not account for this difference. Additionally the 86xx L2 cache invalidate code used an "andi" instruction where an "andis" instruction should have been used. This patch addresses both of these bugs. Signed-off-by: Travis Wheatley <travis.wheatley@freescale.com> Acked-By: Jon Loeliger <jdl@freescale.com>
| * | Avoid infinite loop "Generating include/autoconf.mk"Wolfgang Denk2008-05-09-1/+1
| |/ | | | | | | | | | | | | Fix a bogus circular dependency that caused an infinite loop of "Generating include/autoconf.mk" again and again. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | ppc4xx: Kilauea: Fix incorrect FPGA FIFO addressStefan Roese2008-05-08-1/+1
| | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
* | ppc4xx: Add fdt support to all remaining AMCC PPC4xx eval boardsStefan Roese2008-05-08-10/+52
| | | | | | | | | | | | | | | | | | This patch adds fdt (flattened device tree) support to all remaining AMCC eval boards. Most newer boards already support device tree. With this patch, all AMCC boards now enable device tree passing from U-Boot to Linux arch/powerpc kernels. Signed-off-by: Stefan Roese <sr@denx.de>
* | ppc4xx: Add weak default ft_board_setup() routineStefan Roese2008-05-08-3/+23
| | | | | | | | | | | | | | | | This patch adds a default ft_board_setup() routine to the 4xx fdt code. This routine is defined as weak and can be overwritten by a board specific one if needed. Signed-off-by: Stefan Roese <sr@denx.de>
* | ppc4xx: acadia: Add fdt support and fix section overlap problemStefan Roese2008-05-08-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds fdt (flattened device tree) support to the AMCC Acadia eval board. This increases the image size and it doesn't fit anymore into 256kByte. 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: Stefan Roese <sr@denx.de>
* | ppc4xx: Add device tree support to AMCC YosemiteIra Snyder2008-05-08-0/+32
| | | | | | | | | | | | | | | | | | Add support for booting with a device tree blob. This is needed to boot ARCH=powerpc kernels. Also add support for setting the eth0 mac address via the ethaddr variable. Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> Signed-off-by: Stefan Roese <sr@denx.de>
* | ppc4xx: Fix typos in 460GT/EX FBDV arrayDave Mitchell2008-05-08-1/+1
|/ | | | | | | Corrected two typos in the 460GT/EX FBDV array. Signed-off-by: Dave Mitchell <dmitchell@amcc.com> Signed-off-by: Stefan Roese <sr@denx.de>