qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <cym@rock-chips.com>
This commit is contained in:
YouMin Chen 2019-10-31 18:25:04 +08:00
parent 763ecaa306
commit 8ccbf1ca60
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/include/asm/arch-rockchip/rk_atags.h
View File

@ -261,8 +261,13 @@ void atags_stat(void);
#if CONFIG_IS_ENABLED(TINY_FRAMEWORK) && \ #if CONFIG_IS_ENABLED(TINY_FRAMEWORK) && \
!CONFIG_IS_ENABLED(LIBGENERIC_SUPPORT) && \ !CONFIG_IS_ENABLED(LIBGENERIC_SUPPORT) && \
defined(CONFIG_ARM64) !CONFIG_IS_ENABLED(USE_ARCH_MEMSET)
void *memset(void *s, int c, size_t count); 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); void *memcpy(void *dest, const void *src, size_t count);
#endif #endif

6
arch/arm/mach-rockchip/rk_atags.c
View File

@ -47,7 +47,7 @@ static int spl_bootdev_map[] = {
#if CONFIG_IS_ENABLED(TINY_FRAMEWORK) && \ #if CONFIG_IS_ENABLED(TINY_FRAMEWORK) && \
!CONFIG_IS_ENABLED(LIBGENERIC_SUPPORT) && \ !CONFIG_IS_ENABLED(LIBGENERIC_SUPPORT) && \
defined(CONFIG_ARM64) !CONFIG_IS_ENABLED(USE_ARCH_MEMSET)
/** /**
* memset - Fill a region of memory with the given value * memset - Fill a region of memory with the given value
* @s: Pointer to the start of the area. * @s: Pointer to the start of the area.
@ -67,7 +67,11 @@ void *memset(void *s, int c, size_t count)
return s; 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 * memcpy - Copy one area of memory to another
* @dest: Where to copy to * @dest: Where to copy to