From c3180a9270efd57cecead94e41a9de25b34cb4c4 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Wed, 3 Dec 2014 16:34:55 +0000 Subject: [PATCH] Revert "armv7-m: use generic memset, memcpy, memmove" This reverts commit 0e906536fffa057f22098ec6a4dd6572c419b539. Change-Id: I81c67b5459a9f7010654e633083812b6ab363e59 Reviewed-on: https://chromium-review.googlesource.com/232930 Reviewed-by: Daisuke Nojiri Tested-by: Daisuke Nojiri Commit-Queue: Daisuke Nojiri --- src/arch/arm/Makefile.inc | 4 ---- src/lib/Makefile.inc | 6 ------ 2 files changed, 10 deletions(-) diff --git a/src/arch/arm/Makefile.inc b/src/arch/arm/Makefile.inc index 39f5f56e33..5eb74fa7d6 100644 --- a/src/arch/arm/Makefile.inc +++ b/src/arch/arm/Makefile.inc @@ -48,11 +48,9 @@ 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) @@ -74,11 +72,9 @@ $(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 diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 2fc3cd33d8..da822192e5 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -22,9 +22,6 @@ bootblock-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c bootblock-$(CONFIG_GENERIC_GPIO_LIB) += gpio.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_COLLECT_TIMESTAMPS) += timestamp.c bootblock-$(CONFIG_GENERIC_UDELAY) += timer.c @@ -45,9 +42,6 @@ $(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