Merge branch 'master' into next

[u-boot] / include / configs / PLU405.h

diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 85e4611aa1cc10b06aee615d8ee5b4978ecc7649..5f5f1c76af39d37946ffc380f0abc5b74cf70959 100644 (file)
--- 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         */