Fix merge problems

[karo-tx-uboot.git] / include / asm-ppc / global_data.h

diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index b43dba3352f0b11de2e7bd53dc15f4c8e6a038f5..be2ce2477827965ccbbfe8eeb6b30e42232be425 100644 (file)
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -51,6 +51,9 @@ typedef       struct  global_data {
        unsigned long   cpm_clk;
        unsigned long   scc_clk;
        unsigned long   brg_clk;
+#ifdef CONFIG_PCI
+       unsigned long   pci_clk;
+#endif
 #endif
        unsigned long   mem_clk;
 #if defined(CONFIG_MPC83XX)
@@ -74,7 +77,6 @@ typedef       struct  global_data {
        u32 enc_clk;
        u32 lbiu_clk;
        u32 lclk_clk;
-       u32 ddr_clk;
        u32 pci_clk;
 #if defined(CONFIG_MPC837X)
        u32 pciexp1_clk;
@@ -84,7 +86,7 @@ typedef       struct  global_data {
        u32 sata_clk;
 #endif
 #if defined(CONFIG_MPC8360)
-       u32  ddr_sec_clk;
+       u32  mem_sec_clk;
 #endif /* CONFIG_MPC8360 */
 #endif
 #if defined(CONFIG_MPC83XX) || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
@@ -97,6 +99,9 @@ typedef       struct  global_data {
        uint mp_alloc_base;
        uint mp_alloc_top;
 #endif /* CONFIG_QE */
+#if defined(CONFIG_FSL_LAW)
+       u32 used_laws;
+#endif
 #if defined(CONFIG_MPC5xxx)
        unsigned long   ipb_clk;
        unsigned long   pci_clk;
@@ -114,7 +119,7 @@ typedef     struct  global_data {
        unsigned long   pev_clk;
        unsigned long   flb_clk;
 #endif
-       unsigned long   ram_size;       /* RAM size */
+       phys_size_t     ram_size;       /* RAM size */
        unsigned long   reloc_off;      /* Relocation Offset */
        unsigned long   reset_status;   /* reset status register at boot        */
        unsigned long   env_addr;       /* Address  of Environment struct       */
@@ -155,6 +160,9 @@ typedef     struct  global_data {
 #endif
 #if defined(CONFIG_LWMON) || defined(CONFIG_LWMON5)
        unsigned long kbd_status;
+#endif
+#if defined(CONFIG_WD_MAX_RATE)
+       unsigned long long wdt_last;    /* trace watch-dog triggering rate */
 #endif
        void            **jt;           /* jump table */
 } gd_t;
@@ -166,6 +174,8 @@ typedef     struct  global_data {
 #define        GD_FLG_DEVINIT  0x00002         /* Devices have been initialized        */
 #define        GD_FLG_SILENT   0x00004         /* Silent mode                          */
 #define        GD_FLG_POSTFAIL 0x00008         /* Critical POST test failed            */
+#define        GD_FLG_POSTSTOP 0x00010         /* POST seqeunce aborted                */
+#define        GD_FLG_LOGINIT  0x00020         /* Log Buffer has been initialized      */
 
 #if 1
 #define DECLARE_GLOBAL_DATA_PTR     register volatile gd_t *gd asm ("r2")