From 25e5b8ed3bc9b297ff1ab27e74a501ecae3b81c1 Mon Sep 17 00:00:00 2001
From: Kotlin Developer <kotlin@kotlinlang.org>
Date: Sun, 3 Jul 2016 18:02:52 +0000
Subject: [PATCH] Fix build, small proto tweak.

---
 car_fmw/Makefile   | 5 ++++-
 proto/carkot.proto | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/car_fmw/Makefile b/car_fmw/Makefile
index 7d262991428..d879dfddf8f 100644
--- a/car_fmw/Makefile
+++ b/car_fmw/Makefile
@@ -42,9 +42,12 @@ $(CAR_FMW_ELF): $(CAR_FMW_OBJ) $(LIB_STM32F4D_OBJ) \
 	$(LIB_CMSIS_OBJ) $(LIB_STDPERIPH_OBJ)
 	$(CC) $(CFLAGS) $^ -T $(SRC_DIR)/stm32_flash.ld -o $@
 
-$(CAR_FMW_OBJ): $(call dircs_to_prefxd_objs,$(SRC_DIR))
+$(CAR_FMW_OBJ): $(BIN_DIR) $(call dircs_to_prefxd_objs,$(SRC_DIR))
 	$(LD_ALL_DEPS)
 
+$(BIN_DIR):
+	mkdir -p $(BIN_DIR)
+
 $(BIN_DIR)/%.o: $(SRC_DIR)/%.c
 	$(CC_ALL_DEPS)
 
diff --git a/proto/carkot.proto b/proto/carkot.proto
index 81c416ee3ac..1ac2845b717 100644
--- a/proto/carkot.proto
+++ b/proto/carkot.proto
@@ -2,6 +2,7 @@ message Upload {
   message Method {
     enum TYPE {
       DFU = 1;
+      STLINK = 2;
     }
     // Type of upload method.
     optional TYPE type = 1;
@@ -14,8 +15,10 @@ message Upload {
   }
   // Firmware data.
   optional bytes data = 1;
+  // Firmware load address (string, to avoid 64-bit woes).
+  optional string base = 2;
   // Method of firmware upload.
-  optional Method method = 2;
+  optional Method method = 3;
 }
 
 message UploadResult {