summaryrefslogtreecommitdiff
path: root/board/xilinx/zynq
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2013-04-12 16:33:08 +0200
committerMichal Simek <michal.simek@xilinx.com>2013-04-30 11:39:21 +0200
commit7193653e8dddf8f232c19e16a4ca3c5052c71f09 (patch)
treebec4c407922fe615758386803fa27080f3a132bf /board/xilinx/zynq
parent80243528efa5e17db60328005344bb8a5e8e8076 (diff)
downloadu-boot-imx-7193653e8dddf8f232c19e16a4ca3c5052c71f09.zip
u-boot-imx-7193653e8dddf8f232c19e16a4ca3c5052c71f09.tar.gz
u-boot-imx-7193653e8dddf8f232c19e16a4ca3c5052c71f09.tar.bz2
zynq: Move macros to hardware.h
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>
Diffstat (limited to 'board/xilinx/zynq')
-rw-r--r--board/xilinx/zynq/board.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 8ed75c3..3af18f0 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -22,6 +22,8 @@
#include <common.h>
#include <netdev.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/sys_proto.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -38,10 +40,14 @@ int board_eth_init(bd_t *bis)
{
u32 ret = 0;
-#if defined(CONFIG_ZYNQ_GEM) && defined(CONFIG_ZYNQ_GEM_BASEADDR0)
- ret = zynq_gem_initialize(bis, CONFIG_ZYNQ_GEM_BASEADDR0);
+#if defined(CONFIG_ZYNQ_GEM)
+# 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
-
return ret;
}
#endif