Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / include / post.h

diff --git a/include/post.h b/include/post.h
index 123623f5c85981cf465262916252303f0b47d3af..9fcd3cec2f6169bb2c43a12373d42de00cbb74c8 100644 (file)
--- a/include/post.h
+++ b/include/post.h
@@ -73,37 +73,52 @@ void post_output_backlog ( void );
 int post_run (char *name, int flags);
 int post_info (char *name);
 int post_log (char *format, ...);
+#ifndef CONFIG_RELOC_FIXUP_WORKS
 void post_reloc (void);
+#endif
 unsigned long post_time_ms (unsigned long base);
 
 extern struct post_test post_list[];
 extern unsigned int post_list_size;
 extern int post_hotkeys_pressed(void);
 
+/*
+ *  If GCC is configured to use a version of GAS that supports
+ * the .gnu_attribute directive, it will use that directive to
+ * record certain properties of the output code.
+ *  This feature is new to GCC 4.3.0.
+ *  .gnu_attribute is new to GAS 2.18.
+ */
+#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 3)
+/* Tag_GNU_Power_ABI_FP/soft-float */
+#define GNU_FPOST_ATTR asm(".gnu_attribute     4, 2");
+#else
+#define GNU_FPOST_ATTR
+#endif /* __GNUC__ */
 #endif /* __ASSEMBLY__ */
 
-#define CFG_POST_RTC           0x00000001
-#define CFG_POST_WATCHDOG      0x00000002
-#define CFG_POST_MEMORY                0x00000004
-#define CFG_POST_CPU           0x00000008
-#define CFG_POST_I2C           0x00000010
-#define CFG_POST_CACHE         0x00000020
-#define CFG_POST_UART          0x00000040
-#define CFG_POST_ETHER         0x00000080
-#define CFG_POST_SPI           0x00000100
-#define CFG_POST_USB           0x00000200
-#define CFG_POST_SPR           0x00000400
-#define CFG_POST_SYSMON                0x00000800
-#define CFG_POST_DSP           0x00001000
-#define CFG_POST_OCM           0x00002000
-#define CFG_POST_FPU           0x00004000
-#define CFG_POST_ECC           0x00008000
-#define CFG_POST_BSPEC1                0x00010000
-#define CFG_POST_BSPEC2                0x00020000
-#define CFG_POST_BSPEC3                0x00040000
-#define CFG_POST_BSPEC4                0x00080000
-#define CFG_POST_BSPEC5                0x00100000
-#define CFG_POST_CODEC         0x00200000
+#define CONFIG_SYS_POST_RTC            0x00000001
+#define CONFIG_SYS_POST_WATCHDOG       0x00000002
+#define CONFIG_SYS_POST_MEMORY         0x00000004
+#define CONFIG_SYS_POST_CPU            0x00000008
+#define CONFIG_SYS_POST_I2C            0x00000010
+#define CONFIG_SYS_POST_CACHE          0x00000020
+#define CONFIG_SYS_POST_UART           0x00000040
+#define CONFIG_SYS_POST_ETHER          0x00000080
+#define CONFIG_SYS_POST_SPI            0x00000100
+#define CONFIG_SYS_POST_USB            0x00000200
+#define CONFIG_SYS_POST_SPR            0x00000400
+#define CONFIG_SYS_POST_SYSMON         0x00000800
+#define CONFIG_SYS_POST_DSP            0x00001000
+#define CONFIG_SYS_POST_OCM            0x00002000
+#define CONFIG_SYS_POST_FPU            0x00004000
+#define CONFIG_SYS_POST_ECC            0x00008000
+#define CONFIG_SYS_POST_BSPEC1         0x00010000
+#define CONFIG_SYS_POST_BSPEC2         0x00020000
+#define CONFIG_SYS_POST_BSPEC3         0x00040000
+#define CONFIG_SYS_POST_BSPEC4         0x00080000
+#define CONFIG_SYS_POST_BSPEC5         0x00100000
+#define CONFIG_SYS_POST_CODEC          0x00200000
 
 #endif /* CONFIG_POST */