Renamed platforms to 'native' and 'libftdi' and moved into 'platforms' dir.

2012-06-10 16:40:07 +12:00 · 2012-06-10 16:40:07 +12:00 · 8d190cdbb9
parent c825270561
commit 8d190cdbb9
20 changed files with 6 additions and 8 deletions
--- a/src/Makefile
+++ b/src/Makefile
@ -1,14 +1,12 @@
-ifndef PROBE_HOST
-PROBE_HOST = stm32
-endif
-
-VPATH += $(PROBE_HOST)
+PROBE_HOST ?= native
+PLATFORM_DIR = platforms/$(PROBE_HOST)
+VPATH += $(PLATFORM_DIR)

 BUILDDATE := `date +"%Y%m%d"`

 CFLAGS += -Wall -Wextra -Wno-pointer-sign -Wno-char-subscripts\
 	-O2 -std=gnu99 -g3 -DBUILDDATE=\"$(BUILDDATE)\"\
-	-I. -Iinclude -I$(PROBE_HOST) \
+	-I. -Iinclude -I$(PLATFORM_DIR) \
 	-DVERSION_SUFFIX=\"`../scripts/setlocalversion`\" -MD

 SRC = 	gdb_if.c	\
@ -32,7 +30,7 @@ SRC = 	gdb_if.c	\
 	stm32f4.c	\
 	crc32.c		\

-include $(PROBE_HOST)/Makefile.inc
+include $(PLATFORM_DIR)/Makefile.inc

 OBJ = $(SRC:.c=.o)

--- a/src/platforms/libftdi/Makefile.inc
+++ b/src/platforms/libftdi/Makefile.inc
--- a/src/platforms/libftdi/gdb_if.c
+++ b/src/platforms/libftdi/gdb_if.c
--- a/src/platforms/libftdi/jtagtap.c
+++ b/src/platforms/libftdi/jtagtap.c
--- a/src/platforms/libftdi/platform.c
+++ b/src/platforms/libftdi/platform.c
--- a/src/platforms/libftdi/platform.h
+++ b/src/platforms/libftdi/platform.h
--- a/src/platforms/libftdi/swdptap.c
+++ b/src/platforms/libftdi/swdptap.c
--- a/src/platforms/native/Makefile.inc
+++ b/src/platforms/native/Makefile.inc
@ -4,7 +4,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy

 CFLAGS += -Istm32/include -mcpu=cortex-m3 -mthumb -DSTM32F1
 LDFLAGS_BOOT = -lopencm3_stm32f1 -Wl,--defsym,_stack=0x20005000 \
-	-Wl,-T,stm32/blackmagic.ld -nostartfiles -lc -lnosys -Wl,-Map=mapfile \
+	-Wl,-T,$(PLATFORM_DIR)/blackmagic.ld -nostartfiles -lc -lnosys -Wl,-Map=mapfile \
 	-mthumb -mcpu=cortex-m3 -Wl,-gc-sections
 LDFLAGS = $(LDFLAGS_BOOT) -Wl,-Ttext=0x8002000

--- a/src/platforms/native/blackmagic.ld
+++ b/src/platforms/native/blackmagic.ld
--- a/src/platforms/native/cdcacm.c
+++ b/src/platforms/native/cdcacm.c
--- a/src/platforms/native/gdb_if.c
+++ b/src/platforms/native/gdb_if.c
--- a/src/platforms/native/jtagtap.c
+++ b/src/platforms/native/jtagtap.c
--- a/src/platforms/native/platform.c
+++ b/src/platforms/native/platform.c
--- a/src/platforms/native/platform.h
+++ b/src/platforms/native/platform.h
--- a/src/platforms/native/swdptap.c
+++ b/src/platforms/native/swdptap.c
--- a/src/platforms/native/traceswo.c
+++ b/src/platforms/native/traceswo.c
--- a/src/platforms/native/traceswo.h
+++ b/src/platforms/native/traceswo.h
--- a/src/platforms/native/usbdfu.c
+++ b/src/platforms/native/usbdfu.c
--- a/src/platforms/native/usbuart.c
+++ b/src/platforms/native/usbuart.c
--- a/src/platforms/native/usbuart.h
+++ b/src/platforms/native/usbuart.h