Changeset 1024 for trunk

Timestamp:

Oct 22, 2015, 5:58:27 PM (9 years ago)

Author:

meunier

Message:

• Update Makefile in soft/tsar_boot: the build directory is now a parameter

File:

• trunk/softs/tsar_boot/Makefile (modified) (5 diffs)

trunk/softs/tsar_boot/Makefile

@@ -6 +6 @@
 HARD_CONFIG_PATH ?= ../../../giet_vm
 MAKECMDGOALS     ?= none
+BS_PROC    ?= 0
+
+MAKECMDGOALS ?= none
+BUILD_DIR    ?= build
 
 ifneq ($(MAKECMDGOALS),$(filter $(MAKECMDGOALS),clean distclean clean-doc doc))
@@ -19 +23 @@
     DEFS   := "-DRESET_SYSTEM_CLK=$(SYSTEM_CLK)"
 endif
+DEFS       := -DBS_PROC=$(BS_PROC)
 
 LD         := mipsel-unknown-elf-ld
@@ -33 +38 @@
 DOXYGEN    := doxygen
 
-BUILD_DIR  := build
 HARD_CONFIG:= $(HARD_CONFIG_PATH)/hard_config.h
 
@@ -67 +71 @@
                   $(subst .c,.o, $(notdir $(C_SRCS))) \
                   $(subst .S,.o, $(notdir $(S_SRCS))))
-
-TARGET     := preloader.elf
+# @QM Defining preloader.elf relatively to the build directory, so as to support parallel compilation with
+# different build directories
+TARGET     := $(BUILD_DIR)/../preloader.elf
 
 # =============================================================================
@@ -114 +119 @@
         ./version.sh > $@
 
-$(BUILD_DIR)/preloader.ld: preloader.ld.in
+$(BUILD_DIR)/preloader.ld: preloader.ld.in $(HARD_CONFIG)
         $(ECHO) "[   CC    ]     $(notdir $<)"
         $(CC) -x c -P -E -DUSE_DT=$(USE_DT) $(INCLUDE) $< -o $@