diff --git a/Makefile b/Makefile index 6964a96c..b974ec5b 100644 --- a/Makefile +++ b/Makefile @@ -52,15 +52,27 @@ export http_proxy .PHONY: all all: disk-ufs.img disk-sdcard.img -rootfs.tar: debos-recipes/qualcomm-linux-debian-rootfs.yaml +rootfs.tar dtbs.tar.gz: debos-recipes/qualcomm-linux-debian-rootfs.yaml $(DEBOS_CMD) $< -disk-ufs.img: debos-recipes/qualcomm-linux-debian-image.yaml rootfs.tar +DISK_UFS_IMAGES := disk-ufs.img \ + disk-ufs.img1 \ + disk-ufs.img2 + +$(DISK_UFS_IMAGES): debos-recipes/qualcomm-linux-debian-image.yaml rootfs.tar $(DEBOS_CMD) $< -disk-sdcard.img: debos-recipes/qualcomm-linux-debian-image.yaml rootfs.tar +DISK_SDCARD_IMAGES := disk-sdcard.img \ + disk-sdcard.img1 \ + disk-sdcard.img2 + +$(DISK_SDCARD_IMAGES): debos-recipes/qualcomm-linux-debian-image.yaml rootfs.tar $(DEBOS_CMD) -t imagetype:sdcard $< +.PHONY: flash +flash: debos-recipes/qualcomm-linux-debian-flash.yaml dtbs.tar.gz + $(DEBOS_CMD) $< + .PHONY: test test: disk-ufs.img # rootfs/ is a build artifact, so should not be scanned for tests @@ -68,7 +80,7 @@ test: disk-ufs.img .PHONY: clean clean: - rm -f disk-ufs.img1 disk-ufs.img2 disk-ufs.img - rm -f disk-sdcard.img1 disk-sdcard.img2 disk-sdcard.img + rm -f $(DISK_UFS_IMAGES) + rm -f $(DISK_SDCARD_IMAGES) rm -f rootfs.tar rm -f dtbs.tar.gz diff --git a/README.md b/README.md index 9a7b6d8a..93547ad8 100644 --- a/README.md +++ b/README.md @@ -102,13 +102,13 @@ To build flashable assets for all supported boards, follow these steps: 1. build flashable assets from downloaded boot binaries, the DTBs, and pointing at the UFS/SD card disk images ```bash - debos debos-recipes/qualcomm-linux-debian-flash.yaml + make flash # (optional) if you've built U-Boot for the RB1, run this instead: - #debos -t u_boot_rb1:u-boot/rb1-boot.img debos-recipes/qualcomm-linux-debian-flash.yaml + #EXTRA_DEBOS_OPTS="-t u_boot_rb1:u-boot/rb1-boot.img" make flash # (optional) build only a subset of boards: - #debos -t target_boards:qcs615-ride,qcs6490-rb3gen2-vision-kit debos-recipes/qualcomm-linux-debian-flash.yaml + #EXTRA_DEBOS_OPTS="-t target_boards:qcs615-ride,qcs6490-rb3gen2-vision-kit" make flash ``` 1. enter Emergency Download Mode (see section below) and flash the resulting images with QDL