arm: Use optimized memcpy and memset from linux

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index 1d571347a2737504a00c2f9c31231da97b5d91b9..c463a8ac96aea904bb34c10c47a5617dab4dca34 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ TIMESTAMP_FILE = $(obj)include/timestamp_autogenerated.h
 VERSION_FILE = $(obj)include/version_autogenerated.h
 
 HOSTARCH := $(shell uname -m | \
-       sed -e s/i.86/i386/ \
+       sed -e s/i.86/x86/ \
            -e s/sun4u/sparc64/ \
            -e s/arm.*/arm/ \
            -e s/sa110/arm/ \
@@ -167,7 +167,7 @@ include $(TOPDIR)/config.mk
 # U-Boot objects....order is important (i.e. start must be first)
 
 OBJS  = $(CPUDIR)/start.o
-ifeq ($(CPU),i386)
+ifeq ($(CPU),x86)
 OBJS += $(CPUDIR)/start16.o
 OBJS += $(CPUDIR)/resetvec.o
 endif
@@ -352,7 +352,7 @@ $(obj)u-boot.img:   $(obj)u-boot.bin
                -d $< $@
 
 $(obj)u-boot.imx:       $(obj)u-boot.bin
-               $(obj)tools/mkimage -n $(IMX_CONFIG) -T imximage \
+               $(obj)tools/mkimage -n  $(CONFIG_IMX_CONFIG) -T imximage \
                -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
 
 $(obj)u-boot.kwb:       $(obj)u-boot.bin