[U-Boot] [PATCH 2/3] imximage: Add support for i.MX6

[Dirk Behme]

The i.MX6 processor can boot from NOR flash and SATA disks,
additionally. Add the flash offsets for these additional
boot modes.

Signed-off-by: Dirk Behme <dirk.behme at de.bosch.com>
Signed-off-by: Fabio Estevam <festevam at gmail.com>
CC: Stefano Babic <sbabic at denx.de>
CC: Jason Liu <jason.hui at linaro.org>
---
 doc/README.imximage |   13 +++++++------
 tools/imximage.c    |    4 +++-
 tools/imximage.h    |    2 ++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/doc/README.imximage b/doc/README.imximage
index c3704a4..073e3fc 100644
--- a/doc/README.imximage
+++ b/doc/README.imximage
@@ -2,12 +2,13 @@
 Imximage Boot Image generation using mkimage
 ---------------------------------------------
 
-This document describes how to set up a U-Boot image
-that can be booted by Freescale MX25, MX35, MX51 and MX53
-processors via internal boot mode.
+This document describes how to set up a U-Boot image that can be booted
+by Freescale MX25, MX35, MX51, MX53 and MX6 processors via internal boot
+mode.
 
 These processors can boot directly from NAND, SPI flash and SD card flash
-using its internal boot ROM support. They can boot from an internal
+using its internal boot ROM support. MX6 processors additionally support
+boot from NOR flash and SATA disks. All processors can boot from an internal
 UART, if booting from device media fails.
 Booting from NOR flash does not require to use this image type.
 
@@ -59,12 +60,12 @@ Configuration command line syntax:
 	--------------		-----------
 	IMXIMAGE_VERSION        1/2
 				1 is for mx25/mx35/mx51 compatible,
-				2 is for mx53 compatible,
+				2 is for mx53/mx6 compatible,
 				others is invalid and error is generated.
 				This command need appear the fist before
 				other valid commands in configuration file.
 
-	BOOT_FROM		nand/spi/sd/onenand
+	BOOT_FROM		nand/spi/sd/onenand/nor/sata
 				Example:
 				BOOT_FROM spi
 	DATA			type address value
diff --git a/tools/imximage.c b/tools/imximage.c
index 8e81bdb..f3da139 100644
--- a/tools/imximage.c
+++ b/tools/imximage.c
@@ -51,6 +51,8 @@ static table_entry_t imximage_bootops[] = {
 	{FLASH_OFFSET_NAND,	"nand",		"NAND Flash",	},
 	{FLASH_OFFSET_SD,	"sd",		"SD Card",	},
 	{FLASH_OFFSET_ONENAND,	"onenand",	"OneNAND Flash",},
+	{FLASH_OFFSET_NOR,	"nor",		"NOR Flash",	},
+	{FLASH_OFFSET_SATA,	"sata",		"SATA Disk",	},
 	{-1,			"",		"Invalid",	},
 };
 
@@ -59,7 +61,7 @@ static table_entry_t imximage_bootops[] = {
  */
 static table_entry_t imximage_versions[] = {
 	{IMXIMAGE_V1,	"",	" (i.MX25/35/51 compatible)", },
-	{IMXIMAGE_V2,	"",	" (i.MX53 compatible)",       },
+	{IMXIMAGE_V2,	"",	" (i.MX53/6 compatible)",     },
 	{-1,            "",     " (Invalid)",                 },
 };
 
diff --git a/tools/imximage.h b/tools/imximage.h
index d126a46..d784a8d 100644
--- a/tools/imximage.h
+++ b/tools/imximage.h
@@ -37,6 +37,8 @@
 #define FLASH_OFFSET_SD		FLASH_OFFSET_STANDARD
 #define FLASH_OFFSET_SPI	FLASH_OFFSET_STANDARD
 #define FLASH_OFFSET_ONENAND	0x100
+#define FLASH_OFFSET_NOR	0x1000
+#define FLASH_OFFSET_SATA	FLASH_OFFSET_STANDARD
 
 #define IVT_HEADER_TAG 0xD1
 #define IVT_VERSION 0x40
-- 
1.7.0.4