diff options
| author | Simon Glass <sjg@chromium.org> | 2023-05-05 01:50:52 +0300 |
|---|---|---|
| committer | Bin Meng <bmeng@tinylab.org> | 2023-05-11 05:25:29 +0300 |
| commit | b194e432c3d22bbeb6045b7f294c354d03ee95d3 (patch) | |
| tree | b406c2b8207b5527a4f37d83b8ba274b7194845a | |
| parent | afa3d90c08242790dad21ac27a412067bcbfcb49 (diff) | |
| download | u-boot-b194e432c3d22bbeb6045b7f294c354d03ee95d3.tar.xz | |
x86: Tidy up availability of string functions
For now, just enable the fast-but-large string functions in 32-boot
U-Boot proper only. Avoid using them in SPL. We cannot use then in 64-bit
builds since we only have 32-bit assembly.
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/x86/include/asm/string.h | 6 | ||||
| -rw-r--r-- | arch/x86/lib/Makefile | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/x86/include/asm/string.h b/arch/x86/include/asm/string.h index c15b264a5c..5c49b0f009 100644 --- a/arch/x86/include/asm/string.h +++ b/arch/x86/include/asm/string.h @@ -14,7 +14,11 @@ extern char *strrchr(const char *s, int c); #undef __HAVE_ARCH_STRCHR extern char *strchr(const char *s, int c); -#ifdef CONFIG_X86_64 +/* + * Our assembly routines do not work on in 64-bit mode and we don't do a lot of + * copying in SPL, so code size is more important there. + */ +#if defined(CONFIG_SPL_BUILD) || !IS_ENABLED(CONFIG_X86_32BIT_INIT) #undef __HAVE_ARCH_MEMCPY extern void *memcpy(void *, const void *, __kernel_size_t); diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index a6f2244147..b0612ae6dd 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -10,7 +10,9 @@ obj-y += bios.o obj-y += bios_asm.o obj-y += bios_interrupts.o endif -obj-y += string.o +endif +ifndef CONFIG_SPL_BUILD +obj-$(CONFIG_X86_32BIT_INIT) += string.o endif ifndef CONFIG_SPL_BUILD obj-$(CONFIG_CMD_BOOTM) += bootm.o |