Use correct kernel image with Trusty

Author: Gulshan Singh

Makefile

@@ -405,6 +405,7 @@ TRUSTY_SRC ?= $(ROOT_DIR)/trusty
 TRUSTY_TARGET ?= qemu-generic-arm64-test-debug
 TRUSTY_BUILD_ROOT ?= $(OUT_DIR)/trusty
 TRUSTY_OUT := $(TRUSTY_BUILD_ROOT)/build-$(TRUSTY_TARGET)
+TRUSTY_KERNEL_IMAGE := $(TRUSTY_OUT)/linux-build/arch/arm64/boot/Image
 
 QEMU_BRANCH := stable-7.2
 
@@ -450,7 +451,7 @@ trusty-qemu-init:
 	sed -i 's|include project/qemu-qemu-inc.mk|include $(CONFIG_DIR)/trusty/qemu-qemu-inc.mk|g' $(TRUSTY_SRC)/trusty/device/arm/generic-arm64/project/qemu-inc.mk
 
 .PHONY: trusty
-trusty $(ATF_BL1): | $(TRUSTY_SRC)
+trusty $(ATF_BL1) $(TRUSTY_KERNEL_IMAGE): | $(TRUSTY_SRC)
 	$(BEAR_CMD) $(TRUSTY_SRC)/trusty/vendor/google/aosp/scripts/build.py \
 		--build-root $(TRUSTY_BUILD_ROOT) \
 		--skip-tests $(TRUSTY_TARGET)
@@ -465,6 +466,11 @@ trusty-bl33 $(ATF_BL33): $(UBOOT_BIN)
 trusty_clean:
 	rm -rf $(TRUSTY_OUT)
 
+# When Trusty is enabled, use the kernel image built by Trusty
+ifeq ($(TRUSTY),1)
+  KERNEL_IMAGE := $(TRUSTY_KERNEL_IMAGE)
+endif
+
 ##
 ## Android
 ##
@@ -623,11 +629,6 @@ endif
 
 QEMU_ARGS += -append "$(QEMU_KERNEL_CMDLINE) $(QEMU_EXTRA_KERNEL_CMDLINE)"
 
-# Force using the Trusty kernel image for now, there are boot errors with other images
-ifeq ($(TRUSTY),1)
-  QEMU_KERNEL_IMAGE := $(TRUSTY_OUT)/linux-build/arch/arm64/boot/Image
-endif
-
 RUN_DEPS := $(QEMU_KERNEL_IMAGE)
 RUN_DIR := $(ROOT_DIR)