From 65b3c6bbae072367cbcf07bdd2ec27dcd591c0b3 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Sun, 27 Mar 2016 14:06:11 -0400
Subject: [PATCH] lib/physmem.c: Switch to __weak for arch_phys_memset
We normally use __weak rather than calling it out directly as an alias.
Update this function to the normal method.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
lib/physmem.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/physmem.c b/lib/physmem.c
index 0f035edcbe5..f21ac243edc 100644
--- a/lib/physmem.c
+++ b/lib/physmem.c
@@ -10,8 +10,9 @@
#include <common.h>
#include <physmem.h>
+#include <linux/compiler.h>
-static phys_addr_t __arch_phys_memset(phys_addr_t s, int c, phys_size_t n)
+phys_addr_t __weak arch_phys_memset(phys_addr_t s, int c, phys_size_t n)
{
void *s_ptr = (void *)(uintptr_t)s;
@@ -19,6 +20,3 @@ static phys_addr_t __arch_phys_memset(phys_addr_t s, int c, phys_size_t n)
assert(((phys_addr_t)(uintptr_t)(s + n)) == s + n);
return (phys_addr_t)(uintptr_t)memset(s_ptr, c, n);
}
-
-phys_addr_t arch_phys_memset(phys_addr_t s, int c, phys_size_t n)
- __attribute__((weak, alias("__arch_phys_memset")));
--
GitLab