summaryrefslogtreecommitdiff
path: root/include/configs/xupv2p.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-05-09 22:18:58 +0200
committerWolfgang Denk <wd@denx.de>2008-05-09 22:18:58 +0200
commit356cd17cc289e2dac409d21607618650d6f388a5 (patch)
treefce11759308e036087dd5197f52d54a8d0602ae7 /include/configs/xupv2p.h
parentef2642625cbfb1c3695e3478d08ae515052a4950 (diff)
parent726c0f1e5f108dccea052965123b95837d2bd402 (diff)
downloadu-boot-imx-356cd17cc289e2dac409d21607618650d6f388a5.zip
u-boot-imx-356cd17cc289e2dac409d21607618650d6f388a5.tar.gz
u-boot-imx-356cd17cc289e2dac409d21607618650d6f388a5.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/master/
Diffstat (limited to 'include/configs/xupv2p.h')
-rw-r--r--include/configs/xupv2p.h21
1 files changed, 19 insertions, 2 deletions
diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
index 30fb303..c738567 100644
--- a/include/configs/xupv2p.h
+++ b/include/configs/xupv2p.h
@@ -63,9 +63,11 @@
/* ethernet */
#ifdef XILINX_EMAC_BASEADDR
#define CONFIG_XILINX_EMAC 1
+#define CFG_ENET
#else
#ifdef XILINX_EMACLITE_BASEADDR
#define CONFIG_XILINX_EMACLITE 1
+#define CFG_ENET
#endif
#endif
#undef ET_DEBUG
@@ -77,18 +79,28 @@
#endif
/* interrupt controller */
+#ifdef XILINX_INTC_BASEADDR
#define CFG_INTC_0 1
#define CFG_INTC_0_ADDR XILINX_INTC_BASEADDR
#define CFG_INTC_0_NUM XILINX_INTC_NUM_INTR_INPUTS
+#endif
/* timer */
+#ifdef XILINX_TIMER_BASEADDR
+#if (XILINX_TIMER_IRQ != -1)
#define CFG_TIMER_0 1
#define CFG_TIMER_0_ADDR XILINX_TIMER_BASEADDR
#define CFG_TIMER_0_IRQ XILINX_TIMER_IRQ
#define FREQUENCE XILINX_CLOCK_FREQ
#define CFG_TIMER_0_PRELOAD ( FREQUENCE/1000 )
+#endif
+#else
+#ifdef XILINX_CLOCK_FREQ
#define CONFIG_XILINX_CLOCK_FREQ XILINX_CLOCK_FREQ
-
+#else
+#error BAD CLOCK FREQ
+#endif
+#endif
/*
* memory layout - Example
* TEXT_BASE = 0x3600_0000;
@@ -162,7 +174,12 @@
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_CACHE
#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_PING
+
+#ifndef CFG_ENET
+ #undef CONFIG_CMD_NET
+#else
+ #define CONFIG_CMD_PING
+#endif
#ifdef XILINX_SYSACE_BASEADDR
#define CONFIG_CMD_EXT2