aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGareth McMullin2012-06-10 16:40:07 +1200
committerGareth McMullin2012-06-10 16:40:07 +1200
commit8d190cdbb9c4e4377d0c33424e453c5ac166eed8 (patch)
treea8f51180449560e19de7f823e773810c8fde6c7e
parentc82527056147beb170b93ffea2e668eb03022017 (diff)
Renamed platforms to 'native' and 'libftdi' and moved into 'platforms' dir.
-rw-r--r--src/Makefile12
-rw-r--r--src/platforms/libftdi/Makefile.inc (renamed from src/linux/Makefile.inc)0
-rw-r--r--src/platforms/libftdi/gdb_if.c (renamed from src/linux/gdb_if.c)0
-rw-r--r--src/platforms/libftdi/jtagtap.c (renamed from src/linux/jtagtap.c)0
-rw-r--r--src/platforms/libftdi/platform.c (renamed from src/linux/platform.c)0
-rw-r--r--src/platforms/libftdi/platform.h (renamed from src/linux/platform.h)0
-rw-r--r--src/platforms/libftdi/swdptap.c (renamed from src/linux/swdptap.c)0
-rw-r--r--src/platforms/native/Makefile.inc (renamed from src/stm32/Makefile.inc)2
-rw-r--r--src/platforms/native/blackmagic.ld (renamed from src/stm32/blackmagic.ld)0
-rw-r--r--src/platforms/native/cdcacm.c (renamed from src/stm32/cdcacm.c)0
-rw-r--r--src/platforms/native/gdb_if.c (renamed from src/stm32/gdb_if.c)0
-rw-r--r--src/platforms/native/jtagtap.c (renamed from src/stm32/jtagtap.c)0
-rw-r--r--src/platforms/native/platform.c (renamed from src/stm32/platform.c)0
-rw-r--r--src/platforms/native/platform.h (renamed from src/stm32/platform.h)0
-rw-r--r--src/platforms/native/swdptap.c (renamed from src/stm32/swdptap.c)0
-rw-r--r--src/platforms/native/traceswo.c (renamed from src/stm32/traceswo.c)0
-rw-r--r--src/platforms/native/traceswo.h (renamed from src/stm32/traceswo.h)0
-rw-r--r--src/platforms/native/usbdfu.c (renamed from src/stm32/usbdfu.c)0
-rw-r--r--src/platforms/native/usbuart.c (renamed from src/stm32/usbuart.c)0
-rw-r--r--src/platforms/native/usbuart.h (renamed from src/stm32/usbuart.h)0
20 files changed, 6 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile
index 3ba0330..37abb00 100644
--- 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)
diff --git a/src/linux/Makefile.inc b/src/platforms/libftdi/Makefile.inc
index 095b3a7..095b3a7 100644
--- a/src/linux/Makefile.inc
+++ b/src/platforms/libftdi/Makefile.inc
diff --git a/src/linux/gdb_if.c b/src/platforms/libftdi/gdb_if.c
index 4b4f4a5..4b4f4a5 100644
--- a/src/linux/gdb_if.c
+++ b/src/platforms/libftdi/gdb_if.c
diff --git a/src/linux/jtagtap.c b/src/platforms/libftdi/jtagtap.c
index fdfb051..fdfb051 100644
--- a/src/linux/jtagtap.c
+++ b/src/platforms/libftdi/jtagtap.c
diff --git a/src/linux/platform.c b/src/platforms/libftdi/platform.c
index 9690a92..9690a92 100644
--- a/src/linux/platform.c
+++ b/src/platforms/libftdi/platform.c
diff --git a/src/linux/platform.h b/src/platforms/libftdi/platform.h
index 325f67b..325f67b 100644
--- a/src/linux/platform.h
+++ b/src/platforms/libftdi/platform.h
diff --git a/src/linux/swdptap.c b/src/platforms/libftdi/swdptap.c
index be329d8..be329d8 100644
--- a/src/linux/swdptap.c
+++ b/src/platforms/libftdi/swdptap.c
diff --git a/src/stm32/Makefile.inc b/src/platforms/native/Makefile.inc
index 8daed4f..3bddde9 100644
--- a/src/stm32/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
diff --git a/src/stm32/blackmagic.ld b/src/platforms/native/blackmagic.ld
index 9755309..9755309 100644
--- a/src/stm32/blackmagic.ld
+++ b/src/platforms/native/blackmagic.ld
diff --git a/src/stm32/cdcacm.c b/src/platforms/native/cdcacm.c
index ebdef18..ebdef18 100644
--- a/src/stm32/cdcacm.c
+++ b/src/platforms/native/cdcacm.c
diff --git a/src/stm32/gdb_if.c b/src/platforms/native/gdb_if.c
index aa43293..aa43293 100644
--- a/src/stm32/gdb_if.c
+++ b/src/platforms/native/gdb_if.c
diff --git a/src/stm32/jtagtap.c b/src/platforms/native/jtagtap.c
index 3703279..3703279 100644
--- a/src/stm32/jtagtap.c
+++ b/src/platforms/native/jtagtap.c
diff --git a/src/stm32/platform.c b/src/platforms/native/platform.c
index 4aff924..4aff924 100644
--- a/src/stm32/platform.c
+++ b/src/platforms/native/platform.c
diff --git a/src/stm32/platform.h b/src/platforms/native/platform.h
index 56e0b77..56e0b77 100644
--- a/src/stm32/platform.h
+++ b/src/platforms/native/platform.h
diff --git a/src/stm32/swdptap.c b/src/platforms/native/swdptap.c
index 8ac78b2..8ac78b2 100644
--- a/src/stm32/swdptap.c
+++ b/src/platforms/native/swdptap.c
diff --git a/src/stm32/traceswo.c b/src/platforms/native/traceswo.c
index 926a057..926a057 100644
--- a/src/stm32/traceswo.c
+++ b/src/platforms/native/traceswo.c
diff --git a/src/stm32/traceswo.h b/src/platforms/native/traceswo.h
index c5bc0e5..c5bc0e5 100644
--- a/src/stm32/traceswo.h
+++ b/src/platforms/native/traceswo.h
diff --git a/src/stm32/usbdfu.c b/src/platforms/native/usbdfu.c
index 9520c7a..9520c7a 100644
--- a/src/stm32/usbdfu.c
+++ b/src/platforms/native/usbdfu.c
diff --git a/src/stm32/usbuart.c b/src/platforms/native/usbuart.c
index 2fac6ee..2fac6ee 100644
--- a/src/stm32/usbuart.c
+++ b/src/platforms/native/usbuart.c
diff --git a/src/stm32/usbuart.h b/src/platforms/native/usbuart.h
index 0bfa7d6..0bfa7d6 100644
--- a/src/stm32/usbuart.h
+++ b/src/platforms/native/usbuart.h