Using the same naming convention for CCSR register addresses between the
83xx, 85xx, and 86xx platforms makes it a bit easier to share code
between them.

A small amount of asthetic cleanup was also done in this change.

Signed-off-by: Peter Tyser <pty...@xes-inc.com>
---
 include/asm-ppc/immap_83xx.h |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/include/asm-ppc/immap_83xx.h b/include/asm-ppc/immap_83xx.h
index c60a7d2..a9d0698 100644
--- a/include/asm-ppc/immap_83xx.h
+++ b/include/asm-ppc/immap_83xx.h
@@ -858,14 +858,22 @@ typedef struct immap {
 } immap_t;
 #endif
 
-#define CONFIG_SYS_MPC83xx_DMA_OFFSET  (0x8000)
-#define CONFIG_SYS_MPC83xx_DMA_ADDR    (CONFIG_SYS_IMMR + 
CONFIG_SYS_MPC83xx_DMA_OFFSET)
-#define CONFIG_SYS_MPC83xx_ESDHC_OFFSET        (0x2e000)
-#define CONFIG_SYS_MPC83xx_ESDHC_ADDR  (CONFIG_SYS_IMMR + 
CONFIG_SYS_MPC83xx_ESDHC_OFFSET)
-
+#define CONFIG_SYS_MPC83xx_DDR_OFFSET  0x2000
+#define CONFIG_SYS_MPC83xx_DMA_OFFSET  0x8000
+#define CONFIG_SYS_MPC83xx_DDR2_OFFSET 0xd000
 #ifndef CONFIG_SYS_MPC83xx_USB_OFFSET
-#define CONFIG_SYS_MPC83xx_USB_OFFSET  0x23000
+#define CONFIG_SYS_MPC83xx_USB_OFFSET  0x23000
 #endif
+#define CONFIG_SYS_MPC83xx_ESDHC_OFFSET        0x2e000
+
+#define CONFIG_SYS_MPC83xx_DDR_ADDR \
+       (CONFIG_SYS_IMMR + CONFIG_SYS_MPC83xx_DDR_OFFSET)
+#define CONFIG_SYS_MPC83xx_DDR2_ADDR \
+       (CONFIG_SYS_IMMR + CONFIG_SYS_MPC83xx_DDR2_OFFSET)
+#define CONFIG_SYS_MPC83xx_DMA_ADDR \
+       (CONFIG_SYS_IMMR + CONFIG_SYS_MPC83xx_DMA_OFFSET)
+#define CONFIG_SYS_MPC83xx_ESDHC_ADDR \
+       (CONFIG_SYS_IMMR + CONFIG_SYS_MPC83xx_ESDHC_OFFSET)
 #define CONFIG_SYS_MPC83xx_USB_ADDR \
-                       (CONFIG_SYS_IMMR + CONFIG_SYS_MPC83xx_USB_OFFSET)
+       (CONFIG_SYS_IMMR + CONFIG_SYS_MPC83xx_USB_OFFSET)
 #endif                         /* __IMMAP_83xx__ */
-- 
1.6.2.1

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to