diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk index b9ca016e2..4e73d7289 100644 --- a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk +++ b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk @@ -128,24 +128,25 @@ $(VARIANT): create_output $(OUTPUT_LIB) .PHONY: create_output create_output: + @echo ------------------------- @echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN) @echo ------------------------- - @echo *$(INCLUDES) - @echo ------------------------- - @echo *$(C_SRC) - @echo ------------------------- - @echo *$(C_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) - @echo ------------------------- - @echo *$(CPP_SRC) - @echo ------------------------- - @echo *$(CPP_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) - @echo ------------------------- - @echo *$(A_SRC) - @echo ------------------------- +# @echo *$(INCLUDES) +# @echo ------------------------- +# @echo *$(C_SRC) +# @echo ------------------------- +# @echo *$(C_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) +# @echo ------------------------- +# @echo *$(CPP_SRC) +# @echo ------------------------- +# @echo *$(CPP_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) +# @echo ------------------------- +# @echo *$(A_SRC) +# @echo ------------------------- # -@mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) 1>NUL 2>&1 -mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) @@ -170,5 +171,5 @@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH) .PHONY: clean clean: @echo --- Cleaning $(VARIANT) files [$(OUTPUT_PATH)$(SEP)*.o] - -@"$(RM)" $(OUTPUT_PATH) 1>NUL 2>&1 - -@"$(RM)" $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1 + -@$(RM) $(OUTPUT_PATH) 1>NUL 2>&1 + -@$(RM) $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1 diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk index 9156f95f1..90228a53e 100644 --- a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk +++ b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk @@ -128,24 +128,25 @@ $(VARIANT): create_output $(OUTPUT_LIB) .PHONY: create_output create_output: + @echo ------------------------- @echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN) @echo ------------------------- - @echo *$(INCLUDES) - @echo ------------------------- - @echo *$(C_SRC) - @echo ------------------------- - @echo *$(C_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) - @echo ------------------------- - @echo *$(CPP_SRC) - @echo ------------------------- - @echo *$(CPP_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) - @echo ------------------------- - @echo *$(A_SRC) - @echo ------------------------- +# @echo *$(INCLUDES) +# @echo ------------------------- +# @echo *$(C_SRC) +# @echo ------------------------- +# @echo *$(C_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) +# @echo ------------------------- +# @echo *$(CPP_SRC) +# @echo ------------------------- +# @echo *$(CPP_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) +# @echo ------------------------- +# @echo *$(A_SRC) +# @echo ------------------------- # -@mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) 1>NUL 2>&1 -mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) @@ -170,5 +171,5 @@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH) .PHONY: clean clean: @echo --- Cleaning $(VARIANT) files [$(OUTPUT_PATH)$(SEP)*.o] - -@"$(RM)" $(OUTPUT_PATH) 1>NUL 2>&1 - -@"$(RM)" $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1 + -@$(RM) $(OUTPUT_PATH) 1>NUL 2>&1 + -@$(RM) $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1 diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3s_ek.mk b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3s_ek.mk index e7f40d28b..f31d2a5fd 100644 --- a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3s_ek.mk +++ b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3s_ek.mk @@ -128,24 +128,25 @@ $(VARIANT): create_output $(OUTPUT_LIB) .PHONY: create_output create_output: + @echo ------------------------- @echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN) @echo ------------------------- - @echo *$(INCLUDES) - @echo ------------------------- - @echo *$(C_SRC) - @echo ------------------------- - @echo *$(C_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) - @echo ------------------------- - @echo *$(CPP_SRC) - @echo ------------------------- - @echo *$(CPP_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) - @echo ------------------------- - @echo *$(A_SRC) - @echo ------------------------- +# @echo *$(INCLUDES) +# @echo ------------------------- +# @echo *$(C_SRC) +# @echo ------------------------- +# @echo *$(C_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) +# @echo ------------------------- +# @echo *$(CPP_SRC) +# @echo ------------------------- +# @echo *$(CPP_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) +# @echo ------------------------- +# @echo *$(A_SRC) +# @echo ------------------------- # -@mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) 1>NUL 2>&1 -mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) @@ -170,5 +171,5 @@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH) .PHONY: clean clean: @echo --- Cleaning $(VARIANT) files [$(OUTPUT_PATH)$(SEP)*.o] - -@"$(RM)" $(OUTPUT_PATH) 1>NUL 2>&1 - -@"$(RM)" $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1 + -@$(RM) $(OUTPUT_PATH) 1>NUL 2>&1 + -@$(RM) $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1 diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3u_ek.mk b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3u_ek.mk index 91f2eb7a5..fc312592a 100644 --- a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3u_ek.mk +++ b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3u_ek.mk @@ -128,24 +128,25 @@ $(VARIANT): create_output $(OUTPUT_LIB) .PHONY: create_output create_output: + @echo ------------------------- @echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN) @echo ------------------------- - @echo *$(INCLUDES) - @echo ------------------------- - @echo *$(C_SRC) - @echo ------------------------- - @echo *$(C_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) - @echo ------------------------- - @echo *$(CPP_SRC) - @echo ------------------------- - @echo *$(CPP_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) - @echo ------------------------- - @echo *$(A_SRC) - @echo ------------------------- +# @echo *$(INCLUDES) +# @echo ------------------------- +# @echo *$(C_SRC) +# @echo ------------------------- +# @echo *$(C_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) +# @echo ------------------------- +# @echo *$(CPP_SRC) +# @echo ------------------------- +# @echo *$(CPP_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) +# @echo ------------------------- +# @echo *$(A_SRC) +# @echo ------------------------- # -@mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) 1>NUL 2>&1 -mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) @@ -170,5 +171,5 @@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH) .PHONY: clean clean: @echo --- Cleaning $(VARIANT) files [$(OUTPUT_PATH)$(SEP)*.o] - -@"$(RM)" $(OUTPUT_PATH) 1>NUL 2>&1 - -@"$(RM)" $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1 + -@$(RM) $(OUTPUT_PATH) 1>NUL 2>&1 + -@$(RM) $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1 diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3x_ek.mk b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3x_ek.mk index 4d7f6e796..a444f7527 100644 --- a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3x_ek.mk +++ b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_sam3x_ek.mk @@ -128,24 +128,25 @@ $(VARIANT): create_output $(OUTPUT_LIB) .PHONY: create_output create_output: + @echo ------------------------- @echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN) @echo ------------------------- - @echo *$(INCLUDES) - @echo ------------------------- - @echo *$(C_SRC) - @echo ------------------------- - @echo *$(C_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) - @echo ------------------------- - @echo *$(CPP_SRC) - @echo ------------------------- - @echo *$(CPP_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) - @echo ------------------------- - @echo *$(A_SRC) - @echo ------------------------- +# @echo *$(INCLUDES) +# @echo ------------------------- +# @echo *$(C_SRC) +# @echo ------------------------- +# @echo *$(C_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) +# @echo ------------------------- +# @echo *$(CPP_SRC) +# @echo ------------------------- +# @echo *$(CPP_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) +# @echo ------------------------- +# @echo *$(A_SRC) +# @echo ------------------------- # -@mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) 1>NUL 2>&1 -mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) @@ -170,5 +171,5 @@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH) .PHONY: clean clean: @echo --- Cleaning $(VARIANT) files [$(OUTPUT_PATH)$(SEP)*.o] - -@"$(RM)" $(OUTPUT_PATH) 1>NUL 2>&1 - -@"$(RM)" $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1 + -@$(RM) $(OUTPUT_PATH) 1>NUL 2>&1 + -@$(RM) $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1 diff --git a/hardware/arduino/sam/cores/sam/validation/build_gcc/test.mk b/hardware/arduino/sam/cores/sam/validation/build_gcc/test.mk index 95abcfa03..283c19206 100644 --- a/hardware/arduino/sam/cores/sam/validation/build_gcc/test.mk +++ b/hardware/arduino/sam/cores/sam/validation/build_gcc/test.mk @@ -76,6 +76,9 @@ CMSIS_ARM_PATH=$(CMSIS_ROOT_PATH)/CMSIS/Include CMSIS_ATMEL_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL CMSIS_CHIP_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL/$(CHIP_SERIE) +ARDUINO_CORE_PATH=$(PROJECT_BASE_PATH)/.. +ARDUINO_USB_PATH=$(PROJECT_BASE_PATH)/../USB + # Output directories OUTPUT_PATH = debug_$(VARIANT) @@ -120,8 +123,6 @@ LIBS_POSTFIX=rel endif OUTPUT_BIN=test_$(TOOLCHAIN)_$(LIBS_POSTFIX) -#LIBS=-L../libsam_$(CHIP_NAME)_$(TOOLCHAIN)_rel.a -L../arduino_$(VARIANT)_$(TOOLCHAIN)_rel.a -# 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 LIB_PATH =-L$(PROJECT_BASE_PATH)/.. @@ -147,28 +148,29 @@ CPP_OBJ=$(filter-out $(CPP_OBJ_FILTER), $(CPP_OBJ_TEMP)) #------------------------------------------------------------------------------- all: test -test: create_output $(OUTPUT_BIN) +test: create_output libsam_$(CHIP_NAME)_$(TOOLCHAIN)_$(LIBS_POSTFIX).a libarduino_$(VARIANT)_$(TOOLCHAIN)_$(LIBS_POSTFIX).a libvariant_$(VARIANT)_$(TOOLCHAIN)_$(LIBS_POSTFIX).a $(OUTPUT_BIN) + .PHONY: create_output create_output: @echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN) - @echo ------------------------- - @echo *$(INCLUDES) - @echo ------------------------- - @echo *$(C_SRC) - @echo ------------------------- - @echo *$(C_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) - @echo ------------------------- - @echo *$(CPP_SRC) - @echo ------------------------- - @echo *$(CPP_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) - @echo ------------------------- - @echo *$(A_SRC) - @echo ------------------------- +# @echo ------------------------- +# @echo *$(INCLUDES) +# @echo ------------------------- +# @echo *$(C_SRC) +# @echo ------------------------- +# @echo *$(C_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) +# @echo ------------------------- +# @echo *$(CPP_SRC) +# @echo ------------------------- +# @echo *$(CPP_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) +# @echo ------------------------- +# @echo *$(A_SRC) +# @echo ------------------------- -@mkdir $(OUTPUT_PATH) 1>NUL 2>&1 @@ -187,12 +189,27 @@ $(OUTPUT_BIN): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH) .PHONY: clean clean: @echo --- Cleaning test files - -@"$(RM)" $(OUTPUT_PATH)/test.o 1>NUL 2>&1 - -@"$(RM)" $(OUTPUT_PATH)/$(OUTPUT_BIN).elf 1>NUL 2>&1 - -@"$(RM)" $(OUTPUT_PATH)/$(OUTPUT_BIN).elf.txt 1>NUL 2>&1 - -@"$(RM)" $(OUTPUT_PATH)/$(OUTPUT_BIN).bin 1>NUL 2>&1 - -@"$(RM)" $(OUTPUT_PATH)/$(OUTPUT_BIN).map 1>NUL 2>&1 + -@$(RM) $(OUTPUT_PATH) 1>NUL 2>&1 + +# -$(RM) $(OUTPUT_PATH)/test.o +# -$(RM) $(OUTPUT_PATH)/$(OUTPUT_BIN).elf +# -$(RM) $(OUTPUT_PATH)/$(OUTPUT_BIN).elf.txt +# -$(RM) $(OUTPUT_PATH)/$(OUTPUT_BIN).bin +# -$(RM) $(OUTPUT_PATH)/$(OUTPUT_BIN).map debug: test @"$(GDB)" -x "$(VARIANT_PATH)/debug_scripts/gcc/$(VARIANT)_flash.gdb" -ex "reset" -readnow -se $(OUTPUT_PATH)/$(OUTPUT_BIN).elf # @"$(GDB)" -w -x "$(VARIANT_PATH)/debug_scripts/gcc/$(VARIANT)_sram.gdb" -ex "reset" -readnow -se $(OUTPUT_PATH)/$(OUTPUT_BIN).elf + +libsam_$(CHIP_NAME)_$(TOOLCHAIN)_$(LIBS_POSTFIX).a: + @echo Building $@ + @$(MAKE) -C $(SYSTEM_PATH)/libsam/build_gcc -f Makefile $@ + +libarduino_$(VARIANT)_$(TOOLCHAIN)_$(LIBS_POSTFIX).a: + @echo Building $@ + $(MAKE) -C $(ARDUINO_CORE_PATH)/build_gcc -f Makefile $(VARIANT) + +libvariant_$(VARIANT)_$(TOOLCHAIN)_$(LIBS_POSTFIX).a: + @echo Building $@ + $(MAKE) -C $(VARIANT_PATH)/build_gcc -f Makefile $(VARIANT) + diff --git a/hardware/arduino/sam/variants/arduino_due_u/build_gcc/libvariant_arduino_due_u.mk b/hardware/arduino/sam/variants/arduino_due_u/build_gcc/libvariant_arduino_due_u.mk index f5f366717..24bb72f28 100644 --- a/hardware/arduino/sam/variants/arduino_due_u/build_gcc/libvariant_arduino_due_u.mk +++ b/hardware/arduino/sam/variants/arduino_due_u/build_gcc/libvariant_arduino_due_u.mk @@ -132,9 +132,10 @@ $(VARIANT): create_output $(OUTPUT_LIB) .PHONY: create_output create_output: + @echo ------------------------- @echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN) @echo ------------------------- - @echo *$(INCLUDES) +# @echo *$(INCLUDES) # @echo ------------------------- # @echo *$(C_SRC) # @echo ------------------------- @@ -149,7 +150,7 @@ create_output: # @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) # @echo ------------------------- # @echo *$(A_SRC) - @echo ------------------------- +# @echo ------------------------- -@mkdir $(OUTPUT_PATH) 1>NUL 2>&1 diff --git a/hardware/arduino/sam/variants/arduino_due_x/build_gcc/libvariant_arduino_due_x.mk b/hardware/arduino/sam/variants/arduino_due_x/build_gcc/libvariant_arduino_due_x.mk index 39da57f47..11c428ad2 100644 --- a/hardware/arduino/sam/variants/arduino_due_x/build_gcc/libvariant_arduino_due_x.mk +++ b/hardware/arduino/sam/variants/arduino_due_x/build_gcc/libvariant_arduino_due_x.mk @@ -42,15 +42,13 @@ CMSIS_ATMEL_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL ARDUINO_PATH = ../../../cores/sam VARIANT_BASE_PATH = ../../../variants VARIANT_PATH = ../../../variants/$(VARIANT) -VARIANT_COMMON_PATH = ../../common #------------------------------------------------------------------------------- # Files #------------------------------------------------------------------------------- -vpath %.h $(PROJECT_BASE_PATH) $(SYSTEM_PATH) $(VARIANT_PATH) $(VARIANT_COMMON_PATH) -#vpath %.c $(PROJECT_BASE_PATH) $(VARIANT_PATH) -vpath %.cpp $(PROJECT_BASE_PATH) $(PROJECT_BASE_PATH) $(VARIANT_COMMON_PATH) +vpath %.h $(PROJECT_BASE_PATH) $(SYSTEM_PATH) $(VARIANT_PATH) +vpath %.cpp $(PROJECT_BASE_PATH) $(PROJECT_BASE_PATH) VPATH+=$(PROJECT_BASE_PATH) @@ -105,7 +103,6 @@ C_OBJ=$(filter-out $(C_OBJ_FILTER), $(C_OBJ_TEMP)) # CPP source files and objects #------------------------------------------------------------------------------- CPP_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.cpp) -CPP_SRC+=$(wildcard $(VARIANT_COMMON_PATH)/*.cpp) CPP_OBJ_TEMP = $(patsubst %.cpp, %.o, $(notdir $(CPP_SRC))) @@ -135,24 +132,25 @@ $(VARIANT): create_output $(OUTPUT_LIB) .PHONY: create_output create_output: + @echo ------------------------- @echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN) @echo ------------------------- - @echo *$(INCLUDES) - @echo ------------------------- - @echo *$(C_SRC) - @echo ------------------------- - @echo *$(C_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) - @echo ------------------------- - @echo *$(CPP_SRC) - @echo ------------------------- - @echo *$(CPP_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) - @echo ------------------------- - @echo *$(A_SRC) - @echo ------------------------- +# @echo *$(INCLUDES) +# @echo ------------------------- +# @echo *$(C_SRC) +# @echo ------------------------- +# @echo *$(C_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) +# @echo ------------------------- +# @echo *$(CPP_SRC) +# @echo ------------------------- +# @echo *$(CPP_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) +# @echo ------------------------- +# @echo *$(A_SRC) +# @echo ------------------------- -@mkdir $(OUTPUT_PATH) 1>NUL 2>&1 @@ -175,5 +173,5 @@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH) .PHONY: clean clean: @echo --- Cleaning $(VARIANT) files [$(OUTPUT_PATH)$(SEP)*.o] - -@"$(RM)" $(OUTPUT_PATH) 1>NUL 2>&1 - -@"$(RM)" $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1 + -@$(RM) $(OUTPUT_PATH) 1>NUL 2>&1 + -@$(RM) $(OUTPUT_BIN)/$(OUTPUT_LIB) 1>NUL 2>&1 diff --git a/hardware/atmel/sam/variants/sam3s_ek/build_gcc/libvariant_sam3s_ek.mk b/hardware/atmel/sam/variants/sam3s_ek/build_gcc/libvariant_sam3s_ek.mk index ea4115594..fde39f771 100644 --- a/hardware/atmel/sam/variants/sam3s_ek/build_gcc/libvariant_sam3s_ek.mk +++ b/hardware/atmel/sam/variants/sam3s_ek/build_gcc/libvariant_sam3s_ek.mk @@ -132,9 +132,10 @@ $(VARIANT): create_output $(OUTPUT_LIB) .PHONY: create_output create_output: + @echo ------------------------- @echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN) @echo ------------------------- - @echo *$(INCLUDES) +# @echo *$(INCLUDES) # @echo ------------------------- # @echo *$(C_SRC) # @echo ------------------------- @@ -149,24 +150,24 @@ create_output: # @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) # @echo ------------------------- # @echo *$(A_SRC) - @echo ------------------------- +# @echo ------------------------- -@mkdir $(OUTPUT_PATH) 1>NUL 2>&1 $(addprefix $(OUTPUT_PATH)/,$(C_OBJ)): $(OUTPUT_PATH)/%.o: %.c -# @$(CC) -v -c $(CFLAGS) $< -o $@ - @$(CC) -c $(CFLAGS) $< -o $@ +# @"$(CC)" -v -c $(CFLAGS) $< -o $@ + @"$(CC)" -c $(CFLAGS) $< -o $@ $(addprefix $(OUTPUT_PATH)/,$(CPP_OBJ)): $(OUTPUT_PATH)/%.o: %.cpp -# @$(CC) -c $(CPPFLAGS) $< -o $@ - @$(CC) -xc++ -c $(CPPFLAGS) $< -o $@ +# @"$(CC)" -c $(CPPFLAGS) $< -o $@ + @"$(CC)" -xc++ -c $(CPPFLAGS) $< -o $@ $(addprefix $(OUTPUT_PATH)/,$(A_OBJ)): $(OUTPUT_PATH)/%.o: %.s - @$(AS) -c $(ASFLAGS) $< -o $@ + @"$(AS)" -c $(ASFLAGS) $< -o $@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(A_OBJ)) - @$(AR) -v -r "$(OUTPUT_BIN)/$@" $^ - @$(NM) "$(OUTPUT_BIN)/$@" > "$(OUTPUT_BIN)/$@.txt" + @"$(AR)" -v -r "$(OUTPUT_BIN)/$@" $^ + @"$(NM)" "$(OUTPUT_BIN)/$@" > "$(OUTPUT_BIN)/$@.txt" .PHONY: clean diff --git a/hardware/atmel/sam/variants/sam3u_ek/build_gcc/libvariant_sam3u_ek.mk b/hardware/atmel/sam/variants/sam3u_ek/build_gcc/libvariant_sam3u_ek.mk index 455896909..70e80887d 100644 --- a/hardware/atmel/sam/variants/sam3u_ek/build_gcc/libvariant_sam3u_ek.mk +++ b/hardware/atmel/sam/variants/sam3u_ek/build_gcc/libvariant_sam3u_ek.mk @@ -132,9 +132,10 @@ $(VARIANT): create_output $(OUTPUT_LIB) .PHONY: create_output create_output: + @echo ------------------------- @echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN) @echo ------------------------- - @echo *$(INCLUDES) +# @echo *$(INCLUDES) # @echo ------------------------- # @echo *$(C_SRC) # @echo ------------------------- @@ -149,24 +150,24 @@ create_output: # @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) # @echo ------------------------- # @echo *$(A_SRC) - @echo ------------------------- +# @echo ------------------------- -@mkdir $(OUTPUT_PATH) 1>NUL 2>&1 $(addprefix $(OUTPUT_PATH)/,$(C_OBJ)): $(OUTPUT_PATH)/%.o: %.c -# @$(CC) -v -c $(CFLAGS) $< -o $@ - @$(CC) -c $(CFLAGS) $< -o $@ +# @"$(CC)" -v -c $(CFLAGS) $< -o $@ + @"$(CC)" -c $(CFLAGS) $< -o $@ $(addprefix $(OUTPUT_PATH)/,$(CPP_OBJ)): $(OUTPUT_PATH)/%.o: %.cpp -# @$(CC) -c $(CPPFLAGS) $< -o $@ - @$(CC) -xc++ -c $(CPPFLAGS) $< -o $@ +# @"$(CC)" -c $(CPPFLAGS) $< -o $@ + @"$(CC)" -xc++ -c $(CPPFLAGS) $< -o $@ $(addprefix $(OUTPUT_PATH)/,$(A_OBJ)): $(OUTPUT_PATH)/%.o: %.s - @$(AS) -c $(ASFLAGS) $< -o $@ + @"$(AS)" -c $(ASFLAGS) $< -o $@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(A_OBJ)) - @$(AR) -v -r "$(OUTPUT_BIN)/$@" $^ - @$(NM) "$(OUTPUT_BIN)/$@" > "$(OUTPUT_BIN)/$@.txt" + @"$(AR)" -v -r "$(OUTPUT_BIN)/$@" $^ + @"$(NM)" "$(OUTPUT_BIN)/$@" > "$(OUTPUT_BIN)/$@.txt" .PHONY: clean diff --git a/hardware/atmel/sam/variants/sam3x_ek/build_gcc/libvariant_sam3x_ek.mk b/hardware/atmel/sam/variants/sam3x_ek/build_gcc/libvariant_sam3x_ek.mk index 0e30577fe..9cda239e7 100644 --- a/hardware/atmel/sam/variants/sam3x_ek/build_gcc/libvariant_sam3x_ek.mk +++ b/hardware/atmel/sam/variants/sam3x_ek/build_gcc/libvariant_sam3x_ek.mk @@ -132,9 +132,10 @@ $(VARIANT): create_output $(OUTPUT_LIB) .PHONY: create_output create_output: + @echo ------------------------- @echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN) @echo ------------------------- - @echo *$(INCLUDES) +# @echo *$(INCLUDES) # @echo ------------------------- # @echo *$(C_SRC) # @echo ------------------------- @@ -149,24 +150,24 @@ create_output: # @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) # @echo ------------------------- # @echo *$(A_SRC) - @echo ------------------------- +# @echo ------------------------- -@mkdir $(OUTPUT_PATH) 1>NUL 2>&1 $(addprefix $(OUTPUT_PATH)/,$(C_OBJ)): $(OUTPUT_PATH)/%.o: %.c -# @$(CC) -v -c $(CFLAGS) $< -o $@ - @$(CC) -c $(CFLAGS) $< -o $@ +# @"$(CC)" -v -c $(CFLAGS) $< -o $@ + @"$(CC)" -c $(CFLAGS) $< -o $@ $(addprefix $(OUTPUT_PATH)/,$(CPP_OBJ)): $(OUTPUT_PATH)/%.o: %.cpp -# @$(CC) -c $(CPPFLAGS) $< -o $@ - @$(CC) -xc++ -c $(CPPFLAGS) $< -o $@ +# @"$(CC)" -c $(CPPFLAGS) $< -o $@ + @"$(CC)" -xc++ -c $(CPPFLAGS) $< -o $@ $(addprefix $(OUTPUT_PATH)/,$(A_OBJ)): $(OUTPUT_PATH)/%.o: %.s - @$(AS) -c $(ASFLAGS) $< -o $@ + @"$(AS)" -c $(ASFLAGS) $< -o $@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(A_OBJ)) - @$(AR) -v -r "$(OUTPUT_BIN)/$@" $^ - @$(NM) "$(OUTPUT_BIN)/$@" > "$(OUTPUT_BIN)/$@.txt" + @"$(AR)" -v -r "$(OUTPUT_BIN)/$@" $^ + @"$(NM)" "$(OUTPUT_BIN)/$@" > "$(OUTPUT_BIN)/$@.txt" .PHONY: clean diff --git a/hardware/google/sam/variants/adk2/build_gcc/libvariant_adk2.mk b/hardware/google/sam/variants/adk2/build_gcc/libvariant_adk2.mk index 0f1a2d7c2..bdc78c123 100644 --- a/hardware/google/sam/variants/adk2/build_gcc/libvariant_adk2.mk +++ b/hardware/google/sam/variants/adk2/build_gcc/libvariant_adk2.mk @@ -8,7 +8,7 @@ # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public @@ -34,30 +34,33 @@ OUTPUT_BIN = ../../../cores/sam # Libraries PROJECT_BASE_PATH = .. SYSTEM_PATH = ../../../system -CMSIS_PATH = $(SYSTEM_PATH)/CMSIS/Include +CMSIS_ROOT_PATH = $(SYSTEM_PATH)/CMSIS +CMSIS_ARM_PATH=$(CMSIS_ROOT_PATH)/CMSIS/Include +CMSIS_ATMEL_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL +#CMSIS_CHIP_PATH=$(CMSIS_ROOT_PATH)/Device/ATMEL/$(CHIP_SERIE) + ARDUINO_PATH = ../../../cores/sam VARIANT_BASE_PATH = ../../../variants VARIANT_PATH = ../../../variants/$(VARIANT) -VARIANT_COMMON_PATH = ../../common #------------------------------------------------------------------------------- # Files #------------------------------------------------------------------------------- -vpath %.h $(PROJECT_BASE_PATH) $(SYSTEM_PATH) $(VARIANT_PATH) $(VARIANT_COMMON_PATH) -#vpath %.c $(PROJECT_BASE_PATH) $(VARIANT_PATH) -vpath %.cpp $(PROJECT_BASE_PATH) $(PROJECT_BASE_PATH) $(VARIANT_COMMON_PATH) +vpath %.h $(PROJECT_BASE_PATH) $(SYSTEM_PATH) $(VARIANT_PATH) +vpath %.cpp $(PROJECT_BASE_PATH) $(PROJECT_BASE_PATH) VPATH+=$(PROJECT_BASE_PATH) -INCLUDES = +INCLUDES = #INCLUDES += -I$(PROJECT_BASE_PATH) INCLUDES += -I$(ARDUINO_PATH) INCLUDES += -I$(SYSTEM_PATH) INCLUDES += -I$(SYSTEM_PATH)/libsam INCLUDES += -I$(VARIANT_BASE_PATH) INCLUDES += -I$(VARIANT_PATH) -INCLUDES += -I$(CMSIS_PATH) +INCLUDES += -I$(CMSIS_ARM_PATH) +INCLUDES += -I$(CMSIS_ATMEL_PATH) #------------------------------------------------------------------------------- ifdef DEBUG @@ -100,7 +103,6 @@ C_OBJ=$(filter-out $(C_OBJ_FILTER), $(C_OBJ_TEMP)) # CPP source files and objects #------------------------------------------------------------------------------- CPP_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.cpp) -CPP_SRC+=$(wildcard $(VARIANT_COMMON_PATH)/*.cpp) CPP_OBJ_TEMP = $(patsubst %.cpp, %.o, $(notdir $(CPP_SRC))) @@ -130,41 +132,42 @@ $(VARIANT): create_output $(OUTPUT_LIB) .PHONY: create_output create_output: - @echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN) @echo ------------------------- - @echo *$(INCLUDES) - @echo ------------------------- - @echo *$(C_SRC) - @echo ------------------------- - @echo *$(C_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) - @echo ------------------------- - @echo *$(CPP_SRC) - @echo ------------------------- - @echo *$(CPP_OBJ) - @echo ------------------------- - @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) - @echo ------------------------- - @echo *$(A_SRC) + @echo --- Preparing $(VARIANT) files in $(OUTPUT_PATH) $(OUTPUT_BIN) @echo ------------------------- +# @echo *$(INCLUDES) +# @echo ------------------------- +# @echo *$(C_SRC) +# @echo ------------------------- +# @echo *$(C_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) +# @echo ------------------------- +# @echo *$(CPP_SRC) +# @echo ------------------------- +# @echo *$(CPP_OBJ) +# @echo ------------------------- +# @echo *$(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) +# @echo ------------------------- +# @echo *$(A_SRC) +# @echo ------------------------- -@mkdir $(OUTPUT_PATH) 1>NUL 2>&1 $(addprefix $(OUTPUT_PATH)/,$(C_OBJ)): $(OUTPUT_PATH)/%.o: %.c -# @$(CC) -v -c $(CFLAGS) $< -o $@ - @$(CC) -c $(CFLAGS) $< -o $@ +# @"$(CC)" -v -c $(CFLAGS) $< -o $@ + @"$(CC)" -c $(CFLAGS) $< -o $@ $(addprefix $(OUTPUT_PATH)/,$(CPP_OBJ)): $(OUTPUT_PATH)/%.o: %.cpp -# @$(CC) -c $(CPPFLAGS) $< -o $@ - @$(CC) -xc++ -c $(CPPFLAGS) $< -o $@ +# @"$(CC)" -c $(CPPFLAGS) $< -o $@ + @"$(CC)" -xc++ -c $(CPPFLAGS) $< -o $@ $(addprefix $(OUTPUT_PATH)/,$(A_OBJ)): $(OUTPUT_PATH)/%.o: %.s - @$(AS) -c $(ASFLAGS) $< -o $@ + @"$(AS)" -c $(ASFLAGS) $< -o $@ $(OUTPUT_LIB): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(A_OBJ)) - @$(AR) -v -r "$(OUTPUT_BIN)/$@" $^ - @$(NM) "$(OUTPUT_BIN)/$@" > "$(OUTPUT_BIN)/$@.txt" + @"$(AR)" -v -r "$(OUTPUT_BIN)/$@" $^ + @"$(NM)" "$(OUTPUT_BIN)/$@" > "$(OUTPUT_BIN)/$@.txt" .PHONY: clean