Remove boot-targets, have all depend on rootfs.img
- Seems like our dependency graph is actually not broken these days, and
there's no funny interdependence between u-boot and the kernel build
since they're done in pbuilder. It's now possible to run a build from
scratch just depending on rootfs.img, so clean up the messiness of
boot-targets.
Change-Id: Iaff45157f44a908c594ac38b6066344f9c516bac
diff --git a/Makefile b/Makefile
index fa7fbc2..83be4c4 100644
--- a/Makefile
+++ b/Makefile
@@ -29,43 +29,7 @@
@mkdir -p $(PRODUCT_OUT)/obj
@mkdir -p $(ROOTDIR)/cache
-all: boot-targets
-
-# We explicitly sequence these since they cannot be properly parallelized. The
-# u-boot and kernel build systems, in particular, do not play well together for
-# various odd reasons (duplicate targets such as depcheck, etc.)
-boot-targets:
- $(LOG) boot-targets started
- @echo
- @echo ==============================================================================
- @echo ==================== u-boot
- @echo ==============================================================================
- @echo
- +make -f $(ROOTDIR)/build/Makefile u-boot
- @echo
- @echo ==============================================================================
- @echo ==================== boot
- @echo ==============================================================================
- @echo
- +make -f $(ROOTDIR)/build/Makefile boot
- @echo
- @echo ==============================================================================
- @echo ==================== partition-table
- @echo ==============================================================================
- @echo
- +make -f $(ROOTDIR)/build/Makefile partition-table
- @echo
- @echo ==============================================================================
- @echo ==================== rootfs
- @echo ==============================================================================
- @echo
- +make -f $(ROOTDIR)/build/Makefile rootfs
- @echo
- @echo ==============================================================================
- @echo ==================== successful build
- @echo ==============================================================================
- @echo
- $(LOG) boot-targets finished
+all: $(PRODUCT_OUT)/rootfs.img
help: targets
targets::
diff --git a/boot.mk b/boot.mk
index 9d6467c..6732a06 100644
--- a/boot.mk
+++ b/boot.mk
@@ -20,7 +20,7 @@
boot: $(PRODUCT_OUT)/boot.img
-$(PRODUCT_OUT)/boot.img:
+$(PRODUCT_OUT)/boot.img: | out-dirs
$(LOG) boot fallocate
fallocate -l $(BOOT_SIZE_MB)M $@
mkfs.ext2 -F $@
