platform/kernel/u-boot.git
8 years agoaltera_tse: change ioremap to map_physmem
Thomas Chou [Sat, 14 Nov 2015 03:21:16 +0000 (11:21 +0800)]
altera_tse: change ioremap to map_physmem

Change ioremap() to map_physmem(), as it is more used in u-boot.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Reviewed-by: Marek Vasut <marex@denx.de>
8 years agoaltera_sysid: change ioremap to map_physmem
Thomas Chou [Sat, 14 Nov 2015 03:18:52 +0000 (11:18 +0800)]
altera_sysid: change ioremap to map_physmem

Change ioremap() to map_physmem(), as it is more used in u-boot.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Reviewed-by: Marek Vasut <marex@denx.de>
8 years agoaltera_spi: change ioremap to map_physmem
Thomas Chou [Sat, 14 Nov 2015 03:17:25 +0000 (11:17 +0800)]
altera_spi: change ioremap to map_physmem

Change ioremap() to map_physmem(), as it is more used in u-boot.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Reviewed-by: Marek Vasut <marex@denx.de>
8 years agoaltera_timer: change ioremap to map_physmem
Thomas Chou [Sat, 14 Nov 2015 03:15:31 +0000 (11:15 +0800)]
altera_timer: change ioremap to map_physmem

Change ioremap() to map_physmem(), as it is more used in u-boot.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Reviewed-by: Marek Vasut <marex@denx.de>
8 years agoaltera_uart: change ioremap to map_physmem
Thomas Chou [Sat, 14 Nov 2015 02:38:09 +0000 (10:38 +0800)]
altera_uart: change ioremap to map_physmem

Change ioremap() to map_physmem(), as it is more used in u-boot.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Reviewed-by: Marek Vasut <marex@denx.de>
8 years agoaltera_jtag_uart: change ioremap to map_physmem
Thomas Chou [Sat, 14 Nov 2015 02:36:49 +0000 (10:36 +0800)]
altera_jtag_uart: change ioremap to map_physmem

Change ioremap() to map_physmem(), as it is more used in u-boot.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Reviewed-by: Marek Vasut <marex@denx.de>
8 years agoMerge git://git.denx.de/u-boot-marvell
Tom Rini [Tue, 17 Nov 2015 22:57:32 +0000 (17:57 -0500)]
Merge git://git.denx.de/u-boot-marvell

8 years agoarm: kirkwood: ib62x0: drop duplicate defines from CONFIG_SYS_MVFS
Luka Perkov [Sat, 31 Oct 2015 20:28:44 +0000 (21:28 +0100)]
arm: kirkwood: ib62x0: drop duplicate defines from CONFIG_SYS_MVFS

These options were already defined in mv-common.h file.

Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
8 years agoarm: kirkwood: ib62x0: drop dev CONFIG_OF_LIBFDT
Luka Perkov [Sat, 31 Oct 2015 20:23:51 +0000 (21:23 +0100)]
arm: kirkwood: ib62x0: drop dev CONFIG_OF_LIBFDT

It is already defined in included mv-common.h file.

Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
8 years agoarm: kirkwood: ib62x0: make use of defconfig
Luka Perkov [Sat, 31 Oct 2015 20:23:34 +0000 (21:23 +0100)]
arm: kirkwood: ib62x0: make use of defconfig

Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
8 years agoarm: kirkwood: ib62x0: drop CONFIG_CMD_ENV define
Luka Perkov [Sat, 31 Oct 2015 20:08:35 +0000 (21:08 +0100)]
arm: kirkwood: ib62x0: drop CONFIG_CMD_ENV define

The CONFIG_CMD_ENV is enabled by default so we can safely remove it.

Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
8 years agoarm: kirkwood: ib62x0: build u-boot.kwb
Luka Perkov [Sat, 31 Oct 2015 19:33:39 +0000 (20:33 +0100)]
arm: kirkwood: ib62x0: build u-boot.kwb

Avoid double typing in the shell and build u-boot.kwb when running "make" only.

Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
8 years agoarm: kirkwood: ib62x0: drop CONFIG_MACH_TYPE
Luka Perkov [Sat, 31 Oct 2015 19:32:04 +0000 (20:32 +0100)]
arm: kirkwood: ib62x0: drop CONFIG_MACH_TYPE

Mainline kernel for this device has only support for device tree. We can safely
drop this legacy code.

Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
8 years agoarm: kirkwood: Move common definitions into common file
Quentin Armitage [Wed, 28 Oct 2015 00:47:21 +0000 (00:47 +0000)]
arm: kirkwood: Move common definitions into common file

Create include/configs/mv-plug-common.h for common definitions
for Sheevaplug, Guruplug and Dreamplug. This will make it easier
to ensure the built u-boots stay in track with each other

Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
8 years agoarm: kirkwood: Remove duplicate definition from dreamplug.h
Quentin Armitage [Wed, 28 Oct 2015 00:47:20 +0000 (00:47 +0000)]
arm: kirkwood: Remove duplicate definition from dreamplug.h

CONFIG_DISPLAY_CPUINFO is already defined in mv-common.h

Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
8 years agoarm: kirkwood: Align configuration files
Quentin Armitage [Wed, 28 Oct 2015 00:47:19 +0000 (00:47 +0000)]
arm: kirkwood: Align configuration files

Cosmetic: CONFIG_OF_LIBFDT was in a different position in the config
file for the Dreamplug, compared to the Sheevaplug and Guruplug.

Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
8 years agoarm: kirkwood: Use common definition for filesystems
Quentin Armitage [Wed, 28 Oct 2015 00:47:18 +0000 (00:47 +0000)]
arm: kirkwood: Use common definition for filesystems

include/configs/mv-common.h brings in the required filesystems if
CONFIG_SYS_MVFS is defined, so use it for Sheevaplug and Guruplug.

Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
8 years agoarm: kirkwood: Move configuration of some commands to _defconfig files
Quentin Armitage [Wed, 28 Oct 2015 00:47:17 +0000 (00:47 +0000)]
arm: kirkwood: Move configuration of some commands to _defconfig files

For Marvell plugs, move the configuration of DHCP, NAND/SF, PING
and USB commands, and HUSH_PARSER into the _defconfig file, rather
than the include/configs/*plug.h files.

This avoids compiler warnings of duplicate definitions if the
option is selected in the .config, but also defined in the
include/configs/*plug.h file.

Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
8 years agoarm: kirkwood: Remove duplicate definition of CONFIG_CMD_FAT
Quentin Armitage [Wed, 28 Oct 2015 00:47:16 +0000 (00:47 +0000)]
arm: kirkwood: Remove duplicate definition of CONFIG_CMD_FAT

include/configs/guruplug.h defined CONFIG_CMD_FAT twice.

Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
8 years agoarm: kirkwood: standardise the configuration
Quentin Armitage [Wed, 28 Oct 2015 00:47:15 +0000 (00:47 +0000)]
arm: kirkwood: standardise the configuration

The Marvell plugs are very similar systems, and so it makes sense
for their u-boots to have the same commands/configuration.

Add EXT4 and MII to Dreamplug, DATE to Guruplug and Sheevaplug.
Add CONFIG_SYS_ALT_MEMTEST to Sheevaplug.
There are still command differences around NAND, SPI/NOR.

Also default to building u-boot.kwb for Sheevaplug and Guruplug.

Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
8 years agoarm: mvebu: Fix SAR1_CPU_CORE_MASK
Dirk Eibach [Wed, 28 Oct 2015 15:44:14 +0000 (16:44 +0100)]
arm: mvebu: Fix SAR1_CPU_CORE_MASK

SAR1_CPU_CORE_MASK was wrong, probably copy/paste
from another architecture.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Reviewed-by: Stefan Roese <sr@denx.de>
8 years agotools/kwbimage.c: Fix generation of binary header
Stefan Roese [Wed, 28 Oct 2015 06:53:58 +0000 (07:53 +0100)]
tools/kwbimage.c: Fix generation of binary header

The binary header ends with one lword, defining if another header
follows this one. This additions 4 bytes need to be taken into
account in the generation of the header size. And the complete
4 bytes at the end of this binary header need to get cleared.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Luka Perkov <luka.perkov@sartura.hr>
Cc: Kevin Smith <kevin.smith@elecsyscorp.com>
8 years agoarm: mvebu: a38x: serdes specification cleanup
Kevin Smith [Fri, 23 Oct 2015 17:53:19 +0000 (17:53 +0000)]
arm: mvebu: a38x: serdes specification cleanup

Instead of allocating space in the driver for the serdes
specification table, just allow the board file to set a pointer
to it.  Also, allow the board to only specify the lanes that are
used instead of including unused lanes.

Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Acked-by: Stefan Roese <sr@denx.de>
Cc: Dirk Eibach <eibach@gdsys.de>
Cc: Luka Perkov <luka.perkov@sartura.hr>
8 years agoarm: mvebu: a38x: Add const to some function calls
Kevin Smith [Fri, 23 Oct 2015 17:53:19 +0000 (17:53 +0000)]
arm: mvebu: a38x: Add const to some function calls

Functions that do not modify the pointer passed should declare it
as const.

Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Acked-by: Stefan Roese <sr@denx.de>
Cc: Dirk Eibach <eibach@gdsys.de>
Cc: Luka Perkov <luka.perkov@sartura.hr>
8 years agoarm: mvebu: a38x: Remove unsupported topologies
Kevin Smith [Fri, 23 Oct 2015 17:53:19 +0000 (17:53 +0000)]
arm: mvebu: a38x: Remove unsupported topologies

A lot of extra configuration information was left over in the
Marvell serdes and DDR3 initialization code for boards that
U-boot does not support.  Remove this extra config information,
and the concept of fixing up board topologies with information
loaded from an EEPROM.  If this needs to be done, it should be
handled in the board file, not in core code.

Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Acked-by: Stefan Roese <sr@denx.de>
Cc: Dirk Eibach <eibach@gdsys.de>
Cc: Luka Perkov <luka.perkov@sartura.hr>
8 years agoboard: axs10x switch serial port and Ethernet to driver model
Alexey Brodkin [Tue, 10 Nov 2015 16:16:25 +0000 (19:16 +0300)]
board: axs10x switch serial port and Ethernet to driver model

With this change Synopsys DesignWare SDP board is switched to driver
model for both serial port (serial_dw) and Ethernet (Designware GMAC).

This simplifies include/configs/axs101.h and allows for reuse of Linux's
Device Tree description.

For simplicity Linux's .dts files are not blindly copied but only very
few extracts of them are really used (those that are supported in U-Boot
at the moment).

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoarc: add empty asm/processor.h to satisfy compilation of USB code
Alexey Brodkin [Thu, 12 Nov 2015 21:45:20 +0000 (00:45 +0300)]
arc: add empty asm/processor.h to satisfy compilation of USB code

common/usb.c unconditionally includes <asm/processor.h>
And now to allow USB support on ARC boards we have to have that header.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
8 years agoarc: add stubs for map_physmem() and unmap_physmem()
Alexey Brodkin [Tue, 10 Nov 2015 08:13:42 +0000 (11:13 +0300)]
arc: add stubs for map_physmem() and unmap_physmem()

Up until now there was no need in those stubs.

But since following commit compilation of U-Boot on ARC is broken:
------------------------>8----------------------
commit 7861204c9af7fec1ea9b41541c272516235a6c93
Author: Stephen Warren <swarren@wwwdotorg.org>
Date:   Sat Oct 3 13:56:46 2015 -0600

    itest: make memory access work under sandbox

    itest accesses memory, and hence must map/unmap it. Without doing so, it
    accesses invalid addresses and crashes.

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
------------------------>8----------------------

That's because CMD_ITEST is enabled by default in common/Kconfig and now
map_physmem()/unmap_physmem() is used there.

So this patch adds missing stubs for ARC.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>
8 years agoPrepare v2016.01-rc1 v2016.01-rc1
Tom Rini [Tue, 17 Nov 2015 01:29:51 +0000 (20:29 -0500)]
Prepare v2016.01-rc1

Signed-off-by: Tom Rini <trini@konsulko.com>
8 years agotools/proftool: fix use-after-free
Vincent Stehlé [Wed, 7 Oct 2015 13:48:48 +0000 (15:48 +0200)]
tools/proftool: fix use-after-free

The read_trace_config() can dereference the line pointer after freeing
it on its error path. Avoid that.

This was found by Coverity Scan.

Signed-off-by: Vincent Stehlé <vincent.stehle@freescale.com>
Cc: Simon Glass <sjg@chromium.org>
8 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-imx
Tom Rini [Mon, 16 Nov 2015 13:35:38 +0000 (08:35 -0500)]
Merge branch 'master' of git://denx.de/git/u-boot-imx

8 years agoarm: mx6: cm-fx6: add splash locations to cm-fx6
Nikita Kiryanov [Thu, 29 Oct 2015 09:54:44 +0000 (11:54 +0200)]
arm: mx6: cm-fx6: add splash locations to cm-fx6

Add the following splash locations to cm-fx6:
* filesystem formatted mmc
* filesystem formatted usb
* filesystem formatted sata

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
8 years agosplash_source: add support for filesystem formatted sata
Nikita Kiryanov [Thu, 29 Oct 2015 09:54:43 +0000 (11:54 +0200)]
splash_source: add support for filesystem formatted sata

Add support for loading splashimage from filesystem formatted sata
storage.

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
8 years agosplash_source: add support for filesystem formatted usb
Nikita Kiryanov [Thu, 29 Oct 2015 09:54:42 +0000 (11:54 +0200)]
splash_source: add support for filesystem formatted usb

Add support for loading splash image from USB drive formatted with a
filesystem.

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
8 years agosplash_source: add support for filesystem formatted mmc
Nikita Kiryanov [Thu, 29 Oct 2015 09:54:41 +0000 (11:54 +0200)]
splash_source: add support for filesystem formatted mmc

Add support for loading splash image from an SD card formatted with
a filesystem. Update boards to maintain original behavior where needed.

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
8 years agosplash_source: rename *_read() to *_read_raw()
Nikita Kiryanov [Thu, 29 Oct 2015 09:54:40 +0000 (11:54 +0200)]
splash_source: rename *_read() to *_read_raw()

Rename raw read functions to *_read_raw() in preparation for supporting
read_fs() feature.

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
8 years agoMerge branch 'series1_v2' of git://git.denx.de/u-boot-sparc
Tom Rini [Fri, 13 Nov 2015 15:04:34 +0000 (10:04 -0500)]
Merge branch 'series1_v2' of git://git.denx.de/u-boot-sparc

8 years agoMerge branch 'master' of git://git.denx.de/u-boot-x86
Tom Rini [Fri, 13 Nov 2015 15:02:43 +0000 (10:02 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-x86

8 years agosf: Fix NULL pointer exception for flashes without lock methods
Bin Meng [Fri, 13 Nov 2015 10:46:26 +0000 (02:46 -0800)]
sf: Fix NULL pointer exception for flashes without lock methods

commit c3c016c "sf: Add SPI NOR protection mechanism" introduced
flash_lock()/flash_unlock()/flash_is_locked() methods for SPI flash,
but not every flash driver supplies these. We should test these
methods against NULL before actually calling them.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
8 years agox86: Remove CONFIG_SYS_EARLY_PCI_INIT
Bin Meng [Fri, 6 Nov 2015 10:04:55 +0000 (02:04 -0800)]
x86: Remove CONFIG_SYS_EARLY_PCI_INIT

CONFIG_SYS_EARLY_PCI_INIT is not needed any more since with driver
model, PCI enumeration is automatically triggered.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: Remove legacy pci codes
Bin Meng [Fri, 6 Nov 2015 10:04:54 +0000 (02:04 -0800)]
x86: Remove legacy pci codes

Now that we have converted all x86 boards to use driver model pci,
remove these legacy pci codes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: crownbay: Remove unused PCI region address macros
Bin Meng [Fri, 6 Nov 2015 10:04:53 +0000 (02:04 -0800)]
x86: crownbay: Remove unused PCI region address macros

These are leftover when converted to use driver model pci.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: qemu: Convert to use driver model eth
Bin Meng [Fri, 6 Nov 2015 10:04:52 +0000 (02:04 -0800)]
x86: qemu: Convert to use driver model eth

Move to driver model for ETH (e1000) on QEMU.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: qemu: Convert to use driver model usb
Bin Meng [Fri, 6 Nov 2015 10:04:51 +0000 (02:04 -0800)]
x86: qemu: Convert to use driver model usb

Move to driver model for USB on QEMU.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: qemu: Convert to use driver model pci
Bin Meng [Fri, 6 Nov 2015 10:04:50 +0000 (02:04 -0800)]
x86: qemu: Convert to use driver model pci

Move to driver model for pci on QEMU.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: qemu: Move chipset-specific codes from pci.c to qemu.c
Bin Meng [Fri, 6 Nov 2015 10:04:49 +0000 (02:04 -0800)]
x86: qemu: Move chipset-specific codes from pci.c to qemu.c

Move chipset-specific codes such as PAM init, PCIe ECAM and MP table
from pci.c to qemu.c, to prepare for DM PCI conversion.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: qemu: Remove call to vgabios execution
Bin Meng [Fri, 6 Nov 2015 10:04:48 +0000 (02:04 -0800)]
x86: qemu: Remove call to vgabios execution

The call to pci_run_vga_bios() is not needed as this is handled
in the vesa_fb driver.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: Move timer_init() call a bit earlier
Bin Meng [Fri, 23 Oct 2015 02:13:33 +0000 (19:13 -0700)]
x86: Move timer_init() call a bit earlier

Currently timer_init() is called in board_r.c which is quite late.
Some vgabios execution requires we set up the i8254 timer correctly,
but video initialization comes before timer_init(). Move the call
to board_f.c.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: queensbay: Really disable IGD
Bin Meng [Fri, 23 Oct 2015 02:13:32 +0000 (19:13 -0700)]
x86: queensbay: Really disable IGD

According to Atom E6xx datasheet, setting VGA Disable (bit17)
of Graphics Controller register (offset 0x50) prevents IGD
(D2:F0) from reporting itself as a VGA display controller
class in the PCI configuration space, and should also prevent
it from responding to VGA legacy memory range and I/O addresses.

However test result shows that with just VGA Disable bit set and
a PCIe graphics card connected to one of the PCIe controllers on
the E6xx, accessing the VGA legacy space still causes system hang.
After a number of attempts, it turns out besides VGA Disable bit,
the SDVO (D3:F0) device should be disabled to make it work.

To simplify, use the Function Disable register (offset 0xc4)
to disable both IGD (D2:F0) and SDVO (D3:F0) devices. Now these
two devices will be completely disabled (invisible in the PCI
configuration space) unless a system reset is performed.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: Move CONFIG_8259_PIC and CONFIG_8254_TIMER to Kconfig
Bin Meng [Fri, 23 Oct 2015 02:13:31 +0000 (19:13 -0700)]
x86: Move CONFIG_8259_PIC and CONFIG_8254_TIMER to Kconfig

Add Kconfig options for 8259 and 8254.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: Rename pcat_ to i8254 and i8259 accordingly
Bin Meng [Fri, 23 Oct 2015 02:13:30 +0000 (19:13 -0700)]
x86: Rename pcat_ to i8254 and i8259 accordingly

Rename pcat_timer.c to i8254.c and pcat_interrupts.c to i8259.c,
to match their header file names (i8254.h and i8259.h).

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: Initialize i8254 timer counter 1
Bin Meng [Fri, 23 Oct 2015 02:13:29 +0000 (19:13 -0700)]
x86: Initialize i8254 timer counter 1

Initialize counter 1, used to refresh request signal. This is
required for legacy purpose as some codes like vgabios utilizes
counter 1 to provide delay functionality.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: Fix cosmetic issues in the i8254 and i8259 codes
Bin Meng [Fri, 23 Oct 2015 02:13:28 +0000 (19:13 -0700)]
x86: Fix cosmetic issues in the i8254 and i8259 codes

This cleans up i8254 and i8259 codes to fix several cosmetic
issues, like coding convention and some comments improvement.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: Remove dead codes wrapped by PARANOID_IRQ_TRIGGERS
Bin Meng [Fri, 23 Oct 2015 02:13:27 +0000 (19:13 -0700)]
x86: Remove dead codes wrapped by PARANOID_IRQ_TRIGGERS

PARANOID_IRQ_TRIGGERS is not referenced anywhere in U-Boot.
Remove these dead codes wrapped by it.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agox86: Rename CONFIG_SYS_NUM_IRQS to SYS_NUM_IRQS
Bin Meng [Fri, 23 Oct 2015 02:13:26 +0000 (19:13 -0700)]
x86: Rename CONFIG_SYS_NUM_IRQS to SYS_NUM_IRQS

CONFIG_SYS_NUM_IRQS is actually not something we can configure,
but an architecture defined number of ISA IRQs. Move it from
x86-common.h to asm/interrupt.h and rename it to SYS_NUM_IRQS.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
8 years agoimx6: fix warnings due to switch to distro environment
Stefano Babic [Fri, 13 Nov 2015 09:49:01 +0000 (10:49 +0100)]
imx6: fix warnings due to switch to distro environment

wandboard and mx6cuboxi have warnings because BOOT_DELAY
is defined twice.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Vagrant Cascadian <vagrant@debian.org>
CC: Otavio Salvador <otavio@ossystems.com.br>
CC: Fabio Estevam <fabio.estevam@freescale.com>
8 years agosparc: leon3: Add debug_uart support to LEON3 serial driver.
Francois Retief [Thu, 29 Oct 2015 10:55:34 +0000 (12:55 +0200)]
sparc: leon3: Add debug_uart support to LEON3 serial driver.

Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>
8 years agosparc: ambapp: Removed warning and unnecessary printout.
Daniel Hellstrom [Mon, 20 Sep 2010 08:00:49 +0000 (10:00 +0200)]
sparc: ambapp: Removed warning and unnecessary printout.

Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
8 years agosparc: leon3: Moved GRLIB core header files to common include/grlib directory
Daniel Hellstrom [Thu, 21 Jan 2010 15:09:37 +0000 (16:09 +0100)]
sparc: leon3: Moved GRLIB core header files to common include/grlib directory

Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
8 years agosparc: leon3: Added memory controller initialization using new AMBA PnP routines.
Daniel Hellstrom [Mon, 25 Jan 2010 08:56:08 +0000 (09:56 +0100)]
sparc: leon3: Added memory controller initialization using new AMBA PnP routines.

Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
8 years agosparc: Kconfig: Move the CMD_AMBAPP command to Kconfig
Francois Retief [Mon, 27 Oct 2014 11:39:03 +0000 (13:39 +0200)]
sparc: Kconfig: Move the CMD_AMBAPP command to Kconfig

Add an initr function in the board_r.c file for the AMBA Plug&Play
command. Add a Kconfig entry for the ambapp command and remove all
CONFIG_CMD_AMBAPP defines from the board configuration headers.

Add a Kconfig entry to display the AMBA Plug&Play information
on startup. This option is off by default. Remove relevent define
from board configuration headers.

Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>
8 years agosparc: leon3: Reimplemented AMBA Plug&Play scanning routines.
Daniel Hellstrom [Mon, 25 Jan 2010 08:54:51 +0000 (09:54 +0100)]
sparc: leon3: Reimplemented AMBA Plug&Play scanning routines.

Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
8 years agosparc: Update startup code to take PIC mode into account
Francois Retief [Wed, 28 Oct 2015 07:06:41 +0000 (09:06 +0200)]
sparc: Update startup code to take PIC mode into account

Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>
8 years agosparc: Update GRSIM board with memory settings for TSIM eval
Francois Retief [Tue, 4 Nov 2014 14:51:44 +0000 (16:51 +0200)]
sparc: Update GRSIM board with memory settings for TSIM eval

Update the GRSIM board with the memory settings for the evaluation
version of TSIM. This free version of TSIM is used for testing.

Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>
8 years agosparc: Update LEON serial drivers to use readl/writel macros
Francois Retief [Wed, 28 Oct 2015 08:35:12 +0000 (10:35 +0200)]
sparc: Update LEON serial drivers to use readl/writel macros

Update the LEON2/3 serial driver to make use of the readl and writel
macros as well as the WATCHDOG_RESET() macro.

Add readl/writel and friends to the asm/io.h file.

Introduce the gd->arch.uart variable to store register address.

Lastly, remove baudrate scaler macro variables from board config. It
is now calculated in the serial driver using the global data variable.

Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>
8 years agosparc: Add -mcpu= compiler flags for LEON2/LEON3
Francois Retief [Mon, 26 Oct 2015 10:27:15 +0000 (12:27 +0200)]
sparc: Add -mcpu= compiler flags for LEON2/LEON3

Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>
8 years agosparc: Update the maintainer for SPARC architecture
Francois Retief [Mon, 26 Oct 2015 10:32:25 +0000 (12:32 +0200)]
sparc: Update the maintainer for SPARC architecture

Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>
8 years agosparc: Fix broken files during license changes
Francois Retief [Sat, 24 Oct 2015 21:14:55 +0000 (23:14 +0200)]
sparc: Fix broken files during license changes

Fixes broken search and replaced license changes in
files cpu/leon3/start.S and include/asm/winmacro.h
from commit 1a4596601fd395f3afb8f82f3f840c5e00bdd57a

Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>
Series-to: u-boot
Series-cc: Tom Rini <trini@konsulko.com>
Series-version: 2
Cover-letter:
sparc: Updates to SPARC architecture in preperation for generic board

This patch series is a backlog of preparation work for upcomming
generic board changes.

I first want to get these reviewed and submitted to mainline before
sending out more patches.
END

8 years agoboard_init: Change the logic to setup malloc_base
Fabio Estevam [Thu, 12 Nov 2015 14:30:19 +0000 (12:30 -0200)]
board_init: Change the logic to setup malloc_base

Prior to commit 5ba534d247d418 ("arm: Switch 32-bit ARM to using generic
global_data setup") we used to have assembly code that configured the
malloc_base address.

Since this commit we use the board_init_f_mem() function in C to setup
malloc_base address.

In board_init_f_mem() there was a deliberate choice to support only
early malloc() or full malloc() in SPL, but not both.

Adapt this logic to allow both to be used, one after the other, in SPL.

This issue has been observed in a Congatec board, where we need to
retrieve the manufacturing information from the SPI NOR (the SPI API
calls malloc) prior to configuring the DRAM. In this case as malloc_base
was not configured we always see malloc to fail.

With this change we are able to use malloc in SPL prior to DRAM gets
initialized.

Also update the CONFIG_SYS_SPL_MALLOC_START entry in the README file.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
8 years agoMerge branch 'master' of git://git.denx.de/u-boot-tegra
Tom Rini [Thu, 12 Nov 2015 20:59:35 +0000 (15:59 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-tegra

8 years agoam43xx_evm: Add DFU support for qspi flash
Vignesh R [Thu, 22 Oct 2015 06:00:53 +0000 (11:30 +0530)]
am43xx_evm: Add DFU support for qspi flash

This adds support to update firmware on qspi flash present on
am437x-sk-evm and am43xx-epos-evm via DFU.

On device:
=> setenv dfu_alt_info ${dfu_alt_info_qspi}
=> dfu 0 sf 0:0

On host:
$ sudo dfu-util -l
$ sudo dfu-util -D u-boot.bin -a u-boot.bin

Signed-off-by: Vignesh R <vigneshr@ti.com>
8 years agospl: Add support for CONFIG_OF_EMBED=y
Michal Simek [Mon, 9 Nov 2015 09:45:07 +0000 (10:45 +0100)]
spl: Add support for CONFIG_OF_EMBED=y

CONFIG_OF_EMBED=y is the option which is here only for testing purpose
and shouldn't be enabled by default as is describe at:
"dts: Add a comment about CONFIG_OF_EMBED being for local use"
(sha1: 3d3f60cb7a6bb6c338e00a9769fa918a8536096c)

But still enabling this option locally shouldn't end up with compilation
error when you build SPL. This patch fix it.

Compilation error:
lib/built-in.o: In function `fdtdec_setup':
/mnt/disk/u-boot/lib/fdtdec.c:1246: undefined reference to
`__dtb_dt_begin'

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reported-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
8 years agoopenrisc: updating build tools naming convention
Guillaume REMBERT [Sun, 8 Nov 2015 14:37:15 +0000 (14:37 +0000)]
openrisc: updating build tools naming convention

Dear u-boot community,

I just made a small change on the openrisc-generic platform
configuration to take in account the new naming convention (or1k instead
of or32, so the build process gets fine).

Could you take care to review and approve the following patch, please?

Kind regards,

8 years agoFix trini email in the get_maintainer.pl script
Andy Fleming [Wed, 4 Nov 2015 21:55:27 +0000 (15:55 -0600)]
Fix trini email in the get_maintainer.pl script

Looks like one spot got missed. Probably due to the backslash.

Signed-off-by: Andy Fleming <afleming@gmail.com>
8 years agopengwyn: nand and ethernet fixes
Vincent BENOIT [Mon, 2 Nov 2015 17:50:23 +0000 (18:50 +0100)]
pengwyn: nand and ethernet fixes

-> Add National instrument ethernet transceiver configuration used (DP83848)
-> Change cpsw slave phy address
-> modify nand configuration to use the correct ECC and correct nand features

8 years agoblock: ahci: Remove dead code
Fabio Estevam [Sun, 1 Nov 2015 15:18:27 +0000 (13:18 -0200)]
block: ahci: Remove dead code

CONFIG_AHCI_SETFEATURES_XFER is not selected by any user, so delete
the dead code.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
8 years agocommon: Simplify get_clocks() #ifdef
Peng Fan [Fri, 30 Oct 2015 09:30:02 +0000 (17:30 +0800)]
common: Simplify get_clocks() #ifdef

get_clocks is wrapped by CONFIG_FSL_CLK and CONFIG_M68K in seperate
piece code. They can be merged into one snippet.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: "angelo@sysam.it" <angelo@sysam.it>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: "Andreas Bießmann" <andreas.devel@googlemail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Angelo Dureghello <angelo@sysam.it>
8 years agoconfigs: Use config_distro_defaults.h in ti_armv7_common.h
Matwey V. Kornilov [Thu, 29 Oct 2015 18:54:15 +0000 (21:54 +0300)]
configs: Use config_distro_defaults.h in ti_armv7_common.h

CONFIG_BOOTDELAY is defined in config_distro_defaults.h

Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>
[trini: Drop omap3_logic.h settings which were a warning and no longer
        correct usage].
Signed-off-by: Tom Rini <trini@konsulko.com>
8 years agoi2c: Fix pca953x endianess issue
Dirk Eibach [Thu, 29 Oct 2015 12:51:27 +0000 (13:51 +0100)]
i2c: Fix pca953x endianess issue

By reading 2 consecutive bytes from i2c to an u16 value
we have an endianess issue.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
8 years agoi2c: soft_i2c: Fix bus indizes
Dirk Eibach [Wed, 28 Oct 2015 10:46:39 +0000 (11:46 +0100)]
i2c: soft_i2c: Fix bus indizes

Since busses are sorted in alphabetical order, introducing more
than nine busses led to unexpected behaviour.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
8 years agoboard: gdsys: Enable osd on output only
Dirk Eibach [Wed, 28 Oct 2015 10:46:38 +0000 (11:46 +0100)]
board: gdsys: Enable osd on output only

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
8 years agoboard: gdsys: Add osdsize command
Dirk Eibach [Wed, 28 Oct 2015 10:46:37 +0000 (11:46 +0100)]
board: gdsys: Add osdsize command

osdsize adjusts the gdsys IHS osd dimensions in characters.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
8 years agohrcon: Add fan controllers
Dirk Eibach [Wed, 28 Oct 2015 10:46:36 +0000 (11:46 +0100)]
hrcon: Add fan controllers

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
8 years agohrcon: Add support for the DH variant
Dirk Eibach [Wed, 28 Oct 2015 10:46:35 +0000 (11:46 +0100)]
hrcon: Add support for the DH variant

hrcon DH(dual head) has two video outputs per FPGA.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
8 years agohrcon: Fix videoboard i2c setup
Dirk Eibach [Wed, 28 Oct 2015 10:46:34 +0000 (11:46 +0100)]
hrcon: Fix videoboard i2c setup

- i2c addresses for the videoboard port expanders were
  wrong.
- the fpga reset signal was not initialized.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
8 years agohrcon: Use generic ioep-fpga support
Dirk Eibach [Wed, 28 Oct 2015 10:46:33 +0000 (11:46 +0100)]
hrcon: Use generic ioep-fpga support

The strider platform moved some generic code into ioep-fpga.c.
Make use of that on hrcon platform.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
8 years agompc83xx: Add strider board
Dirk Eibach [Wed, 28 Oct 2015 10:46:32 +0000 (11:46 +0100)]
mpc83xx: Add strider board

The gdsys strider board is based on a Freescale MPC8308 SOC.
It boots from NOR-Flash, kernel and rootfs are stored on
SD-Card.

On board peripherals include:
- 1x 10/100 Mbit/s Ethernet (optional)
- Lattice ECP3 FPGA connected via eLBC

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
[trini: Drop setting CONFIG_SYS_GENERIC_BOARD, this is always true now]
Signed-off-by: Tom Rini <trini@konsulko.com>
8 years agohrcon: Remove CH7301 configuration
Dirk Eibach [Wed, 28 Oct 2015 10:46:31 +0000 (11:46 +0100)]
hrcon: Remove CH7301 configuration

hrcon has no CH7301 DVI-transmitter.
Probably not removed when copying from iocon.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
8 years agoiocon: reset FPGAs in last_stage_init()
Reinhard Pfau [Wed, 28 Oct 2015 10:46:30 +0000 (11:46 +0100)]
iocon: reset FPGAs in last_stage_init()

- Reset FPGAs in last_stage_init()

Signed-off-by: Reinhard Pfau <pfau@gdsys.de>
Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
8 years agocontrolcenterd: Disable sideband clocks
Dirk Eibach [Wed, 28 Oct 2015 10:46:29 +0000 (11:46 +0100)]
controlcenterd: Disable sideband clocks

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
8 years agodlvision-10g: Support displayport
Dirk Eibach [Wed, 28 Oct 2015 10:46:28 +0000 (11:46 +0100)]
dlvision-10g: Support displayport

Support dlvision-10g hardware with displayport output.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
8 years agoboard: gdsys: Consider DP501 limits on link training
Dirk Eibach [Wed, 28 Oct 2015 10:46:27 +0000 (11:46 +0100)]
board: gdsys: Consider DP501 limits on link training

DP501 only supports DP 1.1a.
Limit settings for link bandwidth and lane count to
values allowed by DP 1.1a.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
8 years agoboard: gdsys: Increase DP501 I2C retry interval
Dirk Eibach [Wed, 28 Oct 2015 10:46:26 +0000 (11:46 +0100)]
board: gdsys: Increase DP501 I2C retry interval

With Club 3D dual link adapter there are AUX-channel timeouts
when EDID is read. Increasing retry interval time to max (400us)
fixes this.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Reviewed-by: Heiko Schocher <hs@denx.de>
8 years agoboard: gdsys: Configure DP501 SPDIF input
Dirk Eibach [Wed, 28 Oct 2015 10:46:25 +0000 (11:46 +0100)]
board: gdsys: Configure DP501 SPDIF input

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Reviewed-by: Heiko Schocher <hs@denx.de>
8 years agoi2c: ihs_i2c: Fix hold_bus control
Dirk Eibach [Wed, 28 Oct 2015 10:46:24 +0000 (11:46 +0100)]
i2c: ihs_i2c: Fix hold_bus control

Bus has to be held for repeated start regardless of
read/write access.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Acked-by: Heiko Schocher <hs@denx.de>
8 years agoi2c: ihs_i2c: Use macro bestpractices
Dirk Eibach [Wed, 28 Oct 2015 10:46:23 +0000 (11:46 +0100)]
i2c: ihs_i2c: Use macro bestpractices

Reinhard Pfau complained that macros in ihs_i2c do not follow best practices.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Acked-by: Heiko Schocher <hs@denx.de>
8 years agoi2c: ihs_i2c: Dual channel support
Dirk Eibach [Wed, 28 Oct 2015 10:46:22 +0000 (11:46 +0100)]
i2c: ihs_i2c: Dual channel support

Support two i2c masters per FPGA.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Acked-by: Heiko Schocher <hs@denx.de>
8 years agodriver: net: Fix pointer conversion warnings for xilinx_zynqmp_ep
Prabhakar Kushwaha [Sun, 25 Oct 2015 07:48:54 +0000 (13:18 +0530)]
driver: net: Fix pointer conversion warnings for xilinx_zynqmp_ep

Fix below warnings happening for xilinx_zynqmp_ep_defconfig

drivers/net/zynq_gem.c: In function ‘zynq_gem_init’:
drivers/net/zynq_gem.c:330:7: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
      ((u32)(priv->rxbuffers) +
       ^
In file included from drivers/net/zynq_gem.c:19:0:
drivers/net/zynq_gem.c:336:10: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
   writel((u32)priv->rx_bd, &regs->rxqbase);
          ^
./arch/arm/include/asm/io.h:146:34: note: in definition of macro ‘writel’
 #define writel(v,c) ({ u32 __v = v; __iowmb(); __arch_putl(__v,c); __v; })
                                  ^
drivers/net/zynq_gem.c: In function ‘zynq_gem_send’:
drivers/net/zynq_gem.c:399:9: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
  writel((u32)priv->tx_bd, &regs->txqbase);
         ^
./arch/arm/include/asm/io.h:146:34: note: in definition of macro ‘writel’
 #define writel(v,c) ({ u32 __v = v; __iowmb(); __arch_putl(__v,c); __v; })
                                  ^
drivers/net/zynq_gem.c:404:22: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
  priv->tx_bd->addr = (u32)ptr;
                      ^
drivers/net/zynq_gem.c:409:9: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
  addr = (u32) ptr;
         ^
drivers/net/zynq_gem.c:414:9: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
  addr = (u32)priv->rxbuffers;
         ^
drivers/net/zynq_gem.c: In function ‘zynq_gem_recv’:
drivers/net/zynq_gem.c:454:31: warning: cast to pointer from integer
of different size [-Wint-to-pointer-cast]
   net_process_received_packet((u8 *)addr, frame_len);
                               ^
drivers/net/zynq_gem.c: In function ‘zynq_gem_initialize’:
drivers/net/zynq_gem.c:533:35: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
  priv->rx_bd = (struct emac_bd *)((u32)bd_space + BD_SEPRN_SPACE);
                                   ^
drivers/net/zynq_gem.c:533:16: warning: cast to pointer from integer
of different size [-Wint-to-pointer-cast]
  priv->rx_bd = (struct emac_bd *)((u32)bd_space + BD_SEPRN_SPACE);

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
8 years agodriver: usb: Fix pointer conversion warnings for hikey
Prabhakar Kushwaha [Sun, 25 Oct 2015 07:48:41 +0000 (13:18 +0530)]
driver: usb: Fix pointer conversion warnings for hikey

Fix below compilation warings happening for hikey_defconfig

drivers/usb/eth/smsc95xx.c:698:56: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
  debug("** %s(), len %d, buf %#x\n", __func__, length, (int)msg);
                                                        ^
include/common.h:109:26: note: in definition of macro ‘debug_cond’
    printf(pr_fmt(fmt), ##args); \
                          ^
drivers/usb/eth/smsc95xx.c:698:2: note: in expansion of macro ‘debug’
  debug("** %s(), len %d, buf %#x\n", __func__, length, (int)msg);
  ^
drivers/usb/eth/smsc95xx.c:718:2: warning: format ‘%u’ expects argument of
type ‘unsigned int’, but argument 2 has type ‘long unsigned int’ [-Wformat=]
  debug("Tx: len = %u, actual = %u, err = %d\n",
  ^
drivers/usb/eth/smsc95xx.c: In function ‘smsc95xx_recv’:
drivers/usb/eth/smsc95xx.c:802:19: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
   cur_buf_align = (int)buf_ptr - (int)recv_buf;
                   ^
drivers/usb/eth/smsc95xx.c:802:34: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
   cur_buf_align = (int)buf_ptr - (int)recv_buf;

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
8 years agodriver: dwmmc: Fix pointer conversion warnings for hikey
Prabhakar Kushwaha [Sun, 25 Oct 2015 07:48:25 +0000 (13:18 +0530)]
driver: dwmmc: Fix pointer conversion warnings for hikey

Fix below compilation warings happening for hikey_defconfig

drivers/mmc/dw_mmc.c: In function ‘dwmci_set_idma_desc’:
drivers/mmc/dw_mmc.c:43:20: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
  desc->next_addr = (unsigned int)desc + sizeof(struct dwmci_idmac);
                    ^
drivers/mmc/dw_mmc.c: In function ‘dwmci_prepare_data’:
drivers/mmc/dw_mmc.c:61:35: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
  dwmci_writel(host, DWMCI_DBADDR, (unsigned int)cur_idmac);
                                   ^
drivers/mmc/dw_mmc.c:73:9: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
         (u32)bounce_buffer + (i * PAGE_SIZE));
         ^
  CC      drivers/mmc/hi6220_dw_mmc.o
drivers/mmc/hi6220_dw_mmc.c: In function ‘hi6220_dwmci_add_port’:
drivers/mmc/hi6220_dw_mmc.c:51:17: warning: cast to pointer from integer
of different size [-Wint-to-pointer-cast]
  host->ioaddr = (void *)regbase;

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>