Skip to content

Commit fbf65ab

Browse files
aethanielaethaniel
committed
[sam] updating makefiles: test app now builds all needed libs
1 parent afaeee2 commit fbf65ab

File tree

12 files changed

+226
-199
lines changed

12 files changed

+226
-199
lines changed

‎hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,24 +128,25 @@ $(VARIANT): create_output $(OUTPUT_LIB)
128128

129129
.PHONY: create_output
130130
create_output:
131-
@echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN)
132-
@echo -------------------------
133-
@echo *$(INCLUDES)
134-
@echo -------------------------
135-
@echo *$(C_SRC)
136-
@echo -------------------------
137-
@echo *$(C_OBJ)
138-
@echo -------------------------
139-
@echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ))
140131
@echo -------------------------
141-
@echo *$(CPP_SRC)
142-
@echo -------------------------
143-
@echo *$(CPP_OBJ)
144-
@echo -------------------------
145-
@echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ))
146-
@echo -------------------------
147-
@echo *$(A_SRC)
132+
@echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN)
148133
@echo -------------------------
134+
# @echo *$(INCLUDES)
135+
# @echo -------------------------
136+
# @echo *$(C_SRC)
137+
# @echo -------------------------
138+
# @echo *$(C_OBJ)
139+
# @echo -------------------------
140+
# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ))
141+
# @echo -------------------------
142+
# @echo *$(CPP_SRC)
143+
# @echo -------------------------
144+
# @echo *$(CPP_OBJ)
145+
# @echo -------------------------
146+
# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ))
147+
# @echo -------------------------
148+
# @echo *$(A_SRC)
149+
# @echo -------------------------
149150

150151
# -@mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) 1>NUL 2>&1
151152
-mkdir $(subst /,$(SEP),$(OUTPUT_BIN))
@@ -170,5 +171,5 @@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)
170171
.PHONY: clean
171172
clean:
172173
@echo --- Cleaning $(VARIANT) files [$(OUTPUT_PATH)$(SEP)*.o]
173-
-@"$(RM)" $(OUTPUT_PATH) 1>NUL 2>&1
174-
-@"$(RM)" $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1
174+
-@$(RM) $(OUTPUT_PATH) 1>NUL 2>&1
175+
-@$(RM) $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1

‎hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,24 +128,25 @@ $(VARIANT): create_output $(OUTPUT_LIB)
128128

129129
.PHONY: create_output
130130
create_output:
131-
@echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN)
132-
@echo -------------------------
133-
@echo *$(INCLUDES)
134-
@echo -------------------------
135-
@echo *$(C_SRC)
136-
@echo -------------------------
137-
@echo *$(C_OBJ)
138-
@echo -------------------------
139-
@echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ))
140131
@echo -------------------------
141-
@echo *$(CPP_SRC)
142-
@echo -------------------------
143-
@echo *$(CPP_OBJ)
144-
@echo -------------------------
145-
@echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ))
146-
@echo -------------------------
147-
@echo *$(A_SRC)
132+
@echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN)
148133
@echo -------------------------
134+
# @echo *$(INCLUDES)
135+
# @echo -------------------------
136+
# @echo *$(C_SRC)
137+
# @echo -------------------------
138+
# @echo *$(C_OBJ)
139+
# @echo -------------------------
140+
# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ))
141+
# @echo -------------------------
142+
# @echo *$(CPP_SRC)
143+
# @echo -------------------------
144+
# @echo *$(CPP_OBJ)
145+
# @echo -------------------------
146+
# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ))
147+
# @echo -------------------------
148+
# @echo *$(A_SRC)
149+
# @echo -------------------------
149150

150151
# -@mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) 1>NUL 2>&1
151152
-mkdir $(subst /,$(SEP),$(OUTPUT_BIN))
@@ -170,5 +171,5 @@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)
170171
.PHONY: clean
171172
clean:
172173
@echo --- Cleaning $(VARIANT) files [$(OUTPUT_PATH)$(SEP)*.o]
173-
-@"$(RM)" $(OUTPUT_PATH) 1>NUL 2>&1
174-
-@"$(RM)" $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1
174+
-@$(RM) $(OUTPUT_PATH) 1>NUL 2>&1
175+
-@$(RM) $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1

‎hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3s_ek.mk‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,24 +128,25 @@ $(VARIANT): create_output $(OUTPUT_LIB)
128128

129129
.PHONY: create_output
130130
create_output:
131-
@echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN)
132-
@echo -------------------------
133-
@echo *$(INCLUDES)
134-
@echo -------------------------
135-
@echo *$(C_SRC)
136-
@echo -------------------------
137-
@echo *$(C_OBJ)
138-
@echo -------------------------
139-
@echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ))
140131
@echo -------------------------
141-
@echo *$(CPP_SRC)
142-
@echo -------------------------
143-
@echo *$(CPP_OBJ)
144-
@echo -------------------------
145-
@echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ))
146-
@echo -------------------------
147-
@echo *$(A_SRC)
132+
@echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN)
148133
@echo -------------------------
134+
# @echo *$(INCLUDES)
135+
# @echo -------------------------
136+
# @echo *$(C_SRC)
137+
# @echo -------------------------
138+
# @echo *$(C_OBJ)
139+
# @echo -------------------------
140+
# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ))
141+
# @echo -------------------------
142+
# @echo *$(CPP_SRC)
143+
# @echo -------------------------
144+
# @echo *$(CPP_OBJ)
145+
# @echo -------------------------
146+
# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ))
147+
# @echo -------------------------
148+
# @echo *$(A_SRC)
149+
# @echo -------------------------
149150

150151
# -@mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) 1>NUL 2>&1
151152
-mkdir $(subst /,$(SEP),$(OUTPUT_BIN))
@@ -170,5 +171,5 @@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)
170171
.PHONY: clean
171172
clean:
172173
@echo --- Cleaning $(VARIANT) files [$(OUTPUT_PATH)$(SEP)*.o]
173-
-@"$(RM)" $(OUTPUT_PATH) 1>NUL 2>&1
174-
-@"$(RM)" $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1
174+
-@$(RM) $(OUTPUT_PATH) 1>NUL 2>&1
175+
-@$(RM) $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1

‎hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3u_ek.mk‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,24 +128,25 @@ $(VARIANT): create_output $(OUTPUT_LIB)
128128

129129
.PHONY: create_output
130130
create_output:
131-
@echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN)
132-
@echo -------------------------
133-
@echo *$(INCLUDES)
134-
@echo -------------------------
135-
@echo *$(C_SRC)
136-
@echo -------------------------
137-
@echo *$(C_OBJ)
138-
@echo -------------------------
139-
@echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ))
140131
@echo -------------------------
141-
@echo *$(CPP_SRC)
142-
@echo -------------------------
143-
@echo *$(CPP_OBJ)
144-
@echo -------------------------
145-
@echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ))
146-
@echo -------------------------
147-
@echo *$(A_SRC)
132+
@echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN)
148133
@echo -------------------------
134+
# @echo *$(INCLUDES)
135+
# @echo -------------------------
136+
# @echo *$(C_SRC)
137+
# @echo -------------------------
138+
# @echo *$(C_OBJ)
139+
# @echo -------------------------
140+
# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ))
141+
# @echo -------------------------
142+
# @echo *$(CPP_SRC)
143+
# @echo -------------------------
144+
# @echo *$(CPP_OBJ)
145+
# @echo -------------------------
146+
# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ))
147+
# @echo -------------------------
148+
# @echo *$(A_SRC)
149+
# @echo -------------------------
149150

150151
# -@mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) 1>NUL 2>&1
151152
-mkdir $(subst /,$(SEP),$(OUTPUT_BIN))
@@ -170,5 +171,5 @@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)
170171
.PHONY: clean
171172
clean:
172173
@echo --- Cleaning $(VARIANT) files [$(OUTPUT_PATH)$(SEP)*.o]
173-
-@"$(RM)" $(OUTPUT_PATH) 1>NUL 2>&1
174-
-@"$(RM)" $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1
174+
-@$(RM) $(OUTPUT_PATH) 1>NUL 2>&1
175+
-@$(RM) $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1

‎hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3x_ek.mk‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,24 +128,25 @@ $(VARIANT): create_output $(OUTPUT_LIB)
128128

129129
.PHONY: create_output
130130
create_output:
131-
@echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN)
132-
@echo -------------------------
133-
@echo *$(INCLUDES)
134-
@echo -------------------------
135-
@echo *$(C_SRC)
136-
@echo -------------------------
137-
@echo *$(C_OBJ)
138-
@echo -------------------------
139-
@echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ))
140131
@echo -------------------------
141-
@echo *$(CPP_SRC)
142-
@echo -------------------------
143-
@echo *$(CPP_OBJ)
144-
@echo -------------------------
145-
@echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ))
146-
@echo -------------------------
147-
@echo *$(A_SRC)
132+
@echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN)
148133
@echo -------------------------
134+
# @echo *$(INCLUDES)
135+
# @echo -------------------------
136+
# @echo *$(C_SRC)
137+
# @echo -------------------------
138+
# @echo *$(C_OBJ)
139+
# @echo -------------------------
140+
# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ))
141+
# @echo -------------------------
142+
# @echo *$(CPP_SRC)
143+
# @echo -------------------------
144+
# @echo *$(CPP_OBJ)
145+
# @echo -------------------------
146+
# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ))
147+
# @echo -------------------------
148+
# @echo *$(A_SRC)
149+
# @echo -------------------------
149150

150151
# -@mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) 1>NUL 2>&1
151152
-mkdir $(subst /,$(SEP),$(OUTPUT_BIN))
@@ -170,5 +171,5 @@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)
170171
.PHONY: clean
171172
clean:
172173
@echo --- Cleaning $(VARIANT) files [$(OUTPUT_PATH)$(SEP)*.o]
173-
-@"$(RM)" $(OUTPUT_PATH) 1>NUL 2>&1
174-
-@"$(RM)" $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1
174+
-@$(RM) $(OUTPUT_PATH) 1>NUL 2>&1
175+
-@$(RM) $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1

‎hardware/arduino/sam/cores/sam/validation/build_gcc/test.mk‎

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ CMSIS_ARM_PATH=$(CMSIS_ROOT_PATH)/CMSIS/Include
7676
CMSIS_ATMEL_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL
7777
CMSIS_CHIP_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL/$(CHIP_SERIE)
7878

79+
ARDUINO_CORE_PATH=$(PROJECT_BASE_PATH)/..
80+
ARDUINO_USB_PATH=$(PROJECT_BASE_PATH)/../USB
81+
7982
# Output directories
8083
OUTPUT_PATH = debug_$(VARIANT)
8184

@@ -120,8 +123,6 @@ LIBS_POSTFIX=rel
120123
endif
121124

122125
OUTPUT_BIN=test_$(TOOLCHAIN)_$(LIBS_POSTFIX)
123-
#LIBS=-L../libsam_$(CHIP_NAME)_$(TOOLCHAIN)_rel.a -L../arduino_$(VARIANT)_$(TOOLCHAIN)_rel.a
124-
#
125126
LIBS=-Wl,--start-group -lgcc -lc -lstdc++ -lsam_$(CHIP_NAME)_$(TOOLCHAIN)_$(LIBS_POSTFIX) -larduino_$(VARIANT)_$(TOOLCHAIN)_$(LIBS_POSTFIX) -lvariant_$(VARIANT)_$(TOOLCHAIN)_$(LIBS_POSTFIX) -Wl,--end-group
126127

127128
LIB_PATH =-L$(PROJECT_BASE_PATH)/..
@@ -147,28 +148,29 @@ CPP_OBJ=$(filter-out $(CPP_OBJ_FILTER), $(CPP_OBJ_TEMP))
147148
#-------------------------------------------------------------------------------
148149
all: test
149150

150-
test: create_output $(OUTPUT_BIN)
151+
test: create_output libsam_$(CHIP_NAME)_$(TOOLCHAIN)_$(LIBS_POSTFIX).a libarduino_$(VARIANT)_$(TOOLCHAIN)_$(LIBS_POSTFIX).a libvariant_$(VARIANT)_$(TOOLCHAIN)_$(LIBS_POSTFIX).a $(OUTPUT_BIN)
152+
151153

152154
.PHONY: create_output
153155
create_output:
154156
@echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN)
155-
@echo -------------------------
156-
@echo *$(INCLUDES)
157-
@echo -------------------------
158-
@echo *$(C_SRC)
159-
@echo -------------------------
160-
@echo *$(C_OBJ)
161-
@echo -------------------------
162-
@echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ))
163-
@echo -------------------------
164-
@echo *$(CPP_SRC)
165-
@echo -------------------------
166-
@echo *$(CPP_OBJ)
167-
@echo -------------------------
168-
@echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ))
169-
@echo -------------------------
170-
@echo *$(A_SRC)
171-
@echo -------------------------
157+
# @echo -------------------------
158+
# @echo *$(INCLUDES)
159+
# @echo -------------------------
160+
# @echo *$(C_SRC)
161+
# @echo -------------------------
162+
# @echo *$(C_OBJ)
163+
# @echo -------------------------
164+
# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ))
165+
# @echo -------------------------
166+
# @echo *$(CPP_SRC)
167+
# @echo -------------------------
168+
# @echo *$(CPP_OBJ)
169+
# @echo -------------------------
170+
# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ))
171+
# @echo -------------------------
172+
# @echo *$(A_SRC)
173+
# @echo -------------------------
172174

173175
-@mkdir $(OUTPUT_PATH) 1>NUL 2>&1
174176

@@ -187,12 +189,27 @@ $(OUTPUT_BIN): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)
187189
.PHONY: clean
188190
clean:
189191
@echo --- Cleaning test files
190-
-@"$(RM)" $(OUTPUT_PATH)/test.o 1>NUL 2>&1
191-
-@"$(RM)" $(OUTPUT_PATH)/$(OUTPUT_BIN).elf 1>NUL 2>&1
192-
-@"$(RM)" $(OUTPUT_PATH)/$(OUTPUT_BIN).elf.txt 1>NUL 2>&1
193-
-@"$(RM)" $(OUTPUT_PATH)/$(OUTPUT_BIN).bin 1>NUL 2>&1
194-
-@"$(RM)" $(OUTPUT_PATH)/$(OUTPUT_BIN).map 1>NUL 2>&1
192+
-@$(RM) $(OUTPUT_PATH) 1>NUL 2>&1
193+
194+
# -$(RM) $(OUTPUT_PATH)/test.o
195+
# -$(RM) $(OUTPUT_PATH)/$(OUTPUT_BIN).elf
196+
# -$(RM) $(OUTPUT_PATH)/$(OUTPUT_BIN).elf.txt
197+
# -$(RM) $(OUTPUT_PATH)/$(OUTPUT_BIN).bin
198+
# -$(RM) $(OUTPUT_PATH)/$(OUTPUT_BIN).map
195199

196200
debug: test
197201
@"$(GDB)" -x "$(VARIANT_PATH)/debug_scripts/gcc/$(VARIANT)_flash.gdb" -ex "reset" -readnow -se $(OUTPUT_PATH)/$(OUTPUT_BIN).elf
198202
# @"$(GDB)" -w -x "$(VARIANT_PATH)/debug_scripts/gcc/$(VARIANT)_sram.gdb" -ex "reset" -readnow -se $(OUTPUT_PATH)/$(OUTPUT_BIN).elf
203+
204+
libsam_$(CHIP_NAME)_$(TOOLCHAIN)_$(LIBS_POSTFIX).a:
205+
@echo Building $@
206+
@$(MAKE) -C $(SYSTEM_PATH)/libsam/build_gcc -f Makefile $@
207+
208+
libarduino_$(VARIANT)_$(TOOLCHAIN)_$(LIBS_POSTFIX).a:
209+
@echo Building $@
210+
$(MAKE) -C $(ARDUINO_CORE_PATH)/build_gcc -f Makefile $(VARIANT)
211+
212+
libvariant_$(VARIANT)_$(TOOLCHAIN)_$(LIBS_POSTFIX).a:
213+
@echo Building $@
214+
$(MAKE) -C $(VARIANT_PATH)/build_gcc -f Makefile $(VARIANT)
215+

‎hardware/arduino/sam/variants/arduino_due_u/build_gcc/libvariant_arduino_due_u.mk‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,10 @@ $(VARIANT): create_output $(OUTPUT_LIB)
132132

133133
.PHONY: create_output
134134
create_output:
135+
@echo -------------------------
135136
@echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN)
136137
@echo -------------------------
137-
@echo *$(INCLUDES)
138+
# @echo *$(INCLUDES)
138139
# @echo -------------------------
139140
# @echo *$(C_SRC)
140141
# @echo -------------------------
@@ -149,7 +150,7 @@ create_output:
149150
# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ))
150151
# @echo -------------------------
151152
# @echo *$(A_SRC)
152-
@echo -------------------------
153+
# @echo -------------------------
153154

154155
-@mkdir $(OUTPUT_PATH) 1>NUL 2>&1
155156

0 commit comments

Comments
 (0)