Browse Source

Allow specification of which arduino hardware subvariant in Makefile.

Daid 12 years ago
parent
commit
ca7acbe6d9
1 changed files with 7 additions and 5 deletions
  1. 7
    5
      Marlin/Makefile

+ 7
- 5
Marlin/Makefile View File

64
 #Gen7
64
 #Gen7
65
 ifeq ($(HARDWARE_MOTHERBOARD),10)
65
 ifeq ($(HARDWARE_MOTHERBOARD),10)
66
 HARDWARE_VARIANT ?= Gen7
66
 HARDWARE_VARIANT ?= Gen7
67
-MCU              ?= atmega644 
67
+MCU              ?= atmega644
68
 F_CPU            ?= 20000000
68
 F_CPU            ?= 20000000
69
 else ifeq  ($(HARDWARE_MOTHERBOARD),11)
69
 else ifeq  ($(HARDWARE_MOTHERBOARD),11)
70
 HARDWARE_VARIANT ?= Gen7
70
 HARDWARE_VARIANT ?= Gen7
93
 #Duemilanove w/ ATMega328P pin assignment
93
 #Duemilanove w/ ATMega328P pin assignment
94
 else ifeq  ($(HARDWARE_MOTHERBOARD),4)
94
 else ifeq  ($(HARDWARE_MOTHERBOARD),4)
95
 HARDWARE_VARIANT ?= arduino
95
 HARDWARE_VARIANT ?= arduino
96
+HARDWARE_SUB_VARIANT ?= standard
96
 MCU              ?= atmega328p
97
 MCU              ?= atmega328p
97
 
98
 
98
 #Gen6
99
 #Gen6
181
 VPATH += $(ARDUINO_INSTALL_DIR)/libraries/LiquidCrystal
182
 VPATH += $(ARDUINO_INSTALL_DIR)/libraries/LiquidCrystal
182
 VPATH += $(ARDUINO_INSTALL_DIR)/libraries/SPI
183
 VPATH += $(ARDUINO_INSTALL_DIR)/libraries/SPI
183
 ifeq ($(HARDWARE_VARIANT), arduino)
184
 ifeq ($(HARDWARE_VARIANT), arduino)
184
-VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/variants/mega
185
+HARDWARE_SUB_VARIANT ?= mega
186
+VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/variants/$(HARDWARE_SUB_VARIANT)
185
 endif
187
 endif
186
 SRC = wiring.c \
188
 SRC = wiring.c \
187
 	wiring_analog.c wiring_digital.c \
189
 	wiring_analog.c wiring_digital.c \
365
 	$P $(CC) $(ALL_CXXFLAGS) -Wl,--gc-sections -o $@ -L. $(OBJ) $(LDFLAGS)
367
 	$P $(CC) $(ALL_CXXFLAGS) -Wl,--gc-sections -o $@ -L. $(OBJ) $(LDFLAGS)
366
 
368
 
367
 $(BUILD_DIR)/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
369
 $(BUILD_DIR)/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
368
-	$(Pecho) "  CC    $@"
370
+	$(Pecho) "  CC    $<"
369
 	$P $(CC) -MMD -c $(ALL_CFLAGS) $< -o $@
371
 	$P $(CC) -MMD -c $(ALL_CFLAGS) $< -o $@
370
 
372
 
371
 $(BUILD_DIR)/%.o: $(BUILD_DIR)/%.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
373
 $(BUILD_DIR)/%.o: $(BUILD_DIR)/%.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
372
-	$(Pecho) "  CXX   $@"
374
+	$(Pecho) "  CXX   $<"
373
 	$P $(CXX) -MMD -c $(ALL_CXXFLAGS) $< -o $@
375
 	$P $(CXX) -MMD -c $(ALL_CXXFLAGS) $< -o $@
374
 
376
 
375
 $(BUILD_DIR)/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
377
 $(BUILD_DIR)/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
376
-	$(Pecho) "  CXX   $@"
378
+	$(Pecho) "  CXX   $<"
377
 	$P $(CXX) -MMD -c $(ALL_CXXFLAGS) $< -o $@
379
 	$P $(CXX) -MMD -c $(ALL_CXXFLAGS) $< -o $@
378
 
380
 
379
 
381
 

Loading…
Cancel
Save