* Add support for PPChameleon Eval Board

[u-boot] / include / asm-ppc / global_data.h

diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index 6a0261c90ab24bc24b864883d854452e4d3753a7..f17a764a1ab7f34caf3ea4d0416879bf35276870 100644 (file)
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -45,6 +45,10 @@ typedef      struct  global_data {
        unsigned long   cpm_clk;
        unsigned long   scc_clk;
        unsigned long   brg_clk;
+#endif
+#if defined(CONFIG_MPC5XXX)
+       unsigned long   ipb_clk;
+       unsigned long   pci_clk;
 #endif
        unsigned long   ram_size;       /* RAM size */
        unsigned long   reloc_off;      /* Relocation Offset */
@@ -56,7 +60,7 @@ typedef       struct  global_data {
        unsigned int    dp_alloc_base;
        unsigned int    dp_alloc_top;
 #endif
-#if defined(CONFIG_EVB64260)
+#if defined(CFG_GT_6426x)
        unsigned int    mirror_hack[16];
 #endif
 #if defined(CONFIG_SANDPOINT) ||  \
@@ -70,10 +74,9 @@ typedef      struct  global_data {
 #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
        unsigned long   fb_base;        /* Base address of framebuffer memory   */
 #endif
-#ifdef CONFIG_POST
+#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)
        unsigned long   post_log_word;  /* Record POST activities */
        unsigned long   post_init_f_time;  /* When post_init_f started */
-       unsigned long   post_hotkeys_latch; /* If the post hotkeys pressed */
 #endif
 #ifdef CONFIG_BOARD_TYPES
        unsigned long   board_type;
@@ -85,6 +88,7 @@ typedef       struct  global_data {
 #ifdef CONFIG_LWMON
        unsigned long kbd_status;
 #endif
+       void            **jt;           /* jump table */
 } gd_t;
 
 /*
@@ -94,7 +98,7 @@ typedef       struct  global_data {
 #define        GD_FLG_DEVINIT  0x00002         /* Devices have been initialized        */
 
 #if 1
-#define DECLARE_GLOBAL_DATA_PTR     register gd_t *gd asm ("r29")
+#define DECLARE_GLOBAL_DATA_PTR     register volatile gd_t *gd asm ("r29")
 #else /* We could use plain global data, but the resulting code is bigger */
 #define XTRN_DECLARE_GLOBAL_DATA_PTR   extern
 #define DECLARE_GLOBAL_DATA_PTR     XTRN_DECLARE_GLOBAL_DATA_PTR \