Move fuse variables to general settings and minor naming fixes

Makefile

@@ -10,10 +10,9 @@
 
 VERBOSE   := false
 ARCH      := m1284
-#FREQ     := 18432000UL
-FREQ      := 8000000UL
 MCU       := atmega1284p
-ASP       := usbasp
+FREQ      := 8000000UL
+ISP       := usbasp
 CC        := avr-gcc
 LD        := $(CC)
 OBJCOPY   := avr-objcopy
@@ -23,6 +22,11 @@ MKDIR     := mkdir -p
 RMR       := rm -rf
 GIT       := git
 
+LFUSE     := 0xC2
+HFUSE     := 0x97
+EFUSE     := 0xFF
+LOCK      := 0xFF
+
 SRCDIR    := src
 BINDIR    := bin
 TMPDIR    := $(BINDIR)/build
@@ -47,7 +51,7 @@ OBJECTS   := $(FILES:%.c=$(TMPDIR)/%.o)
 DEPENDS   := $(FILES:%.c=$(TMPDIR)/%.d)
 
 # ==============================================================================
-# AUXILIARY TARGETS (AND FUSE SETTINGS)
+# AUXILIARY TARGETS
 # ==============================================================================
 
 .PHONY: all
@@ -56,32 +60,16 @@ all: flash
 .PHONY: flash
 flash: $(TARGET)
 	$(E) "[AVD] Flashing..."
-	$(Q) $(AVD) -l $(LOGFILE)    \
-	       -c $(ASP) -p $(ARCH)  \
-	       -U lfuse:w:0xC2:m     \
-	       -U hfuse:w:0x97:m     \
-	       -U efuse:w:0xFF:m     \
-	       -U lock:w:0xFF:m      \
+	$(Q) $(AVD) -l $(LOGFILE)     \
+	       -c $(ISP) -p $(ARCH)   \
+	       -U lfuse:w:$(LFUSE):m  \
+	       -U hfuse:w:$(HFUSE):m  \
+	       -U efuse:w:$(EFUSE):m  \
+	       -U lock:w:$(LOCK):m    \
 	       -U flash:w:$<
 
-.PHONY: clean
-clean:
-	$(E) "[REM] $(TARGET)"
-	$(Q) $(RMR) $(TARGET)
-	$(E) "[REM] $(ELFFILE)"
-	$(Q) $(RMR) $(ELFFILE)
-	$(E) "[REM] $(LOGFILE)"
-	$(Q) $(RMR) $(LOGFILE)
-	$(E) "[REM] $(TMPDIR)"
-	$(Q) $(RMR) $(TMPDIR)
-
-.PHONY: distclean
-distclean: clean
-	$(E) "[REM] $(BINDIR)"
-	$(Q) $(RMR) $(BINDIR)
-
 .PHONY: check
-check:
+check: # Will be added at later stage
 	$(E) "[CHK] Not implemented."
 	$(Q) true
 
@@ -100,6 +88,22 @@ webgui: opt/webgui/Makefile
 	$(E) "[MAK] $<"
 	$(Q) $(MAKE) -sC $(<D)
 
+.PHONY: clean
+clean:
+	$(E) "[REM] $(TARGET)"
+	$(Q) $(RMR) $(TARGET)
+	$(E) "[REM] $(ELFFILE)"
+	$(Q) $(RMR) $(ELFFILE)
+	$(E) "[REM] $(LOGFILE)"
+	$(Q) $(RMR) $(LOGFILE)
+	$(E) "[REM] $(TMPDIR)"
+	$(Q) $(RMR) $(TMPDIR)
+
+.PHONY: distclean
+distclean: clean
+	$(E) "[REM] $(BINDIR)"
+	$(Q) $(RMR) $(BINDIR)
+
 $(TMPDIRS):
 	$(E) "[DIR] $@"
 	$(Q) $(MKDIR) $@