summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-mmcWolfgang Denk2011-11-27-15/+7
|\ | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-mmc: Revert "mmc: retry the cmd8 to meet 74 clocks requirement in the spec" mmc: mv_sdhci: Fix host version read for Armada100
| * Revert "mmc: retry the cmd8 to meet 74 clocks requirement in the spec"Macpaul Lin2011-11-25-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 02f3029f1810b99869254d0cf0a71946a008a728. This patch add 3 times retry to CMD8 because the Marvell mmc controller doesn't obey the power ramp up process in the SD specification 6.4.1. (Please refer to figure 6.1 and 6.2 in the specification.) The CMD0 should be send after power ramp up has been finished. However, the Marvell mmc contorller must do power ramp up after the first CMD0 command has been send. This patch also affect existing platforms like Nokia N900 and other platforms. Signed-off-by: Macpaul Lin <macpaul@andestech.com> Acked-by: Lei Wen <leiwen@marvell.com> Acked-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stephen Warren <swarren@nvidia.com>
| * mmc: mv_sdhci: Fix host version read for Armada100Ajay Bhargav2011-11-25-1/+5
| | | | | | | | | | | | | | | | sdhci_readw does not work for host version read in Armada100 series SoCs. This patch fix this issue by making a sdhci_readl call to get host version. Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
* | microblaze: usable uart16550 for big endian systemsStephan Linz2011-11-27-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | As a result of the commit 6833260 the uart16550 driver is broken for Microblaze big endian systems, because of the missing 3 byte offset. Other than as described, not all U-Boot BSP will treat properly the 3 byte offset. This why prefer to mask out the 3 byte offset in general and setup correct _REG_SIZE value depending on edianess. Signed-off-by: Stephan Linz <linz@li-pro.net> Tested-by: Michal Simek <monstr@monstr.eu>
* | mvblx: punt unused clean/distclean targetsMichael Jones2011-11-27-6/+0
| | | | | | | | Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
* | cmd_nvedit.c: Fix compiler warning introduced by checkpatch cleanupKumar Gala2011-11-27-1/+1
| | | | | | | | | | | | | | | | | | cmd_nvedit.c: In function 'do_env_grep': cmd_nvedit.c:182:3: warning: suggest parentheses around assignment used as truth value Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
* | drivers/bios_emulator/x86emu/ops2.c: Fix GCC 4.6 build warningKumar Gala2011-11-27-1/+2
| | | | | | | | | | | | | | | | | | Fix: x86emu/ops2.c: In function 'x86emuOp2_set_byte': x86emu/ops2.c:171:11: warning: variable 'name' set but not used [-Wunused-but-set-variable] Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | ignore new mkenvimage toolMike Frysinger2011-11-27-0/+1
|/ | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Merge branch 'hs@denx.de' of git://git.denx.de/u-boot-stagingWolfgang Denk2011-11-23-56/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'hs@denx.de' of git://git.denx.de/u-boot-staging: drivers/net/dnet.c: Fix GCC 4.6 warnings board/xaeniax/flash.c: Fix GCC 4.6 warnings net/bootp.c: Fix GCC 4.6 warning common/cmd_bootm.c: Fix GCC 4.6 warnings board/mx1ads/mx1ads.c: Fix GCC 4.6 warning board/mx1ads/syncflash.c: Fix GCC 4.6 warnings board/lubbock/flash.c: Fix GCC 4.6 warnings drivers/net/cs8900.c: Fix GCC 4.6 warning arch/arm/cpu/arm926ejs/omap/cpuinfo.c: Fix GCC 4.6 warnings drivers/net/lan91c96.c: Fix GCC 4.6 warning board/ronetix/pm9263/pm9263.c: Fix GCC 4.6 warning drivers/mtd/onenand/samsung.c: Fix GCC 4.6 warning drivers/usb/musb/musb_hcd.c: Fix GCC 4.6 warning
| * drivers/net/dnet.c: Fix GCC 4.6 warningsAnatolij Gustschin2011-11-23-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: dnet.c: In function 'dnet_send': dnet.c:136:9: warning: variable 'len' set but not used [-Wunused-but-set-variable] dnet.c: In function 'dnet_set_hwaddr': dnet.c:209:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] dnet.c:209:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] dnet.c:209:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] dnet.c:209:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * board/xaeniax/flash.c: Fix GCC 4.6 warningsAnatolij Gustschin2011-11-23-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fix: flash.c: In function 'flash_erase': flash.c:223:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable] flash.c: In function 'write_data': flash.c:392:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * net/bootp.c: Fix GCC 4.6 warningAnatolij Gustschin2011-11-23-1/+2
| | | | | | | | | | | | | | | | Fix: bootp.c: In function 'BootpCopyNetParams': bootp.c:108:11: warning: unused variable 'tmp_ip' [-Wunused-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * common/cmd_bootm.c: Fix GCC 4.6 warningsAnatolij Gustschin2011-11-23-1/+2
| | | | | | | | | | | | | | | | | | Fix: cmd_bootm.c: In function 'bootm_load_os': cmd_bootm.c:315:7: warning: unused variable 'unc_len' [-Wunused-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * board/mx1ads/mx1ads.c: Fix GCC 4.6 warningAnatolij Gustschin2011-11-23-4/+3
| | | | | | | | | | | | | | | | | | Fix: mx1ads.c: In function 'board_early_init_f': mx1ads.c:83:24: warning: variable 'tmp' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * board/mx1ads/syncflash.c: Fix GCC 4.6 warningsAnatolij Gustschin2011-11-23-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: syncflash.c: In function 'SF_SR': syncflash.c:60:10: warning: variable 'tmp1' set but not used [-Wunused-but-set-variable] syncflash.c: In function 'SF_PrechargeAll': syncflash.c:96:6: warning: variable 'tmp' set but not used [-Wunused-but-set-variable] mx1ads.c: In function 'board_early_init_f': mx1ads.c:83:24: warning: variable 'tmp' set but not used [-Wunused-but-set-variable] syncflash.c: In function 'SF_Erase': syncflash.c:112:6: warning: variable 'tmp' set but not used [-Wunused-but-set-variable] syncflash.c: In function 'flash_init': syncflash.c:155:6: warning: variable 'tmp' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * board/lubbock/flash.c: Fix GCC 4.6 warningsAnatolij Gustschin2011-11-23-4/+3
| | | | | | | | | | | | | | | | | | | | Fix: flash.c: In function 'flash_erase': flash.c:223:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable] flash.c: In function 'write_data': flash.c:392:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * drivers/net/cs8900.c: Fix GCC 4.6 warningAnatolij Gustschin2011-11-23-6/+5
| | | | | | | | | | | | | | | | | | Fix: cs8900.c: In function 'get_reg_init_bus': cs8900.c:69:14: warning: variable 'c' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * arch/arm/cpu/arm926ejs/omap/cpuinfo.c: Fix GCC 4.6 warningsAnatolij Gustschin2011-11-23-2/+3
| | | | | | | | | | | | | | | | | | | | | | Fix: cpuinfo.c: In function 'print_cpuinfo': cpuinfo.c:155:6: warning: variable 'system_serial_low' set but not used [-Wunused-but-set-variable] cpuinfo.c:154:6: warning: variable 'system_serial_high' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * drivers/net/lan91c96.c: Fix GCC 4.6 warningAnatolij Gustschin2011-11-23-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix: lan91c96.c: In function 'dump_memory_info': lan91c96.c:157:7: warning: variable 'mem_info' set but not used [-Wunused-but-set-variable] lan91c96.c: In function 'smc_send_packet': lan91c96.c:320:16: warning: variable 'ioaddr' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * board/ronetix/pm9263/pm9263.c: Fix GCC 4.6 warningAnatolij Gustschin2011-11-23-7/+6
| | | | | | | | | | | | | | | | | | Fix: pm9263.c: In function 'pm9263_lcd_hw_psram_init': pm9263.c:167:20: warning: variable 'x' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * drivers/mtd/onenand/samsung.c: Fix GCC 4.6 warningAnatolij Gustschin2011-11-23-2/+1
| | | | | | | | | | | | | | | | | | Fix: samsung.c: In function 's3c_onenand_check_lock_status': samsung.c:486:6: warning: variable 'tmp' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * drivers/usb/musb/musb_hcd.c: Fix GCC 4.6 warningAnatolij Gustschin2011-11-23-2/+1
| | | | | | | | | | | | | | | | | | Fix: musb_hcd.c: In function 'submit_control_msg': musb_hcd.c:851:6: warning: variable 'csr' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | drivers/i2c/davinci_i2c.c: Fix GCC 4.6 warningAnatolij Gustschin2011-11-23-3/+1
| | | | | | | | | | | | | | | | | | | | Fix: davinci_i2c.c: In function 'flush_rx': davinci_i2c.c:81:6: warning: variable 'dummy' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Heiko Schocher <hs@denx.de>
* | i2c: Codingstyle cleanup for i2c evb64260 board driverHeiko Schocher2011-11-23-12/+12
| | | | | | | | | | | | | | | | There are some magic constants in this drivers, which I cannot fixup ... Eran, can you help here? Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Eran Man <eran@nbase.co.il>
* | i2c: sh: Add support I2C for Renesas SHNobuhiro Iwamatsu2011-11-23-0/+293
| | | | | | | | | | | | | | | | This supports I2C of Renesas SH. I tested on SH7724. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> CC: Heiko Schocher <hs@denx.de>
* | Fix clash between IH_ARCH_NDS32 and IH_ARCH_SANDBOXStefan Kristiansson2011-11-23-1/+1
| | | | | | | | | | | | | | | | NDS32 and SANDBOX architecture were sharing the same IH_ARCH number Signed-off-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> Acked-by: Macpaul Lin <macpaul@andestech.com> Acked-by: Marek Vasut <marek.vasut@gmail.com>
* | nds32/ag101: clean up for SoC related codeMacpaul Lin2011-11-23-10/+6
| | | | | | | | | | | | | | | | Remove unneccessary codes. 1. Clean up for cpu related code. 2. Clean up for timer related code. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* | tools/env: use lib/crc32.c directlyAndreas Bießmann2011-11-22-6/+3
| | | | | | | | | | | | | | | | Instead of linking the file into $(obj) tree use directly the source file. This also prevents littered source tree if building not out-of-tree. Signed-off-by: Andreas Bießmann <biessmann@corscience.de> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | sandbox: Fix warnings in hashtable.cSimon Glass2011-11-22-5/+5
| | | | | | | | | | | | | | | | This fixes a few printf() strings for size_t which are missing the 'z' modifier. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | Improve Power Management in SMC911X driver.bertrand.cachet@heig-vd.ch2011-11-22-2/+5
| | | | | | | | | | | | | | | | | | device is already in *normal* (D0) mode => it doesn't need to be wake-up. With this patch, we only wake-up (writing on TEST_BYTE register) if PM_MODE bits of PM_CTRL register is in sleep (D1/D2) mode. Signed-off-by: Bertrand Cachet <bertrand.cachet@heig-vd.ch>
* | env: clean env_common.c checkpatch and code styleIgor Grinberg2011-11-22-34/+26
| | | | | | | | | | | | Cleanup the env_common.c checkpatch warnings, errors and coding style. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: clean env_nand.c checkpatch and code styleIgor Grinberg2011-11-22-53/+46
| | | | | | | | | | | | Cleanup the env_nand.c checkpatch warnings, errors and coding style. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: clean env_flash.c checkpatch and code styleIgor Grinberg2011-11-22-91/+84
| | | | | | | | | | | | Cleanup the env_flash.c checkpatch warnings, errors and coding style. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: clean env_sf.c checkpatch and code styleIgor Grinberg2011-11-22-28/+20
| | | | | | | | | | | | Cleanup the env_sf.c checkpatch warnings, errors and coding style. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: clean env_eeprom.c checkpatch and code styleIgor Grinberg2011-11-22-58/+46
| | | | | | | | | | | | Cleanup the env_eeprom.c checkpatch warnings, errors and coding style. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: clean env_embedded.c checkpatch and code styleIgor Grinberg2011-11-22-24/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup the env_embedded.c checkpatch warnings, errors and coding style. There is one error left though: ERROR: Macros with multiple statements should be enclosed in a do - while loop #79: FILE: u-boot/common/env_embedded.c:79: +#define GEN_ABS(name, value) \ + asm(".globl " GEN_SYMNAME(name)); \ + GEN_SET_VALUE(name, value) total: 1 errors, 0 warnings, 213 lines checked We cannot enclose that statement in a do - while loop, because these are a global assembly declarations. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: clean env_mmc.c checkpatch and code styleIgor Grinberg2011-11-22-49/+23
| | | | | | | | | | | | | | | | Cleanup the env_mmc.c checkpatch warnings, errors and coding style. Simplify env_relocate_spec() function implementation. Also mark internal functions as static. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: clean env_nvram.c checkpatch and code styleIgor Grinberg2011-11-22-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup the env_nvram.c checkpatch warnings, errors and coding style. There are 2 wanring left about the extern used in c file: WARNING: externs should be avoided in .c files #53: FILE: env_nvram.c:53: +extern void *nvram_read(void *dest, const long src, size_t count); WARNING: externs should be avoided in .c files #54: FILE: env_nvram.c:54: +extern void nvram_write(long dest, const void *src, size_t count); total: 0 errors, 2 warnings, 138 lines checked There is no common nvram header file to use instead of the externs. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: clean env_onenand.c checkpatch and code styleIgor Grinberg2011-11-22-7/+5
| | | | | | | | | | | | Cleanup the env_onenand.c checkpatch warnings, errors and coding style. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: clean env_dataflash.c checkpatch and code styleIgor Grinberg2011-11-22-20/+14
| | | | | | | | | | | | | | Cleanup the env_dataflash.c checkpatch warnings, errors and coding style. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: clean env_mgdisk.c checkpatch and code styleIgor Grinberg2011-11-22-2/+2
| | | | | | | | | | | | | | Cleanup the env_mgdisk.c checkpatch warnings, errors and coding style. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: clean env_nowhere.c checkpatch and code styleIgor Grinberg2011-11-22-5/+5
| | | | | | | | | | | | Cleanup the env_nowhere.c checkpatch warnings, errors and coding style. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: clean cmd_nvedit.c checkpatch and code styleIgor Grinberg2011-11-22-52/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup the cmd_nvedit.c checkpatch warnings, errors and coding style. There are 10 wanrings left about the simple_strtoul() function: WARNING: simple_strtoul is obsolete, use kstrtoul instead #359: FILE: cmd_nvedit.c:359: + load_addr = simple_strtoul(argv[2], NULL, 16); ... total: 0 errors, 10 warnings, 1043 lines checked Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: move extern environment[] to environment.hIgor Grinberg2011-11-22-14/+11
| | | | | | | | | | | | | | Extract all extern declarations for environment out of c files into the environment.h header. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | env: move extern default_environment[] to environment.hIgor Grinberg2011-11-22-24/+2
| | | | | | | | | | | | | | | | | | Extract all extern declarations for default_environment[] out of c files into the environment.h header. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Cc: Stefan Roese <sr@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* | common: move extern char console_buffer[] to common.hIgor Grinberg2011-11-22-17/+1
| | | | | | | | | | | | | | | | | | Extract all extern declarations for console_buffer[] out of c files into the common.h header. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Cc: Frank Gottschling <fgottschling@eltec.de> Cc: Murray Jensen <Murray.Jensen@csiro.au>
* | env: clean environment.h checkpatch and code styleIgor Grinberg2011-11-22-21/+23
| | | | | | | | | | | | | | | | | | | | | | Though one warning left: WARNING: do not add new typedefs #149: FILE: u-boot/include/environment.h:149: +typedef struct environment_s { total: 0 errors, 1 warnings, 181 lines checked Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
* | net: rtl8109: drop unused !NET_MULTI driverMike Frysinger2011-11-22-390/+0
| | | | | | | | | | | | | | No one uses this driver, and it isn't converted to the NET_MULTI framework (which we dropped recently), so drop this driver too. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Fix warnings in cmd_nvedit.cSimon Glass2011-11-22-2/+2
| | | | | | | | | | | | | | | | This printf() string should be %ld now that uintptr_t is defined as long. Also fix a size_t error. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | Define uintptr_t as long int to simplify printf() format stringsSimon Glass2011-11-22-9/+3
| | | | | | | | | | | | | | | | | | | | If uintptr_t can be either an unsigned int or an unsigned long int, it is tricky to use it in a printf() format string. This changes it to unsigned long int consistently. This should do the right thing on both 32-bit and 64-bit architectures. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>