summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* smc911x: Fix build warningsWolfgang Denk2011-09-09-2/+2
| | | | | | | | | | | | Commit 6af1d41 "smc911x MII made available" was missing a few "const" qualifiers. Fix the resulting in build warnings: smc911x.c: In function 'smc911x_initialize': smc911x.c:297: warning: passing argument 2 of 'miiphy_register' from incompatible pointer type smc911x.c:297: warning: passing argument 3 of 'miiphy_register' from incompatible pointer type Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Helmut Raiger <helmut.raiger@hale.at>
* MX31: mx31pdk: make use of GPIO frameworkStefano Babic2011-09-07-0/+1
| | | | Signed-off-by: Stefano Babic <sbabic@denx.de>
* PXA: FIX: Deep-sleep return address in stored in PSPRMarek Vasut2011-09-07-1/+1
| | | | | | FIX for a typo-bug: The address is stored in PSPR, not PSSR. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
* smc911x MII made availableHelmut Raiger2011-09-07-6/+30
| | | | | | | The driver already had the MII functions, but they have not been registered using miiphy_register(). Signed-off-by: Helmut Raiger <helmut.raiger@hale.at>
* common: fix behavior of ROUND macro when input is already roundedAnton Staaf2011-09-07-2/+2
| | | | | | | | | | | | | | | | | | | Currently when you call ROUND with a value that is already a multiple of the second parameter it will return a value that is one multiple larger, instead of returning the value passed in. There are only two types of usage of ROUND currently, one in various config files to round CONFIG_SYS_MALLOC_LEN to a multiple of 4096 bytes. The other in cmd_sf.c where the incorrect behavior of ROUND is worked around be subtracting one from the length argument before passing it to ROUND. This patch fixes ROUND and removes the workaround from cmd_sf. It also results in all of the malloc pools that use ROUND to compute their size shrinking by 4KB. Cc: Lukasz Majewski <l.majewski@samsung.com> Cc: Mike Frysinger <vapier@gentoo.org>
* Merge branch 'master' of git://git.denx.de/u-boot-mmcWolfgang Denk2011-09-07-1/+915
|\ | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-mmc: ftsdc010: add support of ftsdc010 mmc controller mmc: Fix mmc_send_status()
| * ftsdc010: add support of ftsdc010 mmc controllerMacpaul Lin2011-09-04-0/+913
| | | | | | | | | | | | Faraday FTSDC010 controller is a SD/MMC controller for SoC chip. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
| * mmc: Fix mmc_send_status()Marek Vasut2011-09-04-1/+2
| | | | | | | | | | | | | | | | The mmc_send_status() function sets cmd.arg = 0. That's incorrect, so fix it. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Andy Fleming <afleming@freescale.com> Tested-by: Lei Wen <adrian.wenl@gmail.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2011-09-07-1/+0
|\ \ | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-video: VIDEO: mb86r0xgdc.c: fix warning: unused variable 'i'
| * | VIDEO: mb86r0xgdc.c: fix warning: unused variable 'i'Wolfgang Denk2011-09-06-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build warning: Configuring for jadecpu board... mb86r0xgdc.c: In function 'dsp_init': mb86r0xgdc.c:60: warning: unused variable 'i' Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Anatolij Gustschin <agust@denx.de>
* | | I2C: mxc: fix compilation for MX31Stefano Babic2011-09-07-4/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Heiko Schocher <hs@denx.de> Acked-by: Heiko Schocher <hs@denx.de>
* | | MX31: fix missing mxc_get_clk() callStefano Babic2011-09-07-0/+2
| | | | | | | | | | | | | | | | | | Add missing case to be used in common MXC code. Signed-off-by: Stefano Babic <sbabic@denx.de>
* | | arm: tegra2: fix out-of-tree buildChe-liang Chiou2011-09-07-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The out-of-tree build fails because the Makefiles in question depend on source files of another directory but do not explicitly mkdir that directory. As a matter of fact, other Makefiles under board/*/ directory that refer to source files under another directory explicitly call mkdir. This patch adds explicit mkdir's to the Makefiles in question, and verifies that out-of-tree build is working. Signed-off-by: Che-Liang Chiou <clchiou@chromium.org> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
* | | omap24xx: fix 'reset_timer_masked' declaration errorWolfgang Denk2011-09-07-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 17659d7 "Timer: Remove reset_timer_masked()" introduced a static declaration for reset_timer_masked() which causes build errors: timer.c:45: error: static declaration of 'reset_timer_masked' follows non-static declaration include/asm/u-boot-arm.h:70: error: previous declaration of 'reset_timer_masked' was here Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Graeme Russ <graeme.russ@gmail.com> Cc: Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Sandeep Paulraj <s-paulraj@ti.com>
* | | da8xxevm: Fix warning: unused variable 'val'Wolfgang Denk2011-09-07-1/+3
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Sandeep Paulraj <s-paulraj@ti.com> Cc: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
* | | ARM: PXA: remove broken "zylonite" board.Wolfgang Denk2011-09-07-1743/+1
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Marek Vasut <marek.vasut@gmail.com> Acked-by: Marek Vasut <marek.vasut@gmail.com>
* | | ARM: remove broken "shannon" board.Wolfgang Denk2011-09-07-968/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Rolf Offermanns <rof@sysgo.de>
* | | ARM: remove broken "modnet50" board.Wolfgang Denk2011-09-07-1148/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Thomas Elste <info@elste.org>
* | | ARM: remove broken "lpc2292sodimm" board.Wolfgang Denk2011-09-07-638/+1
| | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
* | | ARM: remove broken "lart" board.Wolfgang Denk2011-09-07-1062/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Alex Züpke <azu@sysgo.de>
* | | ARM: remove broken "impa7" board.Wolfgang Denk2011-09-07-878/+6
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Marius Gröger <mag@sysgo.de>
* | | ARM: remove broken "gcplus" board.Wolfgang Denk2011-09-07-853/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: George G. Davis <gdavis@mvista.com>
* | | ARM: remove broken "evb4510" board.Wolfgang Denk2011-09-07-1032/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Curt Brune <curt@cucy.com>
* | | ARM: remove broken "ep7312" board.Wolfgang Denk2011-09-07-775/+9
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Marius Gröger <mag@sysgo.de>
* | | ARM: remove broken "dnp1110" board.Wolfgang Denk2011-09-07-856/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Alex Züpke <azu@sysgo.de>
* | | ARM: remove broken "SMN42" board.Wolfgang Denk2011-09-07-939/+1
| | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
* | | doc/README.scrapyard: Update commit IDs or board removalsWolfgang Denk2011-09-07-25/+25
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | Makefile : fix generation of cpu related asm-offsets.hStefano Babic2011-09-07-27/+25
|/ / | | | | | | | | | | | | | | | | | | | | commit 0edf8b5b2fa0d210ebc4d6da0fd1aceeb7e44e47 breaks building on a different directory with the O= parameter. The patch wil fix this issue, generating always asm-offsets.h before the other targets. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Matthias Weisser <weisserm@arcor.de> CC: Wolfgang Denk <wd@denx.de>
* | Flush cache after the OS image is loaded into the memory.Diana CRACIUN2011-09-05-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are loading an executable image into memory we need flush it out of the cache to possible maintain coherence on CPUs with split instruction and data caches. We do this for other executable image loading command. On PowerPC once we do this we no longer need to explicitly flush the dcache on multi-core systems in the BOOTM_STATE_OS_PREP phase. We now treat the BOOTM_STATE_OS_PREP as a no-op to maintain backwards compatibility with the bootm subcommand. Signed-off-by: James Yang <James.Yang@freescale.com> Signed-off-by: Diana CRACIUN <Diana.Craciun@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | Correct call to eth_write_hwaddr()Simon Glass2011-09-05-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes "Warning: failed to set MAC address" on platforms which rely on an 'ethaddr' environment variable to set the MAC address. This bug was introduced by this commit: 7616e785 Add Ethernet hardware MAC address framework to usbnet Signed-off-by: Simon Glass <sjg@chromium.org> Tested-by: Kumar Gala <galak@kernel.crashing.org> Tested-by: Michal Simek <monstr@monstr.eu> Tested-by: Heiko Schocher <hs@denx.de>
* | sf: winbond: Add support for the Winbond W25X40James Le Cuirot2011-09-05-0/+8
| | | | | | | | | | The Winbond W25X40 is now being used in the IP02 (and possibly IP04). Tested and working on the actual device.
* | board/prodrive/alpr/fpga.c: Coding style cleanupWolfgang Denk2011-09-05-37/+39
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* | PPC4xx: ALPR: constify FPGA codeWolfgang Denk2011-09-05-1/+1
| | | | | | | | | | | | | | | | | | | | | | The ALPR custom FPGA code was missed by commit e6a857d "fpga: constify to fix build warning" resulting in such warnings: fpga.c:226: warning: initialization from incompatible pointer type Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* | FPGA: constify Lattice FPGA codeWolfgang Denk2011-09-05-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | The Lattice code was missed by commit e6a857d "fpga: constify to fix build warning" resulting in such warnings: fpga.c: In function 'fpga_load': fpga.c:238: warning: passing argument 2 of 'lattice_load' discards qualifiers from pointer target type fpga.c: In function 'fpga_dump': fpga.c:278: warning: passing argument 2 of 'lattice_dump' discards qualifiers from pointer target type Signed-off-by: Wolfgang Denk <wd@denx.de> cc: Stefano Babic <sbabic@denx.de>
* | MPC8xx: fix build problem for ETX094 boardWolfgang Denk2011-09-05-1/+0
| | | | | | | | | | | | | | | | | | Commit 58c583b "net: Check network device driver name" increased the code size and broke building for the ETX094 board. Adjust the linker script to make it build again. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | linkstation: fix warning: "CONFIG_IDENT_STRING" redefinedWolfgang Denk2011-09-05-1/+1
| | | | | | | | | | | | | | | | | | | | Commit 09c2e90 "unify version_string" defines a default value for CONFIG_IDENT_STRING in version.h, so any private settings musty be done before including this file. Move the include for version.h after the one for common.h to fix the build problem. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
* | drivers/video/Makefile: include object files only onceWolfgang Denk2011-09-05-3/+3
| | | | | | | | | | | | | | | | | | Use "$(sort $(COBJS-y))" to prevent multiple inclusion of the same object files. Also sort driver list. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | video: Fix build error with global inclusion of videomodesKumar Gala2011-09-05-2/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following commit: commit de701d118380de12a48c8a4fb345e9f909329432 Author: Syed Mohammed Khasim <khasim@ti.com> Date: Tue Apr 19 14:00:34 2011 -0500 OMAP3: Add DSS driver for OMAP3 Added videomodes to the object list w/o any protection. This causes build issues like: videomodes.o:(.rodata.res_mode_init+0x0): multiple definition of `res_mode_init' videomodes.o:(.rodata.res_mode_init+0x0): first defined here videomodes.o: In function `video_get_params': /local/home/galak/git/u-boot/drivers/video/videomodes.c:160: multiple definition of `video_get_params' videomodes.o:/local/home/galak/git/u-boot/drivers/video/videomodes.c:160: first defined here videomodes.o: In function `video_get_video_mode': /local/home/galak/git/u-boot/drivers/video/videomodes.c:229: multiple definition of `video_get_video_mode' videomodes.o:/local/home/galak/git/u-boot/drivers/video/videomodes.c:229: first defined here videomodes.o:(.rodata.vesa_modes+0x0): multiple definition of `vesa_modes' videomodes.o:(.rodata.vesa_modes+0x0): first defined here make[1]: *** [libvideo.o] Error 1 Remove the unconditional inclusion and move to adding to CONFIG_VIDEO_OMAP3 case. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* net: Check network device driver nameMichal Simek2011-09-04-0/+8
| | | | | | | | | | | | | | | If name is longer than allocated space NAMESIZE mac address is rewritten which show error message like: Error message: Warning: Xlltemac.87000000 MAC addresses don't match: Address in SROM is 30:00:00:00:00:00 Address in environment is 00:0a:35:00:6a:04 NAMESIZE contains Driver name + zero terminated character. Signed-off-by: Michal Simek <monstr@monstr.eu>
* stdio: Fix a possible buffer overflowBradley Bolen2011-09-04-2/+2
| | | | Signed-off-by: Bradley Bolen <bradleybolen at yahoo.com>
* MAINTAINERS: fix integrator and versatileLinus Walleij2011-09-04-3/+2
| | | | | | | | | - Take maintainership of the integratorcp board - Remove the double entry for the versatile board it has two variants but only one board folder Cc: Philippe Robin <philippe.robin@arm.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
* Merge branch 'master' of git://git.denx.de/u-boot-coldfireWolfgang Denk2011-09-04-733/+201
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-coldfire: ColdFire:Clean up the CONFIG_STANDALONE_LOAD_ADDR usage ColdFire:Add mb for 5253 dram initialization ColdFire:Define the DM9000 byteswap for M5253 board. ColdFire:Update the env settings for several boards. ColdFire:disable the NFS define for 52277 board. ColdFire:Update the timer_init since it was unified. ColdFire: Cleanup for partial linking and --gc-sections ColdFire: Update compile flags for each CPUs ColdFire:Fix the configuration broken for some boards.
| * ColdFire:Clean up the CONFIG_STANDALONE_LOAD_ADDR usageJason Jin2011-09-04-2/+1
| | | | | | | | | | | | Remove the additional linker options for CONFIG_STANDALONE_LOAD_ADDR Signed-off-by: Jason Jin <Jason.jin@freescale.com>
| * ColdFire:Add mb for 5253 dram initializationJason Jin2011-09-04-0/+6
| | | | | | | | | | | | | | | | The dram initialization sequence should be in order. This patch add mb for the dram intialization code to make sure the compiler do not disorder the code. Signed-off-by: Jason Jin <Jason.jin@freescale.com>
| * ColdFire:Define the DM9000 byteswap for M5253 board.Jason Jin2011-09-04-0/+1
| | | | | | | | | | | | | | | | The M5253DEMO board swapped the io pins which make the standard IO function did not work for dm9000. Define the byte swap to use raw io for dm9000. Signed-off-by: Jason Jin <Jason.jin@freescale.com>
| * ColdFire:Update the env settings for several boards.Jason Jin2011-09-04-24/+37
| | | | | | | | | | | | | | Move the environment outside the u-boot for some boards and enlarge the u-boot size in some env settings. Signed-off-by: Jason Jin <Jason.jin@freescale.com>
| * ColdFire:disable the NFS define for 52277 board.Jason Jin2011-09-04-0/+1
| | | | | | | | | | | | | | There is no network device on ColdFire 52277EVB board.But the default cmd include NFS define which make the build error. Signed-off-by: Jason Jin <Jason.jin@freescale.com>
| * ColdFire:Update the timer_init since it was unified.Jason Jin2011-09-04-4/+7
| | | | | | | | Signed-off-by: Jason Jin <Jason.jin@freescale.com>
| * ColdFire: Cleanup for partial linking and --gc-sectionsJason Jin2011-09-04-673/+146
| | | | | | | | | | | | | | | | Introduce the --gc-sections for ColdFire platform and clean up the corresponding lds file. Signed-off-by: TsiChung Liew <tsicliew@gmail.com> Signed-off-by: Jason Jin <Jason.jin@freescale.com>
| * ColdFire: Update compile flags for each CPUsJason Jin2011-09-04-29/+0
| | | | | | | | | | | | | | Remove compiler version check for gcc 4.1 in config.mk. Signed-off-by: TsiChung Liew <tsicliew@gmail.com> Signed-off-by: Jason Jin <Jason.jin@freescale.com>