From: Peng Fan <peng.fan@nxp.com>
Date: Tue, 16 Oct 2018 04:50:39 +0000 (+0000)
Subject: imx: imx8qxp_mek: update to build image in U-Boot
X-Git-Tag: v2018.11-rc3~6^2~21
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6d9b483f371836ec16d9ee4f85bea53eb05307ae;p=oweals%2Fu-boot.git

imx: imx8qxp_mek: update to build image in U-Boot

Update README
Add imximage.cfg
Update defconfig to include imximage.cfg

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---

diff --git a/board/freescale/imx8qxp_mek/README b/board/freescale/imx8qxp_mek/README
index 7f740894b2..e91e193d11 100644
--- a/board/freescale/imx8qxp_mek/README
+++ b/board/freescale/imx8qxp_mek/README
@@ -3,20 +3,12 @@ U-Boot for the NXP i.MX8QXP EVK board
 Quick Start
 ===========
 
-- Build U-Boot
 - Build the ARM Trusted firmware binary
 - Get scfw_tcm.bin and ahab-container.img
-- Get mkimage tool
-- Generate flash.bin using imx-mkimage
+- Build U-Boot
 - Flash the binary into the SD card
 - Boot
 
-Build U-Boot
-============
-
-$ make imx8qxp_mek_defconfig
-$ make
-
 Get and Build the ARM Trusted firmware
 ======================================
 
@@ -35,37 +27,28 @@ $ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-7.6.bin
 $ chmod +x firmware-imx-7.6.bin
 $ ./firmware-imx-7.6.bin
 
-Get imx-mkimage tool
-==============================
-Download the imx-mkimage tool:
+Copy the following binaries to U-Boot folder:
 
-$ git clone https://source.codeaurora.org/external/imx/imx-mkimage/
-$ cd imx-mkimage/
-$ git checkout origin/imx_4.9.88_imx8qxp_beta2 -b imx_4.9.88_imx8qxp_beta2
-
-
-Generate flash.bin using imx-mkimage
-====================================
-
-Copy the following binaries to imx-mkimage/iMX8M folder:
+$ cp imx-atf/build/imx8qxp/release/bl31.bin .
+$ cp u-boot/u-boot.bin .
 
-$ cp imx-atf/build/imx8qxp/release/bl31.bin imx-mkimage/iMX8QX/
-$ cp u-boot/u-boot.bin imx-mkimage/iMX8QX/
+Copy the following firmwares U-Boot folder :
 
-Copy the following firmwares to imx-mkimage/iMX8 folder :
+$ cp firmware-imx-7.6/firmware/seco/ahab-container.img .
+$ cp imx-sc-firmware-0.7/mx8qx-mek-scfw-tcm.bin	.
 
-$ cp firmware-imx-7.6/firmware/seco/ahab-container.img imx-mkimage/iMX8QX/
-$ cp imx-sc-firmware-0.7/mx8qx-mek-scfw-tcm.bin imx-mkimage/iMX8QX/scfw_tcm.bin
+Build U-Boot
+============
 
-$ cd imx-mkimage/
-$ make SOC=iMX8QX flash
+$ make imx8qxp_mek_defconfig
+$ make
 
 Flash the binary into the SD card
 =================================
 
 Burn the flash.bin binary to SD card offset 32KB:
 
-$ sudo dd if=iMX8QX/flash.bin of=/dev/sd[x] bs=1024 seek=32
+$ sudo dd if=u-boot-dtb.imx of=/dev/sd[x] bs=1024 seek=32
 
 Boot
 ====
diff --git a/board/freescale/imx8qxp_mek/imximage.cfg b/board/freescale/imx8qxp_mek/imximage.cfg
new file mode 100644
index 0000000000..9d39f25bf6
--- /dev/null
+++ b/board/freescale/imx8qxp_mek/imximage.cfg
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2018 NXP
+ *
+ * Refer doc/README.imx8image for more details about how-to configure
+ * and create imx8image boot image
+ */
+
+#define __ASSEMBLY__
+#include <config.h>
+
+/* Boot from SD, sector size 0x400 */
+BOOT_FROM SD 0x400
+/* SoC type IMX8QX */
+SOC_TYPE IMX8QX
+/* Append seco container image */
+APPEND ahab-container.img
+/* Create the 2nd container */
+CONTAINER
+/* Add scfw image with exec attribute */
+IMAGE SCU mx8qx-mek-scfw-tcm.bin
+/* Add ATF image with exec attribute */
+IMAGE A35 bl31.bin 0x80000000
+/* Add U-Boot image with load attribute */
+DATA A35 u-boot-dtb.bin 0x80020000
diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig
index 73e9d93a8f..1588416183 100644
--- a/configs/imx8qxp_mek_defconfig
+++ b/configs/imx8qxp_mek_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_IMX8=y
 CONFIG_SYS_TEXT_BASE=0x80020000
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg"
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_IMX8QXP_MEK=y
 CONFIG_NR_DRAM_BANKS=3