Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next

[platform/kernel/u-boot.git] / include / mpc83xx.h

diff --git a/include/mpc83xx.h b/include/mpc83xx.h
index 897ecd6..70a4de7 100644 (file)
--- a/include/mpc83xx.h
+++ b/include/mpc83xx.h
@@ -30,7 +30,9 @@
 
 /* IMMRBAR - Internal Memory Register Base Address
  */
+#ifndef CONFIG_DEFAULT_IMMR
 #define CONFIG_DEFAULT_IMMR            0xFF400000      /* Default IMMR base address */
+#endif
 #define IMMRBAR                                0x0000          /* Register offset to immr */
 #define IMMRBAR_BASE_ADDR              0xFFF00000      /* Base address mask */
 #define IMMRBAR_RES                    ~(IMMRBAR_BASE_ADDR)