From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Simek Date: Thu, 13 Oct 2011 11:23:21 +0200 Subject: [U-Boot] [PATCH 1/3 v2] net: emaclite: Use unsigned long for baseaddr In-Reply-To: <1318497803-21874-1-git-send-email-monstr@monstr.eu> References: <1318497803-21874-1-git-send-email-monstr@monstr.eu> Message-ID: <1318497803-21874-2-git-send-email-monstr@monstr.eu> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Baseaddr should be unsigned long. Signed-off-by: Michal Simek --- v2: Fix merge confict - no function change --- drivers/net/xilinx_emaclite.c | 4 ++-- include/netdev.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index bb4fb01..ac3dae1 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -342,7 +342,7 @@ static int emaclite_recv(struct eth_device *dev) } -int xilinx_emaclite_initialize (bd_t *bis, int base_addr) +int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr) { struct eth_device *dev; struct xemaclite *emaclite; @@ -366,7 +366,7 @@ int xilinx_emaclite_initialize (bd_t *bis, int base_addr) emaclite->rxpp = 1; #endif - sprintf(dev->name, "Xelite.%x", base_addr); + sprintf(dev->name, "Xelite.%lx", base_addr); dev->iobase = base_addr; dev->init = emaclite_init; diff --git a/include/netdev.h b/include/netdev.h index 669f60b..a624677 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -97,7 +97,7 @@ int uli526x_initialize(bd_t *bis); int armada100_fec_register(unsigned long base_addr); int xilinx_axiemac_initialize(bd_t *bis, unsigned long base_addr, unsigned long dma_addr); -int xilinx_emaclite_initialize (bd_t *bis, int base_addr); +int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr); /* Boards with PCI network controllers can call this from their board_eth_init() * function to initialize whatever's on board. -- 1.7.5.4