global: Migrate CONFIG_STACKBASE to CFG

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

diff --git a/include/post.h b/include/post.h
index 08a771e..e68d5c8 100644 (file)
--- a/include/post.h
+++ b/include/post.h
@@ -16,23 +16,18 @@
 
 #if defined(CONFIG_POST)
 
-#ifndef CONFIG_POST_EXTERNAL_WORD_FUNCS
+#ifndef CFG_POST_EXTERNAL_WORD_FUNCS
 #ifdef CONFIG_SYS_POST_WORD_ADDR
 #define _POST_WORD_ADDR        CONFIG_SYS_POST_WORD_ADDR
 #else
 
-#if defined(CONFIG_MPC8360)
+#if defined(CONFIG_ARCH_MPC8360)
 #include <linux/immap_qe.h>
 #define _POST_WORD_ADDR        (CONFIG_SYS_IMMR + CPM_POST_WORD_ADDR)
 
 #elif defined (CONFIG_MPC85xx)
 #include <asm/immap_85xx.h>
-#define _POST_WORD_ADDR        (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_PIC_OFFSET + \
-                               offsetof(ccsr_pic_t, tfrr))
-
-#elif defined (CONFIG_MPC86xx)
-#include <asm/immap_86xx.h>
-#define _POST_WORD_ADDR        (CONFIG_SYS_IMMR + CONFIG_SYS_MPC86xx_PIC_OFFSET + \
+#define _POST_WORD_ADDR        (CONFIG_SYS_IMMR + CFG_SYS_MPC85xx_PIC_OFFSET + \
                                offsetof(ccsr_pic_t, tfrr))
 #endif
 
@@ -56,7 +51,7 @@ static inline void post_word_store (ulong value)
 extern ulong post_word_load(void);
 extern void post_word_store(ulong value);
 
-#endif /* CONFIG_POST_EXTERNAL_WORD_FUNCS */
+#endif /* CFG_POST_EXTERNAL_WORD_FUNCS */
 #endif /* defined (CONFIG_POST) */
 #endif /* __ASSEMBLY__ */
 
@@ -107,7 +102,6 @@ int post_init_f (void);
 void post_bootmode_init (void);
 int post_bootmode_get (unsigned int * last_test);
 void post_bootmode_clear (void);
-void post_output_backlog ( void );
 int post_run (char *name, int flags);
 int post_info (char *name);
 int post_log (char *format, ...);
@@ -116,6 +110,16 @@ void post_reloc (void);
 #endif
 unsigned long post_time_ms (unsigned long base);
 
+/**
+ * post_output_backlog() - Print POST results
+ *
+ * Print POST results during the generic board init sequence, after
+ * relocation.
+ *
+ * Return: 0 if OK
+ */
+int post_output_backlog(void);
+
 extern struct post_test post_list[];
 extern unsigned int post_list_size;
 extern int post_hotkeys_pressed(void);
@@ -138,7 +142,7 @@ extern int memory_post_test(int flags);
 
 #define CONFIG_SYS_POST_RTC            0x00000001
 #define CONFIG_SYS_POST_WATCHDOG       0x00000002
-#define CONFIG_SYS_POST_MEMORY         0x00000004
+#define CFG_SYS_POST_MEMORY            0x00000004
 #define CONFIG_SYS_POST_CPU            0x00000008
 #define CONFIG_SYS_POST_I2C            0x00000010
 #define CONFIG_SYS_POST_CACHE          0x00000020
@@ -159,7 +163,7 @@ extern int memory_post_test(int flags);
 #define CONFIG_SYS_POST_CODEC          0x00200000
 #define CONFIG_SYS_POST_COPROC         0x00400000
 #define CONFIG_SYS_POST_FLASH          0x00800000
-#define CONFIG_SYS_POST_MEM_REGIONS    0x01000000
+#define CFG_SYS_POST_MEM_REGIONS       0x01000000
 
 #endif /* CONFIG_POST */