Convert CONFIG_SYS_I2C_LEGACY to Kconfig and add CONFIG_[ST]PL_SYS_I2C_LEGACY

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

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 19f7039..a4cf7fd 100644 (file)
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -23,6 +23,8 @@
 #include <fdtdec.h>
 #include <membuff.h>
 #include <linux/list.h>
+#include <linux/build_bug.h>
+#include <asm-offsets.h>
 
 struct acpi_ctx;
 struct driver_rt;
@@ -147,7 +149,7 @@ struct global_data {
        /**
         * @ram_top: top address of RAM used by U-Boot
         */
-       unsigned long ram_top;
+       phys_addr_t ram_top;
        /**
         * @relocaddr: start address of U-Boot in RAM
         *
@@ -184,12 +186,6 @@ struct global_data {
 
 #ifdef CONFIG_DM
        /**
-        * @dm_flags: additional flags for Driver Model
-        *
-        * See &enum gd_dm_flags
-        */
-       unsigned long dm_flags;
-       /**
         * @dm_root: root instance for Driver Model
         */
        struct udevice *dm_root;
@@ -198,19 +194,37 @@ struct global_data {
         */
        struct udevice *dm_root_f;
        /**
-        * @uclass_root: head of core tree
+        * @uclass_root_s:
+        * head of core tree when uclasses are not in read-only memory.
+        *
+        * When uclasses are in read-only memory, @uclass_root_s is not used and
+        * @uclass_root points to the root node generated by dtoc.
         */
        struct list_head uclass_root_s;
        /**
-        * @uclass_root: pointer to head of core tree, if uclasses are in
-        * read-only memory and cannot be adjusted to use @uclass_root as a
-        * list head.
+        * @uclass_root:
+        * pointer to head of core tree, if uclasses are in read-only memory and
+        * cannot be adjusted to use @uclass_root as a list head.
+        *
+        * When not in read-only memory, @uclass_root_s is used to hold the
+        * uclass root, and @uclass_root points to the address of
+        * @uclass_root_s.
         */
        struct list_head *uclass_root;
-# if CONFIG_IS_ENABLED(OF_PLATDATA)
+# if CONFIG_IS_ENABLED(OF_PLATDATA_DRIVER_RT)
        /** @dm_driver_rt: Dynamic info about the driver */
        struct driver_rt *dm_driver_rt;
 # endif
+#if CONFIG_IS_ENABLED(OF_PLATDATA_RT)
+       /** @dm_udevice_rt: Dynamic info about the udevice */
+       struct udevice_rt *dm_udevice_rt;
+       /**
+        * @dm_priv_base: Base address of the priv/plat region used when
+        * udevices and uclasses are in read-only memory. This is NULL if not
+        * used
+        */
+       void *dm_priv_base;
+# endif
 #endif
 #ifdef CONFIG_TIMER
        /**
@@ -263,7 +277,7 @@ struct global_data {
         */
        void *trace_buff;
 #endif
-#if defined(CONFIG_SYS_I2C)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
        /**
         * @cur_i2c_bus: currently used I2C bus
         */
@@ -402,6 +416,12 @@ struct global_data {
         * This value is used as logging level for continuation messages.
         */
        int logl_prev;
+       /**
+        * @log_cont: Previous log line did not finished wtih \n
+        *
+        * This allows for chained log messages on the same line
+        */
+       bool log_cont;
 #endif
 #if CONFIG_IS_ENABLED(BLOBLIST)
        /**
@@ -439,7 +459,16 @@ struct global_data {
         */
        struct acpi_ctx *acpi_ctx;
 #endif
+#if CONFIG_IS_ENABLED(GENERATE_SMBIOS_TABLE)
+       /**
+        * @smbios_version: Points to SMBIOS type 0 version
+        */
+       char *smbios_version;
+#endif
 };
+#ifndef DO_DEPS_ONLY
+static_assert(sizeof(struct global_data) == GD_SIZE);
+#endif
 
 /**
  * gd_board_type() - retrieve board type
@@ -463,7 +492,7 @@ struct global_data {
 #define gd_set_of_root(_root)
 #endif
 
-#if CONFIG_IS_ENABLED(OF_PLATDATA)
+#if CONFIG_IS_ENABLED(OF_PLATDATA_DRIVER_RT)
 #define gd_set_dm_driver_rt(dyn)       gd->dm_driver_rt = dyn
 #define gd_dm_driver_rt()              gd->dm_driver_rt
 #else
@@ -471,16 +500,22 @@ struct global_data {
 #define gd_dm_driver_rt()              NULL
 #endif
 
-#ifdef CONFIG_GENERATE_ACPI_TABLE
-#define gd_acpi_ctx()          gd->acpi_ctx
+#if CONFIG_IS_ENABLED(OF_PLATDATA_RT)
+#define gd_set_dm_udevice_rt(dyn)      gd->dm_udevice_rt = dyn
+#define gd_dm_udevice_rt()             gd->dm_udevice_rt
+#define gd_set_dm_priv_base(dyn)       gd->dm_priv_base = dyn
+#define gd_dm_priv_base()              gd->dm_priv_base
 #else
-#define gd_acpi_ctx()          NULL
+#define gd_set_dm_udevice_rt(dyn)
+#define gd_dm_udevice_rt()             NULL
+#define gd_set_dm_priv_base(dyn)
+#define gd_dm_priv_base()              NULL
 #endif
 
-#if CONFIG_IS_ENABLED(DM)
-#define gd_size_cells_0()      (gd->dm_flags & GD_DM_FLG_SIZE_CELLS_0)
+#ifdef CONFIG_GENERATE_ACPI_TABLE
+#define gd_acpi_ctx()          gd->acpi_ctx
 #else
-#define gd_size_cells_0()      (0)
+#define gd_acpi_ctx()          NULL
 #endif
 
 /**
@@ -542,41 +577,33 @@ enum gd_flags {
         */
        GD_FLG_RECORD = 0x01000,
        /**
+        * @GD_FLG_RECORD_OVF: record console overflow
+        */
+       GD_FLG_RECORD_OVF = 0x02000,
+       /**
         * @GD_FLG_ENV_DEFAULT: default variable flag
         */
-       GD_FLG_ENV_DEFAULT = 0x02000,
+       GD_FLG_ENV_DEFAULT = 0x04000,
        /**
         * @GD_FLG_SPL_EARLY_INIT: early SPL initialization is done
         */
-       GD_FLG_SPL_EARLY_INIT = 0x04000,
+       GD_FLG_SPL_EARLY_INIT = 0x08000,
        /**
         * @GD_FLG_LOG_READY: log system is ready for use
         */
-       GD_FLG_LOG_READY = 0x08000,
+       GD_FLG_LOG_READY = 0x10000,
        /**
         * @GD_FLG_WDT_READY: watchdog is ready for use
         */
-       GD_FLG_WDT_READY = 0x10000,
+       GD_FLG_WDT_READY = 0x20000,
        /**
         * @GD_FLG_SKIP_LL_INIT: don't perform low-level initialization
         */
-       GD_FLG_SKIP_LL_INIT = 0x20000,
+       GD_FLG_SKIP_LL_INIT = 0x40000,
        /**
         * @GD_FLG_SMP_READY: SMP initialization is complete
         */
-       GD_FLG_SMP_READY = 0x40000,
-};
-
-/**
- * enum gd_dm_flags - global data flags for Driver Model
- *
- * See field dm_flags of &struct global_data.
- */
-enum gd_dm_flags {
-       /**
-        * @GD_DM_FLG_SIZE_CELLS_0: Enable #size-cells=<0> translation
-        */
-       GD_DM_FLG_SIZE_CELLS_0 = 0x00001,
+       GD_FLG_SMP_READY = 0x80000,
 };
 
 #endif /* __ASSEMBLY__ */