erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

armv7-m: use generic memset, memcpy, memmove

Browse source 
this change makes bootblock and verstage built for armv7-m use generic memset,
memcpy, and memmove because arch/arm/memset.S, memcpy.S, and memmove.S are not
compatible with armv7-m.

BUG=none
BRANCH=ToT
TEST=Ran bootblock on Cosmos prototype board. Emerged all current boards.

Change-Id: Ie1df2525362ffc2e8438ff7bd5fad7629b0477de
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/225312
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
This commit is contained in:
Daisuke Nojiri 2014-10-23 18:14:39 -07:00 • committed by chrome-internal-fetch
commit 0e906536ff
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/arch/arm/Makefile.inc
View file

@ -48,9 +48,11 @@ bootblock-y += id.S
bootblock-y += clock.c
bootblock-y += stages.c
bootblock-y += eabi_compat.c
ifneq ($(CONFIG_ARCH_BOOTBLOCK_ARM_V7_M),y)
bootblock-y += memset.S
bootblock-y += memcpy.S
bootblock-y += memmove.S
endif
bootblock-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
$(objcbfs)/bootblock.debug: $$(bootblock-objs)
@ -72,9 +74,11 @@ $(objcbfs)/verstage.debug: $$(verstage-objs) $$(VB2_LIB)
verstage-$(CONFIG_EARLY_CONSOLE) += early_console.c
verstage-y += div0.c
verstage-y += eabi_compat.c
ifneq ($(CONFIG_ARCH_VERSTAGE_ARM_V7_M),y)
verstage-y += memset.S
verstage-y += memcpy.S
verstage-y += memmove.S
endif
verstage-y += stages.c
verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c

6
src/lib/Makefile.inc
View file

@ -21,6 +21,9 @@ bootblock-y += cbfs.c
bootblock-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
bootblock-y += memchr.c
bootblock-y += memcmp.c
ifeq ($(CONFIG_ARCH_BOOTBLOCK_ARM_V7_M),y)
bootblock-y += memset.c memcpy.c memmove.c
endif
bootblock-$(CONFIG_GENERIC_UDELAY) += timer.c
@ -41,6 +44,9 @@ $(foreach arch,$(ARCH_SUPPORTED),\
verstage-y += delay.c
verstage-y += cbfs.c
verstage-y += memcmp.c
ifeq ($(CONFIG_ARCH_VERSTAGE_ARM_V7_M),y)
verstage-y += memset.c memcpy.c memmove.c
endif
verstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
verstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
verstage-y += tlcl.c