diff options
author | Alistair Strachan | 2018-10-24 15:44:15 -0500 |
---|---|---|
committer | android-build-merger | 2018-10-24 15:44:15 -0500 |
commit | 72a94c0b77299edeb3ce7abb9cc68a8ad3fa1beb (patch) | |
tree | 8ea5f8908e8f85d2432d244519ea32a328159828 | |
parent | f947e01c1096ee3b6b1e3cb021686cd3b207cd00 (diff) | |
parent | b3d9b039ffa7b7f777f01d071bc4966f9487b1e0 (diff) | |
download | device-ti-beagle-x15-72a94c0b77299edeb3ce7abb9cc68a8ad3fa1beb.tar.gz device-ti-beagle-x15-72a94c0b77299edeb3ce7abb9cc68a8ad3fa1beb.tar.xz device-ti-beagle-x15-72a94c0b77299edeb3ce7abb9cc68a8ad3fa1beb.zip |
Fix a race in BOOTIMG_FIT Makefile am: 351e677636
am: b3d9b039ff
Change-Id: Ic98db501c8b4e2d13c297b1e6d4528dc3aa7cf8c
-rw-r--r-- | boot_fit/Android.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/boot_fit/Android.mk b/boot_fit/Android.mk index 2cf6ef0..c16ccfe 100644 --- a/boot_fit/Android.mk +++ b/boot_fit/Android.mk | |||
@@ -6,17 +6,22 @@ DTC := $(HOST_OUT_EXECUTABLES)/dtc | |||
6 | BOARD_DIR := device/ti/beagle_x15 | 6 | BOARD_DIR := device/ti/beagle_x15 |
7 | ITS := beagle_x15.its | 7 | ITS := beagle_x15.its |
8 | BOOTIMG_FIT := $(PRODUCT_OUT)/boot_fit.img | 8 | BOOTIMG_FIT := $(PRODUCT_OUT)/boot_fit.img |
9 | BOOTIMG_FIT_INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel | ||
10 | BOOTIMG_FIT_INSTALLED_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img | ||
9 | 11 | ||
10 | $(BOOTIMG_FIT): PRIVATE_DTC_FLAGS_MKIMAGE = -I dts -O dtb -p 500 -Wno-unit_address_vs_reg | 12 | $(BOOTIMG_FIT): PRIVATE_DTC_FLAGS_MKIMAGE = -I dts -O dtb -p 500 -Wno-unit_address_vs_reg |
11 | $(BOOTIMG_FIT): PRIVATE_INTERMEDIATES := $(call intermediates-dir-for,PACKAGING,fit) | 13 | $(BOOTIMG_FIT): PRIVATE_INTERMEDIATES := $(call intermediates-dir-for,PACKAGING,fit) |
12 | $(BOOTIMG_FIT): PRIVATE_ITS := $(ITS) | 14 | $(BOOTIMG_FIT): PRIVATE_ITS := $(ITS) |
13 | $(BOOTIMG_FIT): PRIVATE_MKIMAGE := $(MKIMAGE) | 15 | $(BOOTIMG_FIT): PRIVATE_MKIMAGE := $(MKIMAGE) |
14 | $(BOOTIMG_FIT): PRIVATE_BOARD_DIR := $(BOARD_DIR) | 16 | $(BOOTIMG_FIT): PRIVATE_BOARD_DIR := $(BOARD_DIR) |
15 | $(BOOTIMG_FIT): $(INSTALLED_KERNEL_TARGET) $(INSTALLED_RAMDISK_TARGET) $(BOARD_DIR)/$(ITS) $(MKIMAGE) $(DTC) $(wildcard $(LOCAL_KERNEL)/*.dtb) | 17 | $(BOOTIMG_FIT): PRIVATE_INSTALLED_KERNEL_TARGET := $(BOOTIMG_FIT_INSTALLED_KERNEL_TARGET) |
18 | $(BOOTIMG_FIT): PRIVATE_INSTALLED_RAMDISK_TARGET := $(BOOTIMG_FIT_INSTALLED_RAMDISK_TARGET) | ||
19 | $(BOOTIMG_FIT): $(BOOTIMG_FIT_INSTALLED_KERNEL_TARGET) $(BOOTIMG_FIT_INSTALLED_RAMDISK_TARGET) | ||
20 | $(BOOTIMG_FIT): $(BOARD_DIR)/$(ITS) $(MKIMAGE) $(DTC) $(wildcard $(LOCAL_KERNEL)/*.dtb) | ||
16 | mkdir -p $(PRIVATE_INTERMEDIATES) | 21 | mkdir -p $(PRIVATE_INTERMEDIATES) |
17 | cp $(PRIVATE_BOARD_DIR)/$(PRIVATE_ITS) $(PRIVATE_INTERMEDIATES)/ | 22 | cp $(PRIVATE_BOARD_DIR)/$(PRIVATE_ITS) $(PRIVATE_INTERMEDIATES)/ |
18 | cp $(INSTALLED_RAMDISK_TARGET) $(PRIVATE_INTERMEDIATES)/ | 23 | cp $(PRIVATE_INSTALLED_RAMDISK_TARGET) $(PRIVATE_INTERMEDIATES)/ |
19 | cp $(INSTALLED_KERNEL_TARGET) $(PRIVATE_INTERMEDIATES)/zImage | 24 | cp $(PRIVATE_INSTALLED_KERNEL_TARGET) $(PRIVATE_INTERMEDIATES)/zImage |
20 | cp $(LOCAL_KERNEL)/*.dtb $(PRIVATE_INTERMEDIATES)/ | 25 | cp $(LOCAL_KERNEL)/*.dtb $(PRIVATE_INTERMEDIATES)/ |
21 | PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(PRIVATE_MKIMAGE) -D "$(PRIVATE_DTC_FLAGS_MKIMAGE)" -f $(PRIVATE_INTERMEDIATES)/$(PRIVATE_ITS) $@ | 26 | PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(PRIVATE_MKIMAGE) -D "$(PRIVATE_DTC_FLAGS_MKIMAGE)" -f $(PRIVATE_INTERMEDIATES)/$(PRIVATE_ITS) $@ |
22 | 27 | ||