summaryrefslogtreecommitdiffstats
path: root/include/configs/PLU405.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-12-05 02:11:59 +0100
committerWolfgang Denk <wd@denx.de>2009-12-05 02:11:59 +0100
commit2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70 (patch)
treee19b3def6c8f41f56cdb5e8b71aa53d8f72f5812 /include/configs/PLU405.h
parentcd514aeb996e2f7aefbe1f78481965d9d074aed4 (diff)
parentf68ab43de67f59925542efb6bcec30f4a84fe695 (diff)
downloadblackbird-obmc-uboot-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.tar.gz
blackbird-obmc-uboot-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.zip
Merge branch 'master' into next
Conflicts: board/esd/plu405/plu405.c drivers/rtc/ftrtc010.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/PLU405.h')
-rw-r--r--include/configs/PLU405.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 85e4611aa1..5f5f1c76af 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -298,7 +298,8 @@
/*
* External Bus Controller (EBC) Setup
*/
-#define CAN_BA 0xF0000000 /* CAN Base Address */
+#define CAN0_BA 0xF0000000 /* CAN0 Base Address */
+#define CAN1_BA 0xF0000100 /* CAN1 Base Address */
#define DUART0_BA 0xF0000400 /* DUART Base Address */
#define DUART1_BA 0xF0000408 /* DUART Base Address */
#define RTC_BA 0xF0000500 /* RTC Base Address */
OpenPOWER on IntegriCloud