fixed conflict

.gitignore

@@ -1,5 +1,9 @@
+*.user
+*~
+old/
 # Object files
 *.o
+*.d
 *.ko
 *.obj
 *.elf
@@ -23,6 +27,8 @@
 # Executables
 *.exe
 *.out
+*.elf
+*.bin
 *.app
 *.i*86
 *.x86_64
@@ -37,3 +43,7 @@
 
 # Debug files
 *.dSYM/
+
+# misc
+dump*
+*.swp

Makefile

@@ -1,33 +1,30 @@
-#
-CC = sdcc
-CFLAGS = --model-small --opt-code-speed -I /usr/share/sdcc/include
-LDFLAGS_FLASH = \
---out-fmt-ihx \
---code-loc 0x000 --code-size 0x4000 \
---xram-loc 0xf000 --xram-size 0x300 \
---iram-size 0x100
-ifdef DEBUG
-CFLAGS += --debug
+#select target. supported: {VD5M, D4RII}
+TARGET ?= USKY
+#TARGET ?= VD5M
+#TARGET ?= D4RII
+
+ASFLAGS = -g
+GENERIC_SRCS  = main.c debug.c assert.c clocksource.c timeout.c wdt.c delay.c frsky.c spi.c cc25xx.c 
+GENERIC_SRCS += io.c storage.c failsafe.c ppm.c adc.c sbus.c apa102.c soft_spi.c soft_serial.c telemetry.c
+
+#a special file can trigger the use of a fixed id (see storage.c)
+#i use this during development to avoid uneccessary re-binding for vd5m targets
+ifneq ($(wildcard .use_fixed_id),)
+CFLAGS += -DFRSKY_USE_FIXED_ID
 endif
-SRC = main.c uart.c delay.c clocksource.c frsky.c timeout.c adc.c dma.c wdt.c storage.c flash.c ppm.c apa102.c soft_spi.c failsafe.c sbus.c
-ADB=$(SRC:.c=.adb)
-ASM=$(SRC:.c=.asm)
-LNK=$(SRC:.c=.lnk)
-LST=$(SRC:.c=.lst)
-REL=$(SRC:.c=.rel)
-RST=$(SRC:.c=.rst)
-SYM=$(SRC:.c=.sym)
-PROGS=main.hex
-PCDB=$(PROGS:.hex=.cdb)
-PLNK=$(PROGS:.hex=.lnk)
-PMAP=$(PROGS:.hex=.map)
-PMEM=$(PROGS:.hex=.mem)
-PAOM=$(PROGS:.hex=)
-%.rel : %.c
-	$(CC) -c $(CFLAGS) -o$*.rel $<
-all: $(PROGS)
-main.hex: $(REL) Makefile
-	$(CC) $(LDFLAGS_FLASH) $(CFLAGS) -o main.hex $(REL)
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROGS) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
+
+ifeq ($(TARGET),D4RII)
+  include board/d4rii/Makefile.board
+else
+  ifeq ($(TARGET),VD5M)
+    include board/vd5m/Makefile.board
+  else
+    ifeq ($(TARGET),USKY)
+      include board/usky/Makefile.board
+    else
+      $(error UNSUPPORTED Target ($(TARGET)) given. aborting)
+    endif
+  endif
+endif
+
+all  : board