From 19536e1fc7efaa80e92a1be85c1e2b866a8597c5 Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Wed, 20 Jul 2011 09:28:05 +0530 Subject: [PATCH 1/2] Merge branch 'master', remote branch 'upstream/master' From 49f27eff8d6df1532d405367fd0e630296440962 Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Fri, 29 Jul 2011 09:31:06 +0530 Subject: [PATCH 2/2] Minor refactoring in the build process. Signed-off-by: Anup Patel --- ports/armv7a/Makefile | 8 ++++++-- ports/armv7a/{ => pb-a8}/linker.ld | 0 2 files changed, 6 insertions(+), 2 deletions(-) rename ports/armv7a/{ => pb-a8}/linker.ld (100%) diff --git a/ports/armv7a/Makefile b/ports/armv7a/Makefile index 6c0ec7f..b95991f 100644 --- a/ports/armv7a/Makefile +++ b/ports/armv7a/Makefile @@ -13,8 +13,12 @@ endif src_dir=$(CURDIR) # Configuration +ifndef CPU CPU=cortex-a8 +endif +ifndef BOARD BOARD=pb-a8 +endif CC=$(CROSS_COMPILE)gcc OBJCOPY=$(CROSS_COMPILE)objcopy # Enable stack-checking. WARNING: the full automated test suite currently @@ -107,10 +111,10 @@ $(build_dir)/%.bin: $(build_dir)/%.elf $(if $(V), @echo " (OBJCOPY) $(subst $(build_dir)/,,$@)") $(V)$(OBJCOPY) -O binary $< $@ -$(build_dir)/%.elf: $(build_dir)/%.o $(build_objs) +$(build_dir)/%.elf: $(build_dir)/%.o $(build_objs) $(board_dir)/linker.ld $(V)mkdir -p `dirname $@` $(if $(V), @echo " (ELF) $(subst $(build_dir)/,,$@)") - $(V)$(CC) $(CFLAGS) $(build_objs) $< -static-libgcc -lgcc -Wl -T linker.ld -o $@ + $(V)$(CC) $(CFLAGS) $(build_objs) $< -static-libgcc -lgcc -Wl -T $(board_dir)/linker.ld -o $@ $(build_dir)/%.o: $(src_dir)/%.S $(V)mkdir -p `dirname $@` diff --git a/ports/armv7a/linker.ld b/ports/armv7a/pb-a8/linker.ld similarity index 100% rename from ports/armv7a/linker.ld rename to ports/armv7a/pb-a8/linker.ld