Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / x86 / cpu / tangier / sdram.c

diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c
index 5743077431d3da6b46b48bcadfbb41f8526f0f07..df3b9e4ec975ffdce9c8781c7b0b8be277e5527b 100644 (file)
--- a/arch/x86/cpu/tangier/sdram.c
+++ b/arch/x86/cpu/tangier/sdram.c
@@ -1,10 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2017 Intel Corporation
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <init.h>
+#include <log.h>
 #include <asm/e820.h>
 #include <asm/global_data.h>
 #include <asm/sfi.h>
@@ -39,7 +40,7 @@ static int sfi_table_check(struct sfi_table_header *sbh)
                chksum += *pos++;
 
        if (chksum)
-               error("sfi: Invalid checksum\n");
+               pr_err("sfi: Invalid checksum\n");
 
        /* Checksum is OK if zero */
        return chksum ? -EILSEQ : 0;
@@ -76,7 +77,7 @@ static struct sfi_table_simple *sfi_search_mmap(void)
        /* Find SYST table */
        sb = sfi_get_table_by_sig(SFI_BASE_ADDR, SFI_SIG_SYST);
        if (!sb) {
-               error("sfi: failed to locate SYST table\n");
+               pr_err("sfi: failed to locate SYST table\n");
                return NULL;
        }
 
@@ -90,7 +91,7 @@ static struct sfi_table_simple *sfi_search_mmap(void)
                        return (struct sfi_table_simple *)sbh;
        }
 
-       error("sfi: failed to locate SFI MMAP table\n");
+       pr_err("sfi: failed to locate SFI MMAP table\n");
        return NULL;
 }
 
@@ -99,7 +100,8 @@ static struct sfi_table_simple *sfi_search_mmap(void)
             i < SFI_GET_NUM_ENTRIES(sb, struct sfi_mem_entry);         \
             i++, mentry++)                                             \
 
-static unsigned sfi_setup_e820(unsigned max_entries, struct e820entry *entries)
+static unsigned int sfi_setup_e820(unsigned int max_entries,
+                                  struct e820_entry *entries)
 {
        struct sfi_table_simple *sb;
        struct sfi_mem_entry *mentry;
@@ -188,7 +190,8 @@ static phys_size_t sfi_get_ram_size(void)
        return ram;
 }
 
-unsigned install_e820_map(unsigned max_entries, struct e820entry *entries)
+unsigned int install_e820_map(unsigned int max_entries,
+                             struct e820_entry *entries)
 {
        return sfi_setup_e820(max_entries, entries);
 }