Skip to content
Snippets Groups Projects
Commit 56259818 authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Jerome Forissier
Browse files

dra7xx: Update FIT image name to match latest U-Boot default


The default name for our kernel/dtb/OP-TEE FIT image has changed
from fitImage.itb to fitImage. Update this here.

Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Reviewed-by: default avatarJoakim Bech <joakim.bech@linaro.org>
parent c69a4930
No related branches found
No related tags found
No related merge requests found
...@@ -153,6 +153,6 @@ filelist-tee: filelist-tee-common u-boot build-fit ...@@ -153,6 +153,6 @@ filelist-tee: filelist-tee-common u-boot build-fit
@echo "file /boot/MLO $(UBOOT_SPL) 644 0 0" >> $(GEN_ROOTFS_FILELIST) @echo "file /boot/MLO $(UBOOT_SPL) 644 0 0" >> $(GEN_ROOTFS_FILELIST)
@echo "file /boot/u-boot.img $(UBOOT_IMG) 644 0 0" >> $(GEN_ROOTFS_FILELIST) @echo "file /boot/u-boot.img $(UBOOT_IMG) 644 0 0" >> $(GEN_ROOTFS_FILELIST)
@echo "file /boot/uEnv.txt $(UBOOT_ENV) 644 0 0" >> $(GEN_ROOTFS_FILELIST) @echo "file /boot/uEnv.txt $(UBOOT_ENV) 644 0 0" >> $(GEN_ROOTFS_FILELIST)
@echo "file /boot/fitImage.itb $(STAGING_AREA)/fitImage.itb 644 0 0" >> $(GEN_ROOTFS_FILELIST) @echo "file /boot/fitImage $(STAGING_AREA)/fitImage 644 0 0" >> $(GEN_ROOTFS_FILELIST)
update_rootfs: update_rootfs-common update_rootfs: update_rootfs-common
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# as an initramfs) into a FIT image tree blob for loading through U-Boot on a # as an initramfs) into a FIT image tree blob for loading through U-Boot on a
# TI High Security (HS) SoC. # TI High Security (HS) SoC.
# #
# Copyright (C) 2016, Texas Instruments, Incorporated - http://www.ti.com/ # Copyright (C) 2016-2017, Texas Instruments, Incorporated - http://www.ti.com/
# Andreas Dannenberg <dannenberg@ti.com> # Andreas Dannenberg <dannenberg@ti.com>
# Andrew F. Davis <afd@ti.com> # Andrew F. Davis <afd@ti.com>
# #
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
# published by the Free Software Foundation. # published by the Free Software Foundation.
# #
ITS ?= fitImage.its ITB ?= fitImage
ITB ?= $(ITS:.its=.itb) ITS ?= $(ITB:=.its)
SEC_IMAGES := $(shell sed -n 's/.*\/incbin\/.*\"\(.*\.sec\)\".*/\1/p' $(ITS)) SEC_IMAGES := $(shell sed -n 's/.*\/incbin\/.*\"\(.*\.sec\)\".*/\1/p' $(ITS))
...@@ -42,7 +42,7 @@ endif ...@@ -42,7 +42,7 @@ endif
# Use the mkimage tool that comes with U-Boot to make sure we have the latest/ # Use the mkimage tool that comes with U-Boot to make sure we have the latest/
# greatest as we are using advanced features such as FIT... # greatest as we are using advanced features such as FIT...
MKIMAGE ?= mkimage MKIMAGE ?= mkimage
%.itb: %.its $(SEC_IMAGES) $(ITB): $(ITS) $(SEC_IMAGES)
$(MKIMAGE) -f $< -r $@ $(MKIMAGE) -f $< -r $@
.PHONY: clean .PHONY: clean
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment