MLK-10186-1 imximage: add fixed IVT offset support

Since from mx7, we use fixed IVT offset for all boot devices.
Introduce a new configuration CONFIG_IMX_FIXED_IVT_OFFSET for this.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
(cherry picked from commit 88e0a3552b08627b18d98380a32dbafacb18854b)
(cherry picked from commit 3d52e221ed444dab96038a2417d1dcb2217ad593)
(cherry picked from commit 13d39c51bbaabbcf3b72516d8ac3f1853f686ace)

diff --git a/tools/imximage.h b/tools/imximage.h
index db8b9a3..a56462d 100644 (file)
--- a/tools/imximage.h
+++ b/tools/imximage.h
@@ -27,10 +27,17 @@
 #define FLASH_OFFSET_NAND      FLASH_OFFSET_STANDARD
 #define FLASH_OFFSET_SD                FLASH_OFFSET_STANDARD
 #define FLASH_OFFSET_SPI       FLASH_OFFSET_STANDARD
+#define FLASH_OFFSET_SATA      FLASH_OFFSET_STANDARD
+
+#ifdef CONFIG_IMX_FIXED_IVT_OFFSET
+#define FLASH_OFFSET_ONENAND   FLASH_OFFSET_STANDARD
+#define FLASH_OFFSET_NOR       FLASH_OFFSET_STANDARD
+#define FLASH_OFFSET_QSPI      FLASH_OFFSET_STANDARD
+#else
 #define FLASH_OFFSET_ONENAND   0x100
 #define FLASH_OFFSET_NOR       0x1000
-#define FLASH_OFFSET_SATA      FLASH_OFFSET_STANDARD
 #define FLASH_OFFSET_QSPI      0x1000
+#endif
 
 /* Initial Load Region Size */
 #define FLASH_LOADSIZE_UNDEFINED       0xFFFFFFFF