From patchwork Thu Jan 12 09:28:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Behme X-Patchwork-Id: 135602 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id E1724B6EF2 for ; Thu, 12 Jan 2012 20:29:11 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 06A2B286D3; Thu, 12 Jan 2012 10:29:03 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uBSbIW6mh7Ao; Thu, 12 Jan 2012 10:29:02 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 880EE286D5; Thu, 12 Jan 2012 10:28:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 03BDF28655 for ; Thu, 12 Jan 2012 10:28:47 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cx519-C081lQ for ; Thu, 12 Jan 2012 10:28:46 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from smtp2-v.fe.bosch.de (smtp2-v.fe.bosch.de [139.15.237.6]) by theia.denx.de (Postfix) with ESMTPS id 62D6028664 for ; Thu, 12 Jan 2012 10:28:46 +0100 (CET) Received: from vsmta11.fe.internet.bosch.com (unknown [10.4.98.30]) by imta23.fe.bosch.de (Postfix) with ESMTP id DFB6F582080A for ; Thu, 12 Jan 2012 10:28:45 +0100 (CET) Received: from localhost (vsgw1.fe.internet.bosch.com [10.4.98.15]) by vsmta11.fe.internet.bosch.com (Postfix) with SMTP id F084D4E0842C for ; Thu, 12 Jan 2012 10:28:45 +0100 (CET) Received: from SI-HUB1000.de.bosch.com (10.4.103.106) by si-hub06.de.bosch.com (10.3.153.48) with Microsoft SMTP Server (TLS) id 8.3.213.0; Thu, 12 Jan 2012 10:28:39 +0100 Received: from hi-z5661.hi.de.bosch.com (10.34.217.179) by SI-HUB1000.de.bosch.com (10.4.103.106) with Microsoft SMTP Server id 14.1.355.2; Thu, 12 Jan 2012 10:28:39 +0100 Received: from localhost.localdomain (localhost [127.0.0.1]) by hi-z5661.hi.de.bosch.com (Postfix) with ESMTP id 1030B4003C; Thu, 12 Jan 2012 10:28:39 +0100 (CET) From: Dirk Behme To: Date: Thu, 12 Jan 2012 10:28:31 +0100 Message-ID: <1326360512-5569-2-git-send-email-dirk.behme@de.bosch.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1326360512-5569-1-git-send-email-dirk.behme@de.bosch.com> References: <1326360512-5569-1-git-send-email-dirk.behme@de.bosch.com> MIME-Version: 1.0 Cc: Jason Liu , Dirk Behme Subject: [U-Boot] [PATCH 2/3] imximage: Add support for i.MX6 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 --- 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