leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zynq: Move macros to hardware.h

Browse Source 
Add all fixed addresses to hardware.h and change petalinux
configuration to support this.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Tom Rini <trini@ti.com>
This commit is contained in:
Michal Simek 2013-04-12 16:33:08 +02:00
parent 80243528ef
commit 7193653e8d
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/arch-zynq/hardware.h
View File

@ -27,6 +27,8 @@
#define ZYNQ_DEV_CFG_APB_BASEADDR 0xF8007000 #define ZYNQ_DEV_CFG_APB_BASEADDR 0xF8007000
#define ZYNQ_SCU_BASEADDR 0xF8F00000 #define ZYNQ_SCU_BASEADDR 0xF8F00000
#define ZYNQ_SCUTIMER_BASEADDR 0xF8F00600 #define ZYNQ_SCUTIMER_BASEADDR 0xF8F00600
#define ZYNQ_GEM_BASEADDR0 0xE000B000
#define ZYNQ_GEM_BASEADDR1 0xE000C000
/* Reflect slcr offsets */ /* Reflect slcr offsets */
struct slcr_regs { struct slcr_regs {

12
board/xilinx/zynq/board.c
View File

@ -22,6 +22,8 @@
#include <common.h> #include <common.h>
#include <netdev.h> #include <netdev.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -38,10 +40,14 @@ int board_eth_init(bd_t *bis)
{ {
u32 ret = 0; u32 ret = 0;
#if defined(CONFIG_ZYNQ_GEM) && defined(CONFIG_ZYNQ_GEM_BASEADDR0) #if defined(CONFIG_ZYNQ_GEM)
ret = zynq_gem_initialize(bis, CONFIG_ZYNQ_GEM_BASEADDR0); # if defined(CONFIG_ZYNQ_GEM0)
ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR0);
# endif
# if defined(CONFIG_ZYNQ_GEM1)
ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR1);
# endif
#endif #endif
return ret; return ret;
} }
#endif #endif

2
include/configs/zynq.h
View File

@ -53,7 +53,7 @@
/* Ethernet driver */ /* Ethernet driver */
#define CONFIG_NET_MULTI #define CONFIG_NET_MULTI
#define CONFIG_ZYNQ_GEM #define CONFIG_ZYNQ_GEM
#define CONFIG_ZYNQ_GEM_BASEADDR0 0xE000B000 #define CONFIG_ZYNQ_GEM0
#if defined(CONFIG_ZYNQ_DCC) #if defined(CONFIG_ZYNQ_DCC)
# define CONFIG_ARM_DCC # define CONFIG_ARM_DCC