From 8ccbf1ca607ecd85dba3fb5bb9bffc811c71127a Mon Sep 17 00:00:00 2001 From: YouMin Chen Date: Thu, 31 Oct 2019 18:25:04 +0800 Subject: [PATCH] rockchip: atags: the macro definition about memset/memcpy If have define USE_ARCH_MEMSET/USE_ARCH_MEMCPY,it don't need to realize memset/memcpy for rk_atags whit TPL. Change-Id: I464f364edf711573dbad61302ff9e01f3a0edbf2 Signed-off-by: YouMin Chen --- arch/arm/include/asm/arch-rockchip/rk_atags.h | 7 ++++++- arch/arm/mach-rockchip/rk_atags.c | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/rk_atags.h b/arch/arm/include/asm/arch-rockchip/rk_atags.h index 5ef9d3332e..aeb1b3c6cc 100644 --- a/arch/arm/include/asm/arch-rockchip/rk_atags.h +++ b/arch/arm/include/asm/arch-rockchip/rk_atags.h @@ -261,8 +261,13 @@ void atags_stat(void); #if CONFIG_IS_ENABLED(TINY_FRAMEWORK) && \ !CONFIG_IS_ENABLED(LIBGENERIC_SUPPORT) && \ - defined(CONFIG_ARM64) + !CONFIG_IS_ENABLED(USE_ARCH_MEMSET) void *memset(void *s, int c, size_t count); +#endif + +#if CONFIG_IS_ENABLED(TINY_FRAMEWORK) && \ + !CONFIG_IS_ENABLED(LIBGENERIC_SUPPORT) && \ + !CONFIG_IS_ENABLED(USE_ARCH_MEMCPY) void *memcpy(void *dest, const void *src, size_t count); #endif diff --git a/arch/arm/mach-rockchip/rk_atags.c b/arch/arm/mach-rockchip/rk_atags.c index f7faab603f..75458aff4d 100644 --- a/arch/arm/mach-rockchip/rk_atags.c +++ b/arch/arm/mach-rockchip/rk_atags.c @@ -47,7 +47,7 @@ static int spl_bootdev_map[] = { #if CONFIG_IS_ENABLED(TINY_FRAMEWORK) && \ !CONFIG_IS_ENABLED(LIBGENERIC_SUPPORT) && \ - defined(CONFIG_ARM64) + !CONFIG_IS_ENABLED(USE_ARCH_MEMSET) /** * memset - Fill a region of memory with the given value * @s: Pointer to the start of the area. @@ -67,7 +67,11 @@ void *memset(void *s, int c, size_t count) return s; } +#endif +#if CONFIG_IS_ENABLED(TINY_FRAMEWORK) && \ + !CONFIG_IS_ENABLED(LIBGENERIC_SUPPORT) && \ + !CONFIG_IS_ENABLED(USE_ARCH_MEMCPY) /** * memcpy - Copy one area of memory to another * @dest: Where to copy to