diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2014-10-15 14:51:06 +0800 |
|---|---|---|
| committer | bryan newbold <bnewbold@twinleaf.com> | 2014-11-24 15:17:13 -0800 |
| commit | 9daa30c70e3eaf4a95c42f6de055bb6797044c4e (patch) | |
| tree | a4eb879aaf1a796e9fc531ba34f5d1f88d2730fd /wirish | |
| parent | 6b47dac54b478081231b88e6e143a150f341c0cb (diff) | |
| download | librambutan-9daa30c70e3eaf4a95c42f6de055bb6797044c4e.tar.gz librambutan-9daa30c70e3eaf4a95c42f6de055bb6797044c4e.zip | |
Rename various "stm32f2" directories "stm32f2-f4".
Preparatory patch for adding STM32F4 support.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'wirish')
| -rw-r--r-- | wirish/rules.mk | 17 | ||||
| -rw-r--r-- | wirish/stm32f2-f4/boards_setup.cpp (renamed from wirish/stm32f2/boards_setup.cpp) | 0 | ||||
| -rw-r--r-- | wirish/stm32f2-f4/util_hooks.c (renamed from wirish/stm32f2/util_hooks.c) | 0 | ||||
| -rw-r--r-- | wirish/stm32f2-f4/wirish_debug.cpp (renamed from wirish/stm32f2/wirish_debug.cpp) | 0 | ||||
| -rw-r--r-- | wirish/stm32f2-f4/wirish_digital.cpp (renamed from wirish/stm32f2/wirish_digital.cpp) | 0 |
5 files changed, 9 insertions, 8 deletions
diff --git a/wirish/rules.mk b/wirish/rules.mk index 1cac74a..3a1fb81 100644 --- a/wirish/rules.mk +++ b/wirish/rules.mk @@ -4,12 +4,13 @@ dirstack_$(sp) := $(d) d := $(dir) BUILDDIRS += $(BUILD_PATH)/$(d) -# Add board directory and MCU-specific directory to BUILDDIRS. These -# are in subdirectories, but they're logically part of the Wirish -# submodule. +# Add board directory and target-specific directory to +# BUILDDIRS. These are in subdirectories, but they're logically part +# of the Wirish submodule. That's a bit inconsistent with libmaple +# proper, and should be fixed. WIRISH_BOARD_PATH := boards/$(BOARD) BUILDDIRS += $(BUILD_PATH)/$(d)/$(WIRISH_BOARD_PATH) -BUILDDIRS += $(BUILD_PATH)/$(d)/$(MCU_SERIES) +BUILDDIRS += $(BUILD_PATH)/$(d)/$(TARGET_SERIES_MODULE) # Safe includes for Wirish. WIRISH_INCLUDES := -I$(d)/include -I$(d)/$(WIRISH_BOARD_PATH)/include @@ -21,7 +22,7 @@ CFLAGS_$(d) := $(LIBMAPLE_INCLUDES) $(WIRISH_INCLUDES) -I$(d) sSRCS_$(d) := start.S cSRCS_$(d) := start_c.c cSRCS_$(d) += syscalls.c -cSRCS_$(d) += $(MCU_SERIES)/util_hooks.c +cSRCS_$(d) += $(TARGET_SERIES_MODULE)/util_hooks.c cppSRCS_$(d) := boards.cpp cppSRCS_$(d) += cxxabi-compat.cpp cppSRCS_$(d) += ext_interrupts.cpp @@ -38,9 +39,9 @@ cppSRCS_$(d) += wirish_digital.cpp cppSRCS_$(d) += wirish_math.cpp cppSRCS_$(d) += wirish_shift.cpp cppSRCS_$(d) += wirish_time.cpp -cppSRCS_$(d) += $(MCU_SERIES)/boards_setup.cpp -cppSRCS_$(d) += $(MCU_SERIES)/wirish_digital.cpp -cppSRCS_$(d) += $(MCU_SERIES)/wirish_debug.cpp +cppSRCS_$(d) += $(TARGET_SERIES_MODULE)/boards_setup.cpp +cppSRCS_$(d) += $(TARGET_SERIES_MODULE)/wirish_digital.cpp +cppSRCS_$(d) += $(TARGET_SERIES_MODULE)/wirish_debug.cpp cppSRCS_$(d) += $(WIRISH_BOARD_PATH)/board.cpp sFILES_$(d) := $(sSRCS_$(d):%=$(d)/%) diff --git a/wirish/stm32f2/boards_setup.cpp b/wirish/stm32f2-f4/boards_setup.cpp index 5764dd0..5764dd0 100644 --- a/wirish/stm32f2/boards_setup.cpp +++ b/wirish/stm32f2-f4/boards_setup.cpp diff --git a/wirish/stm32f2/util_hooks.c b/wirish/stm32f2-f4/util_hooks.c index 1b519ab..1b519ab 100644 --- a/wirish/stm32f2/util_hooks.c +++ b/wirish/stm32f2-f4/util_hooks.c diff --git a/wirish/stm32f2/wirish_debug.cpp b/wirish/stm32f2-f4/wirish_debug.cpp index af6c78b..af6c78b 100644 --- a/wirish/stm32f2/wirish_debug.cpp +++ b/wirish/stm32f2-f4/wirish_debug.cpp diff --git a/wirish/stm32f2/wirish_digital.cpp b/wirish/stm32f2-f4/wirish_digital.cpp index 4d46f1c..4d46f1c 100644 --- a/wirish/stm32f2/wirish_digital.cpp +++ b/wirish/stm32f2-f4/wirish_digital.cpp |