Преглед изворни кода

add dfu util to container, enable usb in container (#229)

* add dfu util to container, enable usb in container
* add DFU_SERIAL env
coreglitch пре 5 година
родитељ
комит
748f7e4fc3
3 измењених фајлова са 9 додато и 2 уклоњено
  1. 1 1
      docker-compose.yml
  2. 7 0
      docker/Dockerfile
  3. 1 1
      make/rules.mk

+ 1 - 1
docker-compose.yml

@@ -8,7 +8,7 @@ services:
     stdin_open: true
     volumes:
       - .:/project
-#      - /dev/bus/usb:/dev/bus/usb
+      - /dev/bus/usb:/dev/bus/usb
     working_dir: "/project"
     environment:
       DISPLAY: $DISPLAY

+ 7 - 0
docker/Dockerfile

@@ -59,6 +59,13 @@ RUN apt update && \
     wget http://mirrors.kernel.org/ubuntu/pool/universe/g/gdb-arm-none-eabi/gdb-arm-none-eabi_7.10-1ubuntu3+9_amd64.deb && \
     dpkg -i gdb-arm-none-eabi_7.10-1ubuntu3+9_amd64.deb
 
+# dfu-util
+
+RUN apt update && \
+    apt install -y --no-install-recommends \
+        dfu-util \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
 COPY entrypoint.sh syntax_check.sh /
 
 RUN chmod +x /syntax_check.sh

+ 1 - 1
make/rules.mk

@@ -59,7 +59,7 @@ $(OBJ_DIR)/flash: $(OBJ_DIR)/$(PROJECT).bin
 	touch $@
 
 $(OBJ_DIR)/upload: $(OBJ_DIR)/$(PROJECT).bin
-	dfu-util -D $(OBJ_DIR)/$(PROJECT).bin -a 0 -s $(FLASH_ADDRESS):leave
+	dfu-util -D $(OBJ_DIR)/$(PROJECT).bin -a 0 -s $(FLASH_ADDRESS) -S $(DFU_SERIAL)
 	touch $@
 
 $(ASSETS): $(ASSETS_SOURCES)