From 19b409c00727444e12d8698a8f3982390d42ea6a Mon Sep 17 00:00:00 2001 From: Dirk Behme Date: Wed, 11 Jan 2012 23:28:31 +0000 Subject: imximage: Add support for i.MX6 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 Signed-off-by: Fabio Estevam CC: Stefano Babic CC: Jason Liu Acked-by: Jason Liu --- tools/imximage.c | 4 +++- tools/imximage.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'tools') 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 -- cgit v1.1