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

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

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 944f58195cafb767672b9c6a360c6c96912b5181..0fd4900392be58b9da2be98461ac403a81aeb4e8 100644 (file)
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2012 The Chromium OS Authors.
  * (C) Copyright 2002-2010
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __ASM_GENERIC_GBL_DATA_H
@@ -36,7 +35,7 @@ typedef struct global_data {
 #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
        unsigned long fb_base;          /* Base address of framebuffer mem */
 #endif
-#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)
+#if defined(CONFIG_POST)
        unsigned long post_log_word;    /* Record POST activities */
        unsigned long post_log_res;     /* success of POST test */
        unsigned long post_init_f_time; /* When post_init_f started */
@@ -50,7 +49,10 @@ typedef struct global_data {
 #endif
        unsigned long env_addr;         /* Address  of Environment struct */
        unsigned long env_valid;        /* Environment valid? enum env_valid */
+       unsigned long env_has_init;     /* Bitmask of boolean of struct env_location offsets */
+       int env_load_location;
 
+       unsigned long ram_base;         /* Base address of RAM used by U-Boot */
        unsigned long ram_top;          /* Top address of RAM used by U-Boot */
        unsigned long relocaddr;        /* Start address of U-Boot in RAM */
        phys_size_t ram_size;           /* RAM size */
@@ -114,6 +116,12 @@ typedef struct global_data {
        struct bootstage_data *bootstage;       /* Bootstage information */
        struct bootstage_data *new_bootstage;   /* Relocated bootstage info */
 #endif
+#ifdef CONFIG_LOG
+       int log_drop_count;             /* Number of dropped log messages */
+       int default_log_level;          /* For devices with no filters */
+       struct list_head log_head;      /* List of struct log_device */
+       int log_fmt;                    /* Mask containing log format info */
+#endif
 } gd_t;
 #endif
 
@@ -141,5 +149,6 @@ typedef struct global_data {
 #define GD_FLG_RECORD          0x01000 /* Record console                  */
 #define GD_FLG_ENV_DEFAULT     0x02000 /* Default variable flag           */
 #define GD_FLG_SPL_EARLY_INIT  0x04000 /* Early SPL init is done          */
+#define GD_FLG_LOG_READY       0x08000 /* Log system is ready for use     */
 
 #endif /* __ASM_GENERIC_GBL_DATA_H */