Fix make zips for DevoF4 and DevoF7

PhracturedBlue · web-flow · commit e77217822b0e · 2019-02-18T19:24:52.000-08:00
diff --git a/src/target/tx/devo/devof4-XMS/Makefile.inc b/src/target/tx/devo/devof4-XMS/Makefile.inc
@@ -1,5 +1,6 @@
 FILESYSTEMS := common text
 SCREENSIZE  := text
+DISPLAY_DRIVER := spi/video_ia9211.c
 
 OPTIMIZE_DFU     := 1
 MODULAR          := 0x20004000
@@ -10,8 +11,6 @@ include target/tx/devo/common/Makefile.inc
 ifndef BUILD_TARGET
 
 SRC_C   += $(SDIR)/target/tx/devo/devof7/backlight.c\
-           $(SDIR)/target/tx/devo/devof7/ia9211_map.c \
-           $(SDIR)/target/tx/devo/devof7/lcd.c \
            $(SDIR)/target/tx/devo/devof7/tx_buttons.c \
            $(SDIR)/target/tx/devo/devof7/crc.c
 
diff --git a/src/target/tx/devo/devof4-XMS/devof4-XMS.ld b/src/target/tx/devo/devof4-XMS/devof4-XMS.ld
@@ -1 +1 @@
-INCLUDE target/devof7/devof7.ld
+INCLUDE target/tx/devo/devof7/devof7.ld
diff --git a/src/target/tx/devo/devof4-XMS/devof4-XMS_opt.ld b/src/target/tx/devo/devof4-XMS/devof4-XMS_opt.ld
@@ -1 +1 @@
-INCLUDE target/devof7/devof7_opt.ld
+INCLUDE target/tx/devo/devof7/devof7_opt.ld
diff --git a/src/target/tx/devo/devof4-XMS/protocol.ld b/src/target/tx/devo/devof4-XMS/protocol.ld
@@ -1 +1 @@
-INCLUDE target/devof7/protocol.ld
+INCLUDE target/tx/devo/devof7/protocol.ld
diff --git a/src/target/tx/devo/devof4/Makefile.inc b/src/target/tx/devo/devof4/Makefile.inc
@@ -1,4 +1,5 @@
 SCREENSIZE  := text
+DISPLAY_DRIVER := spi/video_ia9211.c
 FILESYSTEMS := common text
 
 OPTIMIZE_DFU     := 1
@@ -19,8 +20,6 @@ MEDIA_FILES =
 NUM_MODELS ?= 10
 
 SRC_C   += $(SDIR)/target/tx/devo/devof7/backlight.c\
-           $(SDIR)/target/tx/devo/devof7/ia9211_map.c \
-           $(SDIR)/target/tx/devo/devof7/lcd.c \
            $(SDIR)/target/tx/devo/devof7/tx_buttons.c \
            $(SDIR)/target/tx/devo/devof7/crc.c
 
diff --git a/src/target/tx/devo/devof4/devof4.ld b/src/target/tx/devo/devof4/devof4.ld
@@ -1 +1 @@
-INCLUDE target/devof7/devof7.ld
+INCLUDE target/tx/devo/devof7/devof7.ld
diff --git a/src/target/tx/devo/devof4/devof4_opt.ld b/src/target/tx/devo/devof4/devof4_opt.ld
@@ -1 +1 @@
-INCLUDE target/devof7/devof7_opt.ld
+INCLUDE target/tx/devo/devof7/devof7_opt.ld
diff --git a/src/target/tx/devo/devof4/protocol.ld b/src/target/tx/devo/devof4/protocol.ld
@@ -1 +1 @@
-INCLUDE target/devof7/protocol.ld
+INCLUDE target/tx/devo/devof7/protocol.ld
diff --git a/src/target/tx/devo/devof7-XMS/devof7-XMS.ld b/src/target/tx/devo/devof7-XMS/devof7-XMS.ld
@@ -1 +1 @@
-INCLUDE target/devof7/devof7.ld
+INCLUDE target/tx/devo/devof7/devof7.ld
diff --git a/src/target/tx/devo/devof7-XMS/devof7-XMS_opt.ld b/src/target/tx/devo/devof7-XMS/devof7-XMS_opt.ld
@@ -1 +1 @@
-INCLUDE target/devof7/devof7_opt.ld
+INCLUDE target/tx/devo/devof7/devof7_opt.ld
diff --git a/src/target/tx/devo/devof7-XMS/protocol.ld b/src/target/tx/devo/devof7-XMS/protocol.ld
@@ -1 +1 @@
-INCLUDE target/devof7/protocol.ld
+INCLUDE target/tx/devo/devof7/protocol.ld

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-INCLUDE target/devof7/devof7.ld`
	`1`	`+INCLUDE target/tx/devo/devof7/devof7.ld`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-INCLUDE target/devof7/devof7_opt.ld`
	`1`	`+INCLUDE target/tx/devo/devof7/devof7_opt.ld`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-INCLUDE target/devof7/protocol.ld`
	`1`	`+INCLUDE target/tx/devo/devof7/protocol.ld`