Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"

[u-boot.git] / common / log.c

diff --git a/common/log.c b/common/log.c
index 7254aa70bfdf30676fb049e1d56cc12abf69bd00..dfee250b158a77f6284de849953702ba8b5cf537 100644 (file)
--- a/common/log.c
+++ b/common/log.c
@@ -6,7 +6,7 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
+#include <display_options.h>
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
@@ -29,6 +29,8 @@ static const char *const log_cat_name[] = {
        "acpi",
        "boot",
        "event",
+       "fs",
+       "expo",
 };
 
 _Static_assert(ARRAY_SIZE(log_cat_name) == LOGC_COUNT - LOGC_NONE,
@@ -425,6 +427,11 @@ int log_device_set_enable(struct log_driver *drv, bool enable)
        return 0;
 }
 
+void log_fixup_for_gd_move(struct global_data *new_gd)
+{
+       new_gd->log_head.prev->next = &new_gd->log_head;
+}
+
 int log_init(void)
 {
        struct log_driver *drv = ll_entry_start(struct log_driver, log_driver);
@@ -434,7 +441,7 @@ int log_init(void)
        /*
         * We cannot add runtime data to the driver since it is likely stored
         * in rodata. Instead, set up a 'device' corresponding to each driver.
-        * We only support having a single device.
+        * We only support having a single device for each driver.
         */
        INIT_LIST_HEAD((struct list_head *)&gd->log_head);
        while (drv < end) {