Cleaned up indent in bootloader makefile

Author: cmaglie

bootloaders/zero/Makefile

@@ -18,38 +18,34 @@
 # -----------------------------------------------------------------------------
 # Paths
 ifeq ($(OS),Windows_NT)
-
   # Are we using mingw/msys/msys2/cygwin?
   ifeq ($(TERM),xterm)
-		T=$(shell cygpath -u $(LOCALAPPDATA))
+    T=$(shell cygpath -u $(LOCALAPPDATA))
     MODULE_PATH?=$(T)/Arduino15/packages/arduino
-    ARM_GCC_PATH?=$(MODULE_PATH)/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-none-eabi-
     RM=rm
     SEP=/
   else
     MODULE_PATH?=$(LOCALAPPDATA)/Arduino15/packages/arduino
-    ARM_GCC_PATH?=$(MODULE_PATH)/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-none-eabi-
     RM=rm
     SEP=\\
   endif
 else
-    UNAME_S := $(shell uname -s)
-
-    ifeq ($(UNAME_S),Linux)
-			MODULE_PATH?=$(HOME)/.arduino15/packages/arduino
-			ARM_GCC_PATH?=$(MODULE_PATH)/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-none-eabi-
-      RM=rm
-	    SEP=/
-    endif
-
-    ifeq ($(UNAME_S),Darwin)
-			MODULE_PATH?=$(HOME)/Library/Arduino15/packages/arduino/
-			ARM_GCC_PATH?=$(MODULE_PATH)/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-none-eabi-
-      RM=rm
-	    SEP=/
-    endif
+  UNAME_S := $(shell uname -s)
+
+  ifeq ($(UNAME_S),Linux)
+    MODULE_PATH?=$(HOME)/.arduino15/packages/arduino
+    RM=rm
+    SEP=/
+  endif
+
+  ifeq ($(UNAME_S),Darwin)
+    MODULE_PATH?=$(HOME)/Library/Arduino15/packages/arduino/
+    RM=rm
+    SEP=/
+  endif
 endif
 
+ARM_GCC_PATH?=$(MODULE_PATH)/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-none-eabi-
 BUILD_PATH=build
 
 # -----------------------------------------------------------------------------
@@ -63,21 +59,21 @@ SIZE=$(ARM_GCC_PATH)size
 # Compiler options
 CFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -c -std=gnu99 -ffunction-sections -fdata-sections -nostdlib -nostartfiles --param max-inline-insns-single=500
 ifdef DEBUG
-CFLAGS+=-g3 -O1 -DDEBUG=1
+  CFLAGS+=-g3 -O1 -DDEBUG=1
 else
-CFLAGS+=-Os -DDEBUG=0
+  CFLAGS+=-Os -DDEBUG=0
 endif
 
 ifeq ($(GENUINO),)
-# Arduino Zero (PID == 0x004D)
-CFLAGS_EXTRA?=-D__SAMD21G18A__ -DUSB_PID_HIGH=0x00 -DUSB_PID_LOW=0x4D -DUSB_VID_LOW=0x41 -DUSB_VID_HIGH=0x23
-# Arduino MKR1000 (PID == 0x004E)
-# CFLAGS_EXTRA?=-D__SAMD21G18A__ -DUSB_PID_HIGH=0x00 -DUSB_PID_LOW=0x4E -DUSB_VID_LOW=0x41 -DUSB_VID_HIGH=0x23 -DSTRING_PRODUCT="\"Arduino MKR1000\""
+  # Arduino Zero (PID == 0x004D)
+  CFLAGS_EXTRA?=-D__SAMD21G18A__ -DUSB_PID_HIGH=0x00 -DUSB_PID_LOW=0x4D -DUSB_VID_LOW=0x41 -DUSB_VID_HIGH=0x23
+  # Arduino MKR1000 (PID == 0x004E)
+  # CFLAGS_EXTRA?=-D__SAMD21G18A__ -DUSB_PID_HIGH=0x00 -DUSB_PID_LOW=0x4E -DUSB_VID_LOW=0x41 -DUSB_VID_HIGH=0x23 -DSTRING_PRODUCT="\"Arduino MKR1000\""
 else
-# Genuino Zero (PID == 0x024D)
-CFLAGS_EXTRA?=-D__SAMD21G18A__ -DUSB_PID_HIGH=0x02 -DUSB_PID_LOW=0x4D -DUSB_VID_LOW=0x41 -DUSB_VID_HIGH=0x23 -DSTRING_PRODUCT="\"Genuino Zero\""
-# Genuino MKR1000 (PID == 0x024E)
-# CFLAGS_EXTRA?=-D__SAMD21G18A__ -DUSB_PID_HIGH=0x02 -DUSB_PID_LOW=0x4E -DUSB_VID_LOW=0x41 -DUSB_VID_HIGH=0x23 -DSTRING_PRODUCT="\"Genuino MKR1000\""
+  # Genuino Zero (PID == 0x024D)
+  CFLAGS_EXTRA?=-D__SAMD21G18A__ -DUSB_PID_HIGH=0x02 -DUSB_PID_LOW=0x4D -DUSB_VID_LOW=0x41 -DUSB_VID_HIGH=0x23 -DSTRING_PRODUCT="\"Genuino Zero\""
+  # Genuino MKR1000 (PID == 0x024E)
+  # CFLAGS_EXTRA?=-D__SAMD21G18A__ -DUSB_PID_HIGH=0x02 -DUSB_PID_LOW=0x4E -DUSB_VID_LOW=0x41 -DUSB_VID_HIGH=0x23 -DSTRING_PRODUCT="\"Genuino MKR1000\""
 endif
 
 INCLUDES=-I"$(MODULE_PATH)/tools/CMSIS/4.0.0-atmel/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS/4.0.0-atmel/Device/ATMEL/"
@@ -90,35 +86,35 @@ LDFLAGS+=-Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbol
 # -----------------------------------------------------------------------------
 # Source files and objects
 SOURCES= \
-board_driver_led.c \
-board_driver_serial.c \
-board_driver_usb.c \
-board_init.c \
-board_startup.c \
-main.c \
-sam_ba_usb.c \
-sam_ba_cdc.c \
-sam_ba_monitor.c \
-sam_ba_serial.c
+  board_driver_led.c \
+  board_driver_serial.c \
+  board_driver_usb.c \
+  board_init.c \
+  board_startup.c \
+  main.c \
+  sam_ba_usb.c \
+  sam_ba_cdc.c \
+  sam_ba_monitor.c \
+  sam_ba_serial.c
 
 OBJECTS=$(addprefix $(BUILD_PATH)/, $(SOURCES:.c=.o))
 DEPS=$(addprefix $(BUILD_PATH)/, $(SOURCES:.c=.d))
 
 ifeq ($(GENUINO),)
-NAME=samd21_sam_ba
+  NAME=samd21_sam_ba
 else
-NAME=samd21_sam_ba_genuino
+  NAME=samd21_sam_ba_genuino
 endif
 ELF=$(NAME).elf
 BIN=$(NAME).bin
 HEX=$(NAME).hex
 
 ifneq "test$(AVRSTUDIO_EXE_PATH)" "test"
-AS_BUILD=copy_for_atmel_studio
-AS_CLEAN=clean_for_atmel_studio
+  AS_BUILD=copy_for_atmel_studio
+  AS_CLEAN=clean_for_atmel_studio
 else
-AS_BUILD=
-AS_CLEAN=
+  AS_BUILD=
+  AS_CLEAN=
 endif
 
 

bootloaders/zero/README.md

@@ -97,4 +97,5 @@ make GENUINO=1
 ```
 make CFLAGS_EXTRA="-D__SAMD21G18A__ -DUSB_PID_HIGH=<your USB PID> -DUSB_PID_LOW=<your USB PID> -DUSB_VID_LOW=<your USB VID> -DUSB_VID_HIGH=<your USB VID>"
 ```
+
 You can also check https://github.com/ameltech/sme-arduino-core/blob/master/hardware/AMEL/samd/bootloaders/sme/Makefile for reference.