Fix build, small proto tweak.
This commit is contained in:
+4
-1
@@ -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)
|
||||
|
||||
|
||||
+4
-1
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user