net: correct the description of ip_to_string()

[J-u-boot.git] / include / mpc85xx.h

diff --git a/include/mpc85xx.h b/include/mpc85xx.h
index a4d4d655266685385012a68c6c37a1c5fdcd5791..ff86c7c12e0c05918c3b60fd66b0abc2c3c99c0c 100644 (file)
--- a/include/mpc85xx.h
+++ b/include/mpc85xx.h
@@ -6,12 +6,7 @@
 #ifndef        __MPC85xx_H__
 #define __MPC85xx_H__
 
-#include <asm/fsl_lbc.h>
-
-/* define for common ppc_asm.tmpl */
-#define EXC_OFF_SYS_RESET      0x100   /* System reset */
-#define _START_OFFSET          0
-
+#include <config.h>
 #if defined(CONFIG_E500)
 #include <e500.h>
 #endif
@@ -28,4 +23,42 @@
 #define SCCR_DFBRG10    0x00000002      /* BRGCLK division by 64 */
 #define SCCR_DFBRG11    0x00000003      /* BRGCLK division by 256 */
 
+/*
+ * Define default values for some CCSR macros to make header files cleaner*
+ *
+ * To completely disable CCSR relocation in a board header file, define
+ * CONFIG_SPL_SYS_CCSR_DO_NOT_RELOCATE.  This will force CFG_SYS_CCSRBAR_PHYS
+ * to a value that is the same as CFG_SYS_CCSRBAR.
+ */
+
+#ifdef CFG_SYS_CCSRBAR_PHYS
+#error "Do not define CFG_SYS_CCSRBAR_PHYS directly.  Use \
+CFG_SYS_CCSRBAR_PHYS_LOW and/or CFG_SYS_CCSRBAR_PHYS_HIGH instead."
+#endif
+
+#if CONFIG_IS_ENABLED(SYS_CCSR_DO_NOT_RELOCATE)
+#undef CFG_SYS_CCSRBAR_PHYS_HIGH
+#undef CFG_SYS_CCSRBAR_PHYS_LOW
+#define CFG_SYS_CCSRBAR_PHYS_HIGH      0
+#endif
+
+#ifndef CFG_SYS_CCSRBAR
+#define CFG_SYS_CCSRBAR                CONFIG_SYS_CCSRBAR_DEFAULT
+#endif
+
+#ifndef CFG_SYS_CCSRBAR_PHYS_HIGH
+#ifdef CONFIG_PHYS_64BIT
+#define CFG_SYS_CCSRBAR_PHYS_HIGH      0xf
+#else
+#define CFG_SYS_CCSRBAR_PHYS_HIGH      0
+#endif
+#endif
+
+#ifndef CFG_SYS_CCSRBAR_PHYS_LOW
+#define CFG_SYS_CCSRBAR_PHYS_LOW       CONFIG_SYS_CCSRBAR_DEFAULT
+#endif
+
+#define CFG_SYS_CCSRBAR_PHYS ((CFG_SYS_CCSRBAR_PHYS_HIGH * 1ull) << 32 | \
+                                CFG_SYS_CCSRBAR_PHYS_LOW)
+
 #endif /* __MPC85xx_H__ */