diff --git a/lib/bsp/standalone/src/changelog.txt b/lib/bsp/standalone/src/changelog.txt index 85ac0063..b903159a 100755 --- a/lib/bsp/standalone/src/changelog.txt +++ b/lib/bsp/standalone/src/changelog.txt @@ -180,5 +180,7 @@ * abort and prefetch abort using handlers called * DataAbortHandler and PrefetchAbortHandler respectively in * cortexa9/xil_exception.c to fix CR#802862. + * 4.2 pkp 06/30/14 MakeFile for cortexa9/armcc has been changed to fixes the + * issue of improper linking of translation_table.s * *****************************************************************************************/ diff --git a/lib/bsp/standalone/src/cortexa9/armcc/Makefile b/lib/bsp/standalone/src/cortexa9/armcc/Makefile index 2bed6fd2..b41825b6 100755 --- a/lib/bsp/standalone/src/cortexa9/armcc/Makefile +++ b/lib/bsp/standalone/src/cortexa9/armcc/Makefile @@ -54,12 +54,12 @@ INCLUDES=-I./. -I${INCLUDEDIR} INCLUDEFILES=*.h COBJS = $(addsuffix .o, $(basename $(wildcard *.c))) -AOBJS = asm_vectors.o -AOBJS += translation_table.o -OBJS = $(COBJS) $(AOBJS) boot_post.o +AOBJS1 = asm_vectors.o +AOBJS2 = translation_table.o +OBJS = $(COBJS) $(AOBJS1) $(AOBJS2) boot_post.o -ASOURCES = asm_vectors.s -ASOURCES += translation_table.s +ASOURCES1 = asm_vectors.s +ASOURCES2 = translation_table.s # Replace boot.o with boot_post.o OBJECTS = $(OBJS) @@ -73,7 +73,10 @@ endif ${AS} --cpu=Cortex-A9 --fpu=VFPv3_FP16 -o boot_post.o boot_post.s rm -f boot.S -$(AOBJS): $(ASOURCES) +$(AOBJS1): $(ASOURCES1) + ${AS} --cpu=Cortex-A9 --fpu=VFPv3_FP16 -o $@ $< + +$(AOBJS2): $(ASOURCES2) ${AS} --cpu=Cortex-A9 --fpu=VFPv3_FP16 -o $@ $< %.o: %.c