summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-05-26Prepare v2010.06-rc1v2010.06-rc1Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2010-05-26Coding style cleanup, update CHANGELOG.Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2010-05-26Merge branch 'master' of git://git.denx.de/u-boot-mpc83xxWolfgang Denk
2010-05-26config.mk: use different host compiler for OS X 10.6Andreas Biessmann
Compiling tools subdirectory on Mac OS X 10.6 (Snow Leopard) complains about wrong syntax in system includes. In file included from /usr/include/stdio.h:444, from ../source/u-boot/include/compiler.h:26, from ../source/u-boot/lib/crc32.c:15: /usr/include/secure/_stdio.h:46: error: syntax error in macro parameter list This can be fixed by reverting the workaround for prior OS X releases in config.mk conditionally for OS X 10.6+. Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
2010-05-26Convert Makefiles from COBJS-${} to COBJS-$()Kumar Gala
Match style we use almost everywhere else Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2010-05-26powerpc/bootcount: Fix endianness problemMichael Weiss
For CONFIG_SYS_BOOTCOUNT_SINGLEWORD the code had an endianness problem. Signed-off-by: Michael Weiss <michael.weiss@ifm.com> Signed-off-by: Detlev Zundel <dzu@denx.de>
2010-05-26dm9000x.c: fix compile problemsWolfgang Denk
Use readX() / writeX() accessors instead of inX() / outX(). Suggested-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Wolfgang Denk <wd@denx.de>
2010-05-21a320evb: fix udelay / __udelay confusionWolfgang Denk
Fix the following compiler problems: arch/arm/cpu/arm920t/a320/liba320.a(timer.o): In function `udelay': /home/wd/git/u-boot/work/arch/arm/cpu/arm920t/a320/timer.c:160: multiple definition of `udelay' lib/libgeneric.a(time.o):/home/wd/git/u-boot/work/lib/time.c:34: first defined here lib/libgeneric.a(time.o): In function `udelay': time.c:(.text+0x1c): undefined reference to `__udelay' Signed-off-by: Wolfgang Denk <wd@denx.de>
2010-05-21ARM: */timer.c: fix spelling and vertical alignmentWolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2010-05-21bugfix: Guruplug: Use standard miiphyMahavir Jain
call to reset PHY chip. Current PHY Software Reset operation in guruplug does not poll reset bit in control register to go to 0(auto clearing) for making sure reset was successful.This patch uses standard miiphy call miiphy_reset to make sure proper PHY reset operation. Signed-off-by: Mahavir Jain <mjain@marvell.com>
2010-05-21Merge branch 'master' of git://git.denx.de/u-boot-ubiWolfgang Denk
2010-05-21mpc83xx: don't shift pre-shifted ACR, SPCR, SCCR bitfield masks in cpu_init.cKim Phillips
commit c7190f028fa950d4d36b6d0b4bb3fc72602ec54c "mpc83xx: retain POR values of non-configured ACR, SPCR, SCCR, and LCRR bitfields" incorrectly shifted <register>_<bitfield> (e.g. ACR_PIPE_DEP) values that were preshifted by their definition in mpc83xx.h. this patch removes the unnecessary shifting for the newly utilized mask values in cpu_init.c, and prevents seemingly unrelated symptoms such as an mpc8379erdb board from locking up whilst performing a networking operation, e.g. a tftp. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2010-05-21Fixed two typos in arch/powerpc/cpu/mpc83xx/start.S.Horst Kronstorfer
Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2010-05-21Merge branch 'master' of git://git.denx.de/u-boot-imxWolfgang Denk
2010-05-21Fix "par[t]ition" typo.Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2010-05-19UBI: Fix problem in UBI/Linux "compatibility layer"Stefan Roese
"down_write_trylock" needs to return 1 instead of 0 for success. Otherwise copying a block with a read error (e.g. bit-flip on read) won't work correctly. Signed-off-by: Stefan Roese <sr@denx.de>
2010-05-19UBI: Ensure that "background thread" operations are really executedStefan Roese
The current U-Boot UBI implementation is copied from Linux. In this porting the UBI background thread was not handled correctly. Upon write operations ubi_wl_flush() makes sure, that all queued operations, like page-erase, are completed. But this is missing for read operations. This patch now makes sure that such operations (like scrubbing upon bit-flip errors) are not queued, but executed directly. Signed-off-by: Stefan Roese <sr@denx.de>
2010-05-19MX31: Added support for the Casio COM57H5M10XRC to QONGStefano Babic
The patch adds setup to connect a CASIO COM57H5M10XRC (640x480 TFT display) to the QONG module. Signed-off-by: Stefano Babic <sbabic@denx.de>
2010-05-17fsl_diu_fb.c: fix build warningsWolfgang Denk
Commit 15351855 "fsl-diu: Using I/O accessor to CCSR space" caused a number of "passing argument 2 of 'out_be32' makes integer from pointer without a cast" warnings; fix these. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Dave Liu <daveliu@freescale.com> Cc: Jerry Huang <Chang-Ming.Huang@freescale.com> Cc: Kumar Gala <galak@kernel.crashing.org>
2010-05-17Avoid use of divides in print_sizeNick Thompson
Modification of print_size to avoid use of divides and especially long long divides. Keep the binary scale factor in terms of bit shifts instead. This should be faster, since the previous code gave the compiler no clues that the divides where always powers of two, preventing optimisation. Signed-off-by: Nick Thompson <nick.thompson@ge.com> Acked-by: Timur Tabi <timur@freescale.com>
2010-05-17lan91c96, smc911x: remove useless free(ptr) calls on NULL ptrSerge Ziryukin
Signed-off-by: Serge Ziryukin <ftrvxmtrx@gmail.com>
2010-05-17Merge branch 'master' of git://git.denx.de/u-boot-mpc83xxWolfgang Denk
2010-05-17Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk
2010-05-17Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk
2010-05-17Fix SICRL setting in SIMPC8313Ron Madrid
This patch sets the SICRL_LBC bits in SICRL to change the function of the associated pins to GPIO functionality. Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net>
2010-05-17mpc83xx: fix NAND bootstrap too big errorKim Phillips
commit 167cdad1372917bc11c636c359aad02625291fa9 "SERIAL: Enable port-mapped access" inadvertently broke 83xx nand boards by converting NS16550_init to use io accessors, which expanded the size of the generated code. this patch fixes the problem by removing icache functions from the nand builds, which somewhat follows commit 1a2e203b31d33fb720f2cf1033b241ad36ab405a "mpc83xx: turn on icache in core initialization to improve u-boot boot time" Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2010-05-17Removal of checkboard from spl bootstrap build for SIMPC8313Ron Madrid
This patch removes the checkboard function from the build of the 4k bootstrap section for the SIMPC8313 as it is not needed in the spl build. This will allow > 100 bytes of extra room for other uses. Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2010-05-17ppc4xx: Fix building PLU405 boardMatthias Fuchs
Due to some overlapping sections it's time to update TEXT_BASE for this board. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
2010-05-16Makefile: fix out-of-tree building of "u-boot.img" targetWolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2010-05-15MVBLM7, MVSMR: fix Makefile (cleanup bootscript.img)Wolfgang Denk
Fix MVBLM7 and MVSMR Makefiles for correct out-of-tree building (create "bootscript.img" in build directory instead of source directory) and cleanup (remove "bootscript.img" when cleaning up). Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
2010-05-15ARM: add __aeabi_unwind_cpp_pr0() function to avoid linker complaintsWolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de> Tested-by: Thomas Weber <weber@corscience.de>
2010-05-15drivers/mmc/fsl_esdhc.c: fix compiler warningsWolfgang Denk
Commit 77c1458d caused the following compiler warnings: fsl_esdhc.c: In function 'esdhc_pio_read_write': fsl_esdhc.c:142: warning: assignment discards qualifiers from pointer target type fsl_esdhc.c: In function 'esdhc_setup_data': fsl_esdhc.c:169: warning: unused variable 'wml_value' fsl_esdhc.c: In function 'esdhc_pio_read_write': fsl_esdhc.c:164: warning: control reaches end of non-void function Fix these. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Dipen Dudhat <dipen.dudhat@freescale.com> Cc: Andy Fleming <afleming@freescale.com>
2010-05-12Enabled support for Rev 1.3 SPD for DDR2 DIMMsYork Sun
SPD has minor change from Rev 1.2 to 1.3. This patch enables Rev 1.3. The difference has ben examined and the code is compatible. Speed bins is not verified on hardware for CL7 at this moment. This patch also enables SPD Rev 1.x where x is up to "F". According to SPD spec, the lower nibble is optionally used to determine which additinal bytes or attribute bits have been defined. Software can safely use defaults. However, the upper nibble should always be checked. Signed-off-by: York Sun <yorksun@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2010-05-1285xx/fsl-sata: Use is_serdes_configured() to determine if SATA is enabledKumar Gala
On the MPC85xx platform if we have SATA its connected on SERDES. Determing if SATA is enabled via sata_initialize should not be board specific and thus we move it out of the MPC8536DS board code. Additionally, now that we have is_serdes_configured() we can determine if the given SATA port is enabled and error out if its not in the driver. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2010-05-1285xx/mpc8536ds: Use is_serdes_configured() to determine of PCIe enabledKumar Gala
The new is_serdes_configured covers a broader range of devices than the PCI specific code. Use it instead as we convert away from the is_fsl_pci_cfg() code. Additionally move to setting LAWs for PCI based on if its configured. Also updated PCI FDT fixup code to remove PCI controllers from dtb if they are configured. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2010-05-1285xx: Add is_serdes_configured() support to MPC8536 SERDESKumar Gala
Add the ability to determine if a given IP block connected on SERDES is configured. This is useful for things like PCIe and SRIO since they are only ever connected on SERDES. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2010-05-12fsl-diu: Using I/O accessor to CCSR spaceJerry Huang
Using PPC I/O accessor to DIU I/O space instead of directly read/write. It will prevent the dozen of compiler order issue and PPC hardware order issue for accessing I/O space. Using the toolchain(tc-fsl-x86lnx-e500-dp-4.3.74-2.i386.rpm) can show up the order issue of DIU driver. Signed-off-by: Dave Liu <daveliu@freescale.com> Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2010-05-09Merge branch 'master' of git://git.denx.de/u-boot-mpc83xxWolfgang Denk
2010-05-07mpc83xx/mvBLM7: add usb commands and cleanup.Andre Schwarz
Add USB commands. Rename autoscript to bootscript. Add automatic bootscript image generation to makefile. Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2010-05-07mpc83xx: Add UPMA configuration to SIMPC8313Ron Madrid
Added UPM array table, upmconfig, and Local Bus configuration support for SIMPC8313 Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2010-05-07serial: punt unused serial_addr()Mike Frysinger
Only one file apparently defines this function, and it merely stubs it out. So if no one is defining/calling it, punt it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2010-05-07update include/asm/ gitignore after moveMike Frysinger
With the cpu include paths moved, the gitignore paths need updating. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Tested-by: Tom Rix <tom@bumblecow.com>
2010-05-07Fixup native builds on powerpcKumar Gala
When we changed ARCH from ppc to powerpc we need to treat HOSTARCH the same way. We use HOSTARCH == ARCH to determine if a build is native. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2010-05-06cmd_usb.c: show cmd usage if no args givenSerge Ziryukin
Signed-off-by: Serge Ziryukin <ftrvxmtrx@gmail.com>
2010-05-06powerpc: Consolidate bootcount_{store|load} for PowerPCStefan Roese
This patch consolidates bootcount_{store|load} for PowerPC by implementing a common version in arch/powerpc/lib/bootcount.c. This code is now used by all PowerPC variants that currently have these functions implemented. The functions now use the proper IO-accessor functions to read/write the values. This code also supports two different bootcount versions: a) Use 2 separate words (2 * 32bit) to store the bootcounter b) Use only 1 word (2 * 16bit) to store the bootcounter Version b) was already used by MPC5xxx. Signed-off-by: Stefan Roese <sr@denx.de> Acked-by: Detlev Zundel <dzu@denx.de> Acked-by: Kim Phillips <kim.phillips@freescale.com> for 83xx parts Cc: Michael Zaidman <michael.zaidman@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Kim Phillips <kim.phillips@freescale.com> Cc: Anatolij Gustschin <agust@denx.de>
2010-05-06Merge branch 'master' of git://git.denx.de/u-boot-i2cWolfgang Denk
2010-05-06drivers/*/Makefile: fix conditional compile rule.Ender.Dai
Fix conditional compile rule for twl4030.c and videomodes.c. Signed-off-by: Ender.Dai <ender.dai@gmail.com>
2010-05-06Move test for unnecessary memmove to memmove_wd()Larry Johnson
Signed-off-by: Larry Johnson <lrj@acm.org>
2010-05-06compiler.h: add uint typedefMike Frysinger
Recent crc changes started using the "uint" type in headers that are used on the build system. This subsequently broke mingw targets as they do not provide such a type. So add this basic typedef to compiler.h so that we do not have to worry about this breaking again in the future. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2010-05-06command.c: Enable auto tab for the editenv commandTrübenbach, Ralf
Enable the auto completion (with TAB) of the environment variable name after the editenv command. Signed-off-by: Ralf Trübenbach <ralf.truebenbach@men.de>