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

[u-boot.git] / arch / x86 / lib / mrccache.c

diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index f181e8100cb77383120ef583d40537b747fcef89..970704a8dd626eb69d95962608bbc9ce5901bf9c 100644 (file)
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -6,7 +6,8 @@
  * Copyright (C) 2015 Bin Meng <[email protected]>
  */
 
-#include <common.h>
+#define LOG_CATEGORY   UCLASS_RAM
+
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
@@ -15,6 +16,7 @@
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
+#include <asm/global_data.h>
 #include <asm/mrccache.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
@@ -92,7 +94,7 @@ struct mrc_data_container *mrccache_find_current(struct mrc_region *entry)
  * @data_size: Required data size of the new entry. Note that we assume that
  *     all cache entries are the same size
  *
- * @return next cache entry if found, NULL if we got to the end
+ * Return: next cache entry if found, NULL if we got to the end
  */
 static struct mrc_data_container *find_next_mrc_cache(struct mrc_region *entry,
                struct mrc_data_container *prev, int data_size)
@@ -129,7 +131,7 @@ static struct mrc_data_container *find_next_mrc_cache(struct mrc_region *entry,
  * @sf:                SPI flash to write to
  * @entry:     Position and size of MRC cache in SPI flash
  * @cur:       Record to write
- * @return 0 if updated, -EEXIST if the record is the same as the latest
+ * Return: 0 if updated, -EEXIST if the record is the same as the latest
  * record, -EINVAL if the record is not valid, other error if SPI write failed
  */
 static int mrccache_update(struct udevice *sf, struct mrc_region *entry,
@@ -196,8 +198,8 @@ static void mrccache_setup(struct mrc_output *mrc, void *data)
        cache->signature = MRC_DATA_SIGNATURE;
        cache->data_size = mrc->len;
        checksum = compute_ip_checksum(mrc->buf, cache->data_size);
-       debug("Saving %d bytes for MRC output data, checksum %04x\n",
-             cache->data_size, checksum);
+       log_debug("Saving %d bytes for MRC output data, checksum %04x\n",
+                 cache->data_size, checksum);
        cache->checksum = checksum;
        cache->reserved = 0;
        memcpy(cache->data, mrc->buf, cache->data_size);
@@ -302,7 +304,7 @@ static int mrccache_save_type(enum mrc_type_t type)
        mrc = &gd->arch.mrc[type];
        if (!mrc->len)
                return 0;
-       log_debug("Saving %#x bytes of MRC output data type %d to SPI flash\n",
+       log_debug("Saving %x bytes of MRC output data type %d to SPI flash\n",
                  mrc->len, type);
        ret = mrccache_get_region(type, &sf, &entry);
        if (ret)