From 5abb056cb2bb9bb03ca0569ecaf6bd8623c7b992 Mon Sep 17 00:00:00 2001
From: Jouni Ukkonen <jouni.ukkonen@unikie.com>
Date: Tue, 23 Jul 2024 15:24:32 +0300
Subject: [PATCH] tools/imx9: add support for norimages

fetch fspi header and fcb generation script,
using mkimage generate nor bootable image.

Signed-off-by: Jouni Ukkonen <jouni.ukkonen@unikie.com>
---
 .gitignore               |  1 +
 tools/imx9/Config.mk     | 20 ++++++++++++++++++++
 tools/imx9/Makefile.host |  2 ++
 3 files changed, 23 insertions(+)

diff --git a/.gitignore b/.gitignore
index 10b8f6f46c77d..c8cdf5959b242 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@ tools/gdb/__pycache__
 .ccls-cache
 compile_commands.json
 imx9-sdimage.img
+imx9-norimage.img
diff --git a/tools/imx9/Config.mk b/tools/imx9/Config.mk
index 70e32262035ba..6221cd76620ac 100644
--- a/tools/imx9/Config.mk
+++ b/tools/imx9/Config.mk
@@ -26,6 +26,7 @@
 
 ifeq ($(CONFIG_IMX9_BOOTLOADER),y)
 	MK_BASE_URL = https://raw.githubusercontent.com/nxp-imx/imx-mkimage/cbb99377cc2bb8f7cf213794c030e1c60423ef1f/src
+	MK_SCRIPTS_URL = https://raw.githubusercontent.com/nxp-imx/imx-mkimage/cbb99377cc2bb8f7cf213794c030e1c60423ef1f/scripts
 	BASE_PATH = $(TOPDIR)$(DELIM)tools$(DELIM)imx9$(DELIM)
 	FILE_1 = imx8qxb0.c
 	FILE_1_PATH = $(BASE_PATH)$(FILE_1)
@@ -38,11 +39,17 @@ ifeq ($(CONFIG_IMX9_BOOTLOADER),y)
 	AHAB = firmware-ele-imx-0.1.1
 	AHAB_BINARY = $(AHAB).bin
 	AHAB_PATH = $(BASE_PATH)$(AHAB_BINARY)
+	FSPI_HEADER = fspi_header
+	FSPI_HEADER_PATH = $(BASE_PATH)$(FSPI_HEADER)
+	FCB_TOOL = fspi_fcb_gen.sh
+	FCB_TOOL_PATH = $(BASE_PATH)$(FCB_TOOL)
 
 define DOWNLOAD_FILES
 	$(call DOWNLOAD,$(MK_BASE_URL),$(FILE_1),$(FILE_1_PATH))
 	$(call DOWNLOAD,$(MK_BASE_URL),$(FILE_2),$(FILE_2_PATH))
 	$(call DOWNLOAD,$(MK_BASE_URL),$(FILE_3),$(FILE_3_PATH))
+	$(call DOWNLOAD,$(MK_SCRIPTS_URL),$(FSPI_HEADER),$(FSPI_HEADER_PATH))
+	$(call DOWNLOAD,$(MK_SCRIPTS_URL),$(FCB_TOOL),$(FCB_TOOL_PATH))
 	$(call DOWNLOAD,$(AHAB_BASE_URL),$(AHAB_BINARY),$(AHAB_PATH))
 	$(Q) chmod a+x $(BASE_PATH)$(AHAB_BINARY)
 	$(Q) (cd $(BASE_PATH) && ./$(AHAB_BINARY) --auto-accept)
@@ -69,6 +76,19 @@ define POSTBUILD
 	$(Q) rm flash.bin
 	$(Q) echo "imx9-sdimage.img" >> nuttx.manifest
 	$(Q) echo "Created imx9-sdimage.img"
+
+	$(Q) tools$(DELIM)imx9$(DELIM)mkimage_imx9$(HOSTEXEEXT) -soc IMX9 -dev flexspi -append $(BASE_PATH)$(AHAB)$(DELIM)mx93a1-ahab-container.img -c -ap nuttx.bin a55 0x2049a000 -fcb fcb.bin 0x204F0000 -out flash.bin 1>/dev/null 2>&1
+	$(Q) mv flash.bin flash.tmp
+	$(Q) sh tools$(DELIM)imx9$(DELIM)fspi_fcb_gen.sh tools$(DELIM)imx9$(DELIM)/fspi_header
+
+	$(Q) dd if=fcb.bin of=flash.bin bs=1k seek=1
+	$(Q) dd if=flash.tmp of=flash.bin bs=1k seek=4
+	$(Q) rm flash.tmp
+	$(Q) echo "Append FCB to flash.bin"
+	$(Q) cp flash.bin  imx9-norimage.img
+	$(Q) rm flash.bin
+	$(Q) echo "imx9-norimage.img" >> nuttx.manifest
+	$(Q) echo "Created imx9-norimage.img"
 	$(Q) $(MAKE) -C $(TOPDIR)$(DELIM)tools$(DELIM)imx9 -f Makefile.host clean
 endef
 endif
diff --git a/tools/imx9/Makefile.host b/tools/imx9/Makefile.host
index aedbc2bcfb52c..a63056ca5945e 100644
--- a/tools/imx9/Makefile.host
+++ b/tools/imx9/Makefile.host
@@ -42,6 +42,8 @@ endif
 	$(call DELFILE, imx8qxb0.c)
 	$(call DELFILE, mkimage_common.h)
 	$(call DELFILE, build_info.h)
+	$(call DELFILE, fspi_fcb_gen.sh)
+	$(call DELFILE, fspi_header)
 	$(call DELFILE, firmware-ele-imx-0.1.1.bin)
 	$(call DELDIR, firmware-ele-imx-0.1.1)
 	$(call CLEAN)