[PATCH v1] imx: mkimage_fit_atf: replace @ with hyphen

[Oliver Graute]

Unit addresses are not allowed anymore in a FIT image since

commit 3f04db891a35 ("image: Check for unit addresses in FITs")

This caused this error on mkimage creation:

./tools/mkimage: verify_header failed for FIT Image support with exit code 1
Makefile:1393: recipe for target 'u-boot.itb' failed
make: *** [u-boot.itb] Error 1

replacing @ with hyphen solved the issue

Signed-off-by: Oliver Graute <oliver.graute at kococonnector.com>
Cc: Stefano Babic <sbabic at denx.de>
Cc: Fabio Estevam <festevam at gmail.com>
Cc: Peng Fan <peng.fan at nxp.com>
Cc: Simon Glass <sjg at chromium.org>
Cc: uboot-imx <uboot-imx at nxp.com>
---
 arch/arm/mach-imx/mkimage_fit_atf.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach-imx/mkimage_fit_atf.sh
index fe12b7bb4b..c5fb9b0fc3 100755
--- a/arch/arm/mach-imx/mkimage_fit_atf.sh
+++ b/arch/arm/mach-imx/mkimage_fit_atf.sh
@@ -53,7 +53,7 @@ cat << __HEADER_EOF
 	description = "Configuration to load ATF before U-Boot";
 
 	images {
-		uboot at 1 {
+		uboot-1 {
 			description = "U-Boot (64-bit)";
 			os = "u-boot";
 			data = /incbin/("$BL33");
@@ -68,7 +68,7 @@ cnt=1
 for dtname in $*
 do
 	cat << __FDT_IMAGE_EOF
-		fdt@$cnt {
+		fdt-$cnt {
 			description = "$(basename $dtname .dtb)";
 			data = /incbin/("$dtname");
 			type = "flat_dt";
@@ -79,7 +79,7 @@ cnt=$((cnt+1))
 done
 
 cat << __HEADER_EOF
-		atf at 1 {
+		atf-1 {
 			description = "ARM Trusted Firmware";
 			os = "arm-trusted-firmware";
 			data = /incbin/("$BL31");
@@ -93,7 +93,7 @@ __HEADER_EOF
 
 if [ -f $BL32 ]; then
 cat << __HEADER_EOF
-		tee at 1 {
+		tee-1 {
 			description = "TEE firmware";
 			data = /incbin/("$BL32");
 			type = "firmware";
@@ -108,7 +108,7 @@ fi
 cat << __CONF_HEADER_EOF
 	};
 	configurations {
-		default = "config at 1";
+		default = "config-1";
 
 __CONF_HEADER_EOF
 
@@ -117,20 +117,20 @@ for dtname in $*
 do
 if [ -f $BL32 ]; then
 cat << __CONF_SECTION_EOF
-		config@$cnt {
+		config-$cnt {
 			description = "$(basename $dtname .dtb)";
-			firmware = "uboot at 1";
-			loadables = "atf at 1", "tee at 1";
+			firmware = "uboot-1";
+			loadables = "atf-1", "tee-1";
 			fdt = "fdt@$cnt";
 		};
 __CONF_SECTION_EOF
 else
 cat << __CONF_SECTION1_EOF
-		config@$cnt {
+		config-$cnt {
 			description = "$(basename $dtname .dtb)";
-			firmware = "uboot at 1";
-			loadables = "atf at 1";
-			fdt = "fdt@$cnt";
+			firmware = "uboot-1";
+			loadables = "atf-1";
+			fdt = "fdt-$cnt";
 		};
 __CONF_SECTION1_EOF
 fi
-- 
2.17.1