diff options
| author | Tom Rini <trini@ti.com> | 2015-01-22 09:51:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-22 09:51:18 -0500 |
| commit | 65afbbde6bd4429add8a644d8e2adbdbb812f7ec (patch) | |
| tree | 303a995164f8f91f59f2f0126f792a1155bb7932 /drivers | |
| parent | 4608f37918e5d93d6b2b6909b325a5e6fb0a2346 (diff) | |
| parent | 38cd2d9c9b6a252c413cb91fbc4496797e425dc2 (diff) | |
| download | u-boot-imx-65afbbde6bd4429add8a644d8e2adbdbb812f7ec.zip u-boot-imx-65afbbde6bd4429add8a644d8e2adbdbb812f7ec.tar.gz u-boot-imx-65afbbde6bd4429add8a644d8e2adbdbb812f7ec.tar.bz2 | |
Merge branch 'phys_t' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/zynq_sdhci.c | 4 | ||||
| -rw-r--r-- | drivers/net/xilinx_ll_temac.c | 2 | ||||
| -rw-r--r-- | drivers/net/zynq_gem.c | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index fdce2c2..7887f11 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -13,7 +13,7 @@ #include <sdhci.h> #include <asm/arch/sys_proto.h> -int zynq_sdhci_init(u32 regbase) +int zynq_sdhci_init(phys_addr_t regbase) { struct sdhci_host *host = NULL; @@ -40,7 +40,7 @@ int zynq_sdhci_of_init(const void *blob) { int offset = 0; u32 ret = 0; - u32 reg; + phys_addr_t reg; debug("ZYNQ SDHCI: Initialization\n"); diff --git a/drivers/net/xilinx_ll_temac.c b/drivers/net/xilinx_ll_temac.c index dab78d0..7cc8657 100644 --- a/drivers/net/xilinx_ll_temac.c +++ b/drivers/net/xilinx_ll_temac.c @@ -231,7 +231,7 @@ static int ll_temac_init(struct eth_device *dev, bd_t *bis) struct ll_temac *ll_temac = dev->priv; int ret; - printf("%s: Xilinx XPS LocalLink Tri-Mode Ether MAC #%d at 0x%08X.\n", + printf("%s: Xilinx XPS LocalLink Tri-Mode Ether MAC #%d at 0x%08lx.\n", dev->name, dev->index, dev->iobase); if (!ll_temac_setup_ctrl(dev)) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 3cadd23..430e228 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -489,7 +489,8 @@ static int zynq_gem_miiphy_write(const char *devname, uchar addr, return phywrite(dev, addr, reg, val); } -int zynq_gem_initialize(bd_t *bis, int base_addr, int phy_addr, u32 emio) +int zynq_gem_initialize(bd_t *bis, phys_addr_t base_addr, + int phy_addr, u32 emio) { struct eth_device *dev; struct zynq_gem_priv *priv; @@ -521,7 +522,7 @@ int zynq_gem_initialize(bd_t *bis, int base_addr, int phy_addr, u32 emio) priv->phyaddr = phy_addr; priv->emio = emio; - sprintf(dev->name, "Gem.%x", base_addr); + sprintf(dev->name, "Gem.%lx", base_addr); dev->iobase = base_addr; |