summaryrefslogtreecommitdiff
path: root/include/asm-arm/global_data.h
diff options
context:
space:
mode:
authorMarkus Klotzbücher <Markus Klotzbümk@pollux.(none)>2006-02-08 18:56:28 +0100
committerMarkus Klotzbücher <mk@pollux.(none)>2006-02-08 18:56:28 +0100
commit9d803d8c0b7fd9aeb2e708e9e48dd76d7287856d (patch)
treea66794d00685b3e1b12b2a99e2d0605ba9072a1b /include/asm-arm/global_data.h
parentaf646e865f4bc67623ca957dfe3d3e4a95ff0468 (diff)
downloadu-boot-imx-9d803d8c0b7fd9aeb2e708e9e48dd76d7287856d.zip
u-boot-imx-9d803d8c0b7fd9aeb2e708e9e48dd76d7287856d.tar.gz
u-boot-imx-9d803d8c0b7fd9aeb2e708e9e48dd76d7287856d.tar.bz2
Changes:
* lots of bugfixes in the assembler code * reverted hardware.h back to original * enabled hardware DRAM calibration * GCC-4 fix: modified GLOBAL_DATA_POINTER macro
Diffstat (limited to 'include/asm-arm/global_data.h')
-rw-r--r--include/asm-arm/global_data.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-arm/global_data.h b/include/asm-arm/global_data.h
index c2d5291..b3c7084 100644
--- a/include/asm-arm/global_data.h
+++ b/include/asm-arm/global_data.h
@@ -61,6 +61,11 @@ typedef struct global_data {
#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */
#define GD_FLG_SILENT 0x00004 /* Silent mode */
-#define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r8")
+#define GCC_4_SCREW_GDP 1
+#ifdef GCC_4_SCREW_GDP
+# define DECLARE_GLOBAL_DATA_PTR register gd_t* volatile gd asm ("r8");
+#else
+# define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r8")
+#endif
#endif /* __ASM_GBL_DATA_H */