summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* 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>
* Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/masterWolfgang Denk2008-05-05-3/+6
|\
| * Allow building mips versions with ELDK 3.1.1Vlad Lungu2008-05-05-3/+6
| | | | | | | | | | | | .gpword works only with local symbols on certain binutils versions Signed-off-by: Vlad Lungu <vlad.lungu@windrvier.com>
* | MAKEALL: add inka4x0 boardWolfgang Denk2008-05-05-0/+1
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | kb9202 board: fix build problem.Wolfgang Denk2008-05-04-1/+4
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Prepare for v1.3.3-rc3Wolfgang Denk2008-05-04-2/+413
| | | | | | | | | | | | Update ChNAGELOG, minor white space cleanup. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Merge branch 'master' of /home/wd/git/u-boot/master/Wolfgang Denk2008-05-04-28/+68
|\ \ | |/
| * drivers/net/tsec.c: Fix typo.Wolfgang Denk2008-05-04-1/+1
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * version_autogenerated.h: use printf rather than echo -nMike Frysinger2008-05-04-5/+3
| | | | | | | | | | | | | | | | Some systems are dumb and do not implement the -n flag to echo (like OS X). Convert the Makefile to use printf as this should work everywhere. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Wolfgang Denk <wd@denx.de>
| * fix building when saveenv is disabled in some setupsMike Frysinger2008-05-04-0/+2
| | | | | | | | | | | | | | | | | | | | | | If you enable environment in the flash, but disable the embedded option, and you disable the saveenv command, then the #if nested logic will trigger a compile failure: env_flash.c: In function 'env_relocate_spec': env_flash.c:399: error: 'flash_addr' undeclared (first use in this function) The fix is to add CMD_SAVEENV ifdef protection like everywhere else. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * SBC8548: fix address mask to allow 64M flashJeremy McNicoll2008-05-04-3/+3
| | | | | | | | | | | | | | | | Fix incorrect mask to enable all 64MB of onboard flash. Previously U-Boot incorrectly mapped only 8MB of flash, this patch correctly maps all the available flash. Signed-off-by: Jeremy McNicoll <jeremy.mcnicoll@windriver.com>
| * qemu_mips: add READMEJean-Christophe PLAGNIOL-VILLARD2008-05-04-0/+18
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * Merge branch 'master' of git://www.denx.de/git/u-boot-mipsWolfgang Denk2008-05-04-1/+17
| |\
| | * [MIPS] cpu/mips/config.mk: Fix GNU assembler minor version pickerShinya Kuribayashi2008-05-03-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current trick to pick up GNU assembler minor version uses a dot(.) as a delimiter, and take the second field to obtain minor version number. But as can be expected, this doesn't work with a version string which has dots more than needs. Here's an example: $ mips-linux-gnu-as --version | grep 'GNU assembler' GNU assembler (Sourcery G++ Lite 4.2-129) 2.18.50.20080215 $ mips-linux-gnu-as --version | grep 'GNU assembler' | cut -d. -f2 2-129) 2 $ This patch restricts the version format to 2.XX.XX... This will work in most cases. $ mips-linux-gnu-as --version | grep 'GNU assembler' | egrep -o '2\.[0-9\.]+' 2.18.50.20080215 $ mips-linux-gnu-as --version | grep 'GNU assembler' | egrep -o '2\.[0-9\.]+' | cut -d. -f2 18 $ Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| | * [MIPS] cpu/mips/cache.S: Add dcache_enableShinya Kuribayashi2008-05-03-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Recent bootelf command fixes (017e9b7925f74878d0e9475388cca9bda5ef9482, "allow ports to override bootelf behavior") requires ports to have this function. Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | Fix misspelled commentMarcel Ziswiler2008-05-04-1/+1
| | | | | | | | | | | | Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
| * | mkimage: make mmap() checks consistentMike Frysinger2008-05-03-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mmap() related code is full of inconsistent casts/constants when it comes to error checking, and may break when building on some systems (like ones that do not implicitly define the caddr_t type). Let's just avoid the whole mess by writing the code nice and clean in the first place. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Fix defined but not used build warningMarcel Ziswiler2008-05-03-1/+0
| | | | | | | | | | | | | | | | | | - warning: 'srom' defined but not used Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
| * | Fix implicit declaration build warningsMarcel Ziswiler2008-05-03-0/+2
| | | | | | | | | | | | | | | | | | - warning: implicit declaration of function ‘serial_initialize’ Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
| * | TSEC: add config options for VSC8601 RGMII PHYAndre Schwarz2008-05-03-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Vitesse VSC8601 RGMII PHY has internal delay for both Rx and Tx clock lines. They are configured using 2 bits in extended register 0x17. Therefore CFG_VSC8601_SKEW_TX and CFG_VSC8601_SKEW_RX have been introduced with valid values 0-3 giving 0.0, 1.4,1.7 and 2.0ns delay. Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de> Acked-by: Andy Fleming <afleming@freescale.com> Acked-by: Ben Warren <biggerbadderben@gmail.com> -- drivers/net/tsec.c | 6 ++++++ drivers/net/tsec.h | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-)
* | | Revert "ColdFire: Get information from the correct GCC"Wolfgang Denk2008-05-03-6/+6
| | | | | | | | | | | | | | | This reverts commit b7166e05a513c0806b63b9dfb6f1d77645cede2a (replaced by commit c4e5f52a58d278eebb87f476e353972c5dacea40).
* | | config.mk: use correct (cross) compilerWolfgang Denk2008-05-03-21/+25
|/ / | | | | | | | | | | | | | | | | | | | | Some config.mk files reference $(CC) to test for specific tool chain features, so make sure $(CC) gets set before including any such config files. This patch replaces commit b7166e05a5 ("ColdFire: Get information from the correct GCC"). Signed-off-by: Wolfgang Denk <wd@denx.de>
* | pxa: fix previous definition on cpu initJean-Christophe PLAGNIOL-VILLARD2008-05-03-5/+1
| | | | | | | | | | | | | | | | | | | | start.S:183:1: warning: "ICMR" redefined In file included from start.S:33: include/asm/arch/pxa-regs.h:935:1: warning: this is the location of the previous definition start.S:187:1: warning: "RCSR" redefined ... Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
generated by cgit v1.1 at 2024-11-10 21:36:05 +0000