From 4782465ef5d08bd7e7a36085a3013ed379e90ec2 Mon Sep 17 00:00:00 2001 From: bryan newbold Date: Tue, 12 Nov 2013 19:57:34 -0500 Subject: hack fix for bug with include ordering There seems to be a problem with the default target being overriden when a board-specific file is included before xilinx.mk. Workaround is to include targets last. --- Makefile.example | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Makefile.example') diff --git a/Makefile.example b/Makefile.example index 8194587..c0c566d 100644 --- a/Makefile.example +++ b/Makefile.example @@ -8,11 +8,12 @@ vendor := xilinx ### Uncomment this line to use the Xilinx SP605 dev board with default ### configuration -#include ./contrib/sp605/sp605.mk +#include ./contrib/sp605/settings.mk -### Uncomment this line to use the Xula2 dev board with default configuration +### Uncomment these lines to use the Xula2 dev board with default configuration ### See also ./contrib/xula2/README.xula2 -include ./contrib/xula2/xula2.mk +include ./contrib/xula2/settings.mk +extra_includes += ./contrib/xula2/targets.mk ### Edit and uncomment the below lines to use a custom board #board := exampleboard @@ -26,7 +27,7 @@ include ./contrib/xula2/xula2.mk ### Uncomment this line and create a new makefile to include any ### hardware-specific targets (eg, upload via SPI) -#extra_includes = exampleproj.mk +#extra_includes += exampleproj.mk part := $(device)$(speedgrade)-$(device_package) -- cgit v1.2.3