summaryrefslogtreecommitdiff
path: root/drivers
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2011-11-28-1/+39
|\ | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-video: DIU: 1080P and 720P support CFB: Fix font rendering on mx5 framebuffer
| * DIU: 1080P and 720P supportJerry Huang2011-11-24-0/+38
| | | | | | | | | | | | | | | | Add the 1920x1080 and 1280x720 resolution support. Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> Acked-by: Timur Tabi <timur@freescale.com> CC: Anatolij Gustschin <agust@denx.de>
| * CFB: Fix font rendering on mx5 framebufferMarek Vasut2011-11-24-1/+1
| | | | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-mmcWolfgang Denk2011-11-27-15/+6
|\ \ | | | | | | | | | | | | | | | * '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/+4
| |/ | | | | | | | | | | | | | | 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>
* | 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>
* Merge branch 'hs@denx.de' of git://git.denx.de/u-boot-stagingWolfgang Denk2011-11-23-22/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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>
| * 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>
| * 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>
| * 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: 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>
* | 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>
* | net: rtl8109: drop unused !NET_MULTI driverMike Frysinger2011-11-22-386/+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>
* | smsc95xx: Debug message cleanupWolfgang Grandegger2011-11-22-7/+3
| | | | | | | | | | | | | | | | Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Wolfgang Grandegger <wg@denx.de> Acked-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Simon Glass <sjg@chromium.org>
* | smsc95xx: Fix MAC address programmingWolfgang Grandegger2011-11-22-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Commit 79ad54400932d6484178a372fb3b659e3437473b broke MAC address programming in the SMSC95xx register set. Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Wolfgang Grandegger <wg@denx.de> Acked-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Simon Glass <sjg@chromium.org>
* | Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-stagingWolfgang Denk2011-11-21-21/+41
|\ \ | | | | | | | | | | | | | | | * 'sr@denx.de' of git://git.denx.de/u-boot-staging: Makefile: Add the missing dependency for spl target gpio: Adapt PCA9698 to standard GPIO API
| * | gpio: Adapt PCA9698 to standard GPIO APIDirk Eibach2011-11-18-21/+41
| |/ | | | | | | | | | | Signed-off-by: Dirk Eibach <eibach@gdsys.de> Acked-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-nds32Wolfgang Denk2011-11-21-3/+2
|\ \ | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-nds32: nds32/lib: add ide generic support nds32: enhance io.h for compatibility with periphals ftide020: fix incorrect information display format
| * | ftide020: fix incorrect information display formatMacpaul Lin2011-11-18-3/+2
| | | | | | | | | | | | | | | | | | Fix incorrect information display format when probing the device. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-niosWolfgang Denk2011-11-21-0/+300
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-nios: nios2: Offer ft_board_setup() capability and call fdt_fixup_ethernet(). board/nios2-generic: Use altera_pio driver and remove board specific driver gpio: Add driver for Altera's PIO core nios2: Pseudo implement dcache_status/enable/disable()
| * | gpio: Add driver for Altera's PIO coreJoachim Foerster2011-10-28-0/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver may handle multiple PIO cores and thus needs to be setup by calling the altera_pio_init() function within the early board setup routine. The driver comes with some extras, see below the copyleft header. Signed-off-by: Joachim Foerster <joachim.foerster@missinglinkelectronics.com> Tested-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
* | | e1000: fix unused variable waring for e1000 driverZang Roy-R619112011-11-17-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following build warning in drivers/net/e1000.c e1000.c: In function 'e1000_reset_hw': e1000.c:1373:11: warning: variable 'icr' set but not used [-Wunused-but-set-variable] e1000.c: In function 'e1000_phy_init_script': e1000.c:4395:11: warning: variable 'ret_val' set but not used [-Wunused-but-set-variable] Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Kyle Moffett <Kyle.D.Moffett@boeing.com>
* | | e1000: remove duplicate macros in e1000.hTimur Tabi2011-11-17-11/+0
| | | | | | | | | | | | | | | | | | | | | Some of the EEPROM Word Offset macros, and a few others, are defined twice in e1000.h. Signed-off-by: Timur Tabi <timur@freescale.com>
* | | drivers/rtc/s3c24x0_rtc.c: fix GCC 4.6 warningsAnatolij Gustschin2011-11-16-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: s3c24x0_rtc.c: In function 'rtc_get': s3c24x0_rtc.c:67:53: warning: variable 'a_armed' set but not used s3c24x0_rtc.c:67:45: warning: variable 'a_year' set but not used s3c24x0_rtc.c:67:38: warning: variable 'a_mon' set but not used s3c24x0_rtc.c:67:30: warning: variable 'a_date' set but not used s3c24x0_rtc.c:67:22: warning: variable 'a_hour' set but not used s3c24x0_rtc.c:67:15: warning: variable 'a_min' set but not used s3c24x0_rtc.c:67:8: warning: variable 'a_sec' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | | drivers/video/bus_vcxk.c: Fix GCC 4.6 warningAnatolij Gustschin2011-11-16-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: bus_vcxk.c: In function 'vcxk_display_bitmap': bus_vcxk.c:396:16: warning: variable 'compression' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | | drivers/video/da8xx-fb.c: Fix GCC 4.6 warningAnatolij Gustschin2011-11-16-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: da8xx-fb.c: In function 'video_hw_init': da8xx-fb.c:688:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | | drivers/net/enc28j60.c: Fix GCC 4.6 warningsAnatolij Gustschin2011-11-16-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: enc28j60.c: In function 'enc_receive': enc28j60.c:435:5: warning: variable 'eir_reg' set but not used [-Wunused-but-set-variable] enc28j60.c: In function 'enc_poll': enc28j60.c:503:5: warning: variable 'estat_reg' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | | drivers/net/at91_emac.c: Fix GCC 4.6 warningAnatolij Gustschin2011-11-16-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: at91_emac.c: In function 'at91emac_write_hwaddr': at91_emac.c:477:15: warning: variable 'dev' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | | drivers/mtd/dataflash.c: Fix GCC 4.6 warningAnatolij Gustschin2011-11-16-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: dataflash.c: In function 'AT91F_DataflashInit': dataflash.c:42:6: warning: variable 'last_part' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | | drivers/spi/atmel_spi.c: Fix GCC 4.6 warningAnatolij Gustschin2011-11-16-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: atmel_spi.c: In function 'spi_xfer': atmel_spi.c:139:7: warning: variable 'ret' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | | sata_dwc.c: Fix GCC 4.6 build warningsStefan Roese2011-11-16-32/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: sata_dwc.c: In function 'sata_dwc_softreset': sata_dwc.c:444:5: warning: variable 'status' set but not used [-Wunused-but-set-variable] sata_dwc.c:443:6: warning: variable 'serror' set but not used [-Wunused-but-set-variable] sata_dwc.c: In function 'scan_sata': sata_dwc.c:654:16: warning: variable 'lba_desc' set but not used [-Wunused-but-set-variable] sata_dwc.c:538:16: warning: variable 'xfer_mask' set but not used [-Wunused-but-set-variable] sata_dwc.c: In function 'ata_dev_read_id': sata_dwc.c:747:14: warning: variable 'reason' set but not used [-Wunused-but-set-variable] sata_dwc.c: In function 'ata_dev_read_sectors': sata_dwc.c:1810:6: warning: variable 'rc' set but not used [-Wunused-but-set-variable] sata_dwc.c: In function 'ata_dev_write_sectors': sata_dwc.c:1994:6: warning: variable 'rc' set but not used [-Wunused-but-set-variable] Signed-off-by: Stefan Roese <sr@denx.de>
* | | 4xx_enet.c: Fix GCC 4.6 build warningsStefan Roese2011-11-16-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: 4xx_enet.c: In function 'ppc_4xx_eth_init': 4xx_enet.c:875:6: warning: variable 'ethgroup' set but not used [-Wunused-but-set-variable] I used "__maybe_unused" here intentionally, since all other alternatives to fix this compilation warning would result in more ifdef's. Signed-off-by: Stefan Roese <sr@denx.de>
* | | drivers/video/ct69000.c: Fix GC 4.6 build warningWolfgang Denk2011-11-16-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert custom debug code to use standard debug() facility. This also fixes these build warning: ct69000.c: In function 'FindAndSetPllParamIntoXrRegs': ct69000.c:706:28: warning: variable 'new_pixclock' set but not used [-Wunused-but-set-variable] Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
* | | drivers/block/sym53c8xx.c: Fix GCC 4.6 build warningWolfgang Denk2011-11-16-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: sym53c8xx.c: In function 'scsi_write_dsp': sym53c8xx.c:456:16: warning: variable 'val' set but not used [-Wunused-but-set-variable] Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | drivers/block/sata_sil3114.c: Fix GCC 4.6 build warningKumar Gala2011-11-16-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: sata_sil3114.c: In function 'scan_sata': sata_sil3114.c:793:7: warning: array subscript is above array bounds [-Warray-bounds] sata_sil3114.c:794:7: warning: array subscript is above array bounds [-Warray-bounds] sata_sil3114.c:795:39: warning: array subscript is above array bounds [-Warray-bounds] sata_sil3114.c:795:7: warning: array subscript is above array bounds [-Warray-bounds] sata_sil3114.c:797:7: warning: array subscript is above array bounds [-Warray-bounds] sata_sil3114.c:800:7: warning: array subscript is above array bounds [-Warray-bounds] sata_sil3114.c:801:7: warning: array subscript is above array bounds [-Warray-bounds] sata_sil3114.c:802:39: warning: array subscript is above array bounds [-Warray-bounds] sata_sil3114.c:802:7: warning: array subscript is above array bounds [-Warray-bounds] sata_sil3114.c:804:7: warning: array subscript is above array bounds [-Warray-bounds] Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | drivers/bios_emulator/x86emu/ops.c: Fix GCC 4.6 build warningKumar Gala2011-11-16-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: x86emu/ops.c: In function 'x86emuOp_int3': x86emu/ops.c:3521:9: warning: variable 'tmp' set but not used [-Wunused-but-set-variable] x86emu/ops.c: In function 'x86emuOp_int_IMM': x86emu/ops.c:3549:9: warning: variable 'tmp' set but not used [-Wunused-but-set-variable] x86emu/ops.c: In function 'x86emuOp_into': x86emu/ops.c:3579:9: warning: variable 'tmp' set but not used [-Wunused-but-set-variable] x86emu/ops.c: In function 'x86emuOp_aad': x86emu/ops.c:3993:8: warning: variable 'a' set but not used [-Wunused-but-set-variable] Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | drivers/block/ahci.c: Fix GCC 4.6 build warningKumar Gala2011-11-16-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: ahci.c: In function 'ata_scsiop_read10': ahci.c:564:6: warning: variable 'lba' set but not used [-Wunused-but-set-variable] Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | davinci, mmc: fix gcc 4.6 build warningsHeiko Schocher2011-11-16-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: davinci_mmc.c: In function 'dmmc_wait_fifo_status': davinci_mmc.c:72:7: warning: variable 'mmcstatus1' set but not used [-Wunused-but-set-variable] davinci_mmc.c: In function 'dmmc_busy_wait': davinci_mmc.c:89:7: warning: variable 'mmcstatus1' set but not used [-Wunused-but-set-variable] Delete the unused variable. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Sandeep Paulraj <s-paulraj@ti.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
* | | FPGA: drivers/fpga/ivm_core.c: GCC4.6 fix build warningsStefano Babic2011-11-16-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: ivm_core.c: In function 'ispVMLCOUNT': ivm_core.c:2105:16: warning: unused variable 'usByte' Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Wolfgang Denk <wd@denx.de>
* | | Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2011-11-16-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-video: api: export LCD device to external apps font: split font data from video_font.h tools: logo: split bmp arrays from bmp_logo.h lcd: add clear and draw bitmap declaration VIDEO: mx3fb: GCC4.6 fix build warnings Powerpc/DIU: Fixed the 800x600 and 1024x768 resolution bug
| * | | font: split font data from video_font.hChe-Liang Chiou2011-11-15-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While video_font.h is useful even without referencing the font data, it is not possible to be included multiple times because it defines font data array right in the header. This patch splits the font data array into video_font_data.h and so now video_font.h can be included multiple times. This at least solves the code duplication in board/mcc200/lcd.c. Signed-off-by: Che-Liang Chiou <clchiou@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
| * | | tools: logo: split bmp arrays from bmp_logo.hChe-Liang Chiou2011-11-15-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generated header bmp_logo.h is useful even outside common/lcd.c for the logo dimension. However, the problem is, the generated bmp_logo.h cannot be included multiple times because bmp_logo_palette[] and bmp_logo_bitmap[] are defined in the bmp_logo.h. This patch fixes this by defining these arrays in another header bmp_logo_data.h and in bmp_logo.h only declaring these arrays. Signed-off-by: Che-Liang Chiou <clchiou@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * | | VIDEO: mx3fb: GCC4.6 fix build warningsStefano Babic2011-11-10-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: mx3fb.c: In function 'video_hw_init': mx3fb.c:827:30: warning: variable 'vesa_idx' set but not used Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Anatolij Gustschin <agust@denx.de>
| * | | Powerpc/DIU: Fixed the 800x600 and 1024x768 resolution bugJerry Huang2011-11-10-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | When the resolution is set to 800x600 and 1024x768, but, the driver will use 1280x1024 resolution to set the DIU register Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> Acked-by: Timur Tabi <timur@freescale.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2011-11-16-309/+3393
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-arm: arm, davinci: add DAVINCI_MMC_CLKID arm, davinci_emac: fix driver bug if more then 3 PHYs are detected arm, davinci: da850/dm365 lowlevel cleanup omap5: Add omap5_evm board build support. omap4/5: Add support for booting with CH. omap5: emif: Add emif/ddr configurations required for omap5 evm omap5: clocks: Add clocks support for omap5 platform. omap5: Add minimal support for omap5430. omap: Checkpatch fixes omap4: make omap4 code common for future reuse GCC4.6: Squash warnings in onenand_base.c GCC4.6: Fix common/usb.c on xscale OneNAND: Add simple OneNAND SPL PXA: vpac270: Enable the new generic MMC driver PXA: Cleanup serial_pxa PXA: Drop csb226 and innokom boards (unmaintained) m28evk: Fix comment about the number of RAM banks mx31: Fix checkpatch warnings in generic.c mx31: Use proper IO accessor for GPR register mx31: Remove duplicate definition for GPR register qong: Use generic function for configuring GPR register M28EVK: Enable USB HOST support iMX28: Add USB HOST driver iMX28: Add USB and USB PHY register definitions M28: Add memory detection into SPL iMX28: Fix ARM vector handling M28: Add doc/README.m28 documentation M28: Add MMC SPL iMX28: Add support for DENX M28EVK board iMX28: Add u-boot.sb target to Makefile iMX28: Add image header generator tool iMX28: Add driver for internal RTC iMX28: Add GPMI NAND driver iMX28: Add APBH DMA driver iMX28: Add SPI driver iMX28: Add GPIO control iMX28: Add I2C bus driver iMX28: Add PINMUX control FEC: Add support for iMX28 quirks iMX28: Add SSP MMC driver iMX28: Initial support for iMX28 CPU MX25: zmx25: GCC4.6 fix build warnings da850: add new config file for AM18xx BeagleBoard: config: Switch to ttyO2 OMAP3: Change omap3_evm maintainer devkit8000: Fix NAND SPL on boards with 256MB NAND integrator: enable Vpp and disable flash protection integrator: add system controller header integrator: make flash writeable on boot integrator: use io-accessors for board init integrator: move text offset to config integrator: pass configs for core modules ARM: remove superfluous setting of arch_number in board specific code. SPL: Allow ARM926EJS to avoid compiling in the CPU support code integrator: do not test first part of the memory arm: a320: fix broken timer ARM: define CONFIG_MACH_TYPE for all ronetix boards dm646x: pass board revision info to kernel dm646x: add new configuration for dm6467T arm, davinci: Fix setting of the SDRAM configuration register arm, davinci: Remove the duplication of LPSC functions arm, davinci: Rename AM1808 lowlevel functions to DA850 da8xxevm: fix build error ARM: re-add MACH_TYPE_XXXXXX for VCMA9 board and add CONFIG_MACH_TYPE
| * | | arm, davinci_emac: fix driver bug if more then 3 PHYs are detectedHeiko Schocher2011-11-15-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since commits: davinci: emac: add support for more than 1 PHYs 062fe7d332c28ede25626f448681e43d76bb312e davinci: remove obsolete macro CONFIG_EMAC_MDIO_PHY_NUM fb1d6332b5430b90a8fa8ebab709f33a60e9f816 I get following warning on the enbw_cmc board: Err: serial Net: 5 ETH PHY detected miiphy_register: non unique device name 'KSZ8873 @ 0x01' DaVinci-EMAC Hit any key to stop autoboot: 0 Also I see some debug printfs: => run load + emac_close + emac_ch_teardown - emac_ch_teardown + emac_ch_teardown - emac_ch_teardown - emac_close + emac_open - emac_open Using DaVinci-EMAC device reason is 062fe7d332c28ede25626f448681e43d76bb312e new define MAX_PHY. This is set to 3! I get on this board 5 active phys, so this leads in wrong memory writes ... so I changed: - define CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT to set the MAX_PHY value, add a description in README for the new CONFIG_SYS option. - print an error message if more then MAX_PHYs are detected. - fill the active_phy_addr array in a for loop with 0xff - changed printf() in debug_emac() Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Sandeep Paulraj <s-paulraj@ti.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Wolfgang Denk <wd@denx.de> Cc: Manjunath Hadli <manjunath.hadli@ti.com> Cc: Prabhakar Lad <prabhakar.csengg@gmail.com> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Tom Rini <tom.rini@gmail.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>