imximage: Add MX53 to the documentation

PATCH New Dirk Behme 3 participants 11 messages Jan 12, 2012 – Jan 17, 2012 Arm i.MX and Layerscape

lore

Share & tools

lore

Dirk Behme

author

2012-01-12 09:28 UTC #0 lore raw

PATCH 1/3 imximage: Add MX53 to the documentation

i.MX53 is supported, too. Add this to the introduction of the documentation.

Signed-off-by Dirk Behme <[email protected]>

CC Fabio Estevam <[email protected]>

CC Stefano Babic <[email protected]>

CC Jason Liu <[email protected]>

---
 doc/README.imximage |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

doc/README.imximage +1 -1

index c74239d..c3704a4 100644
@@ -3,7 +3,7 @@ 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 and MX51
+that can be booted by Freescale MX25, MX35, MX51 and MX53
 processors via internal boot mode.
 
 These processors can boot directly from NAND, SPI flash and SD card flash

Signature · 1 line

1.7.0.4

Dirk Behme

author

2012-01-12 09:28 UTC #1 lore raw

PATCH 2/3 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 <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

CC Stefano Babic <[email protected]>

CC Jason Liu <[email protected]>

---
 doc/README.imximage |   13 +++++++------
 tools/imximage.c    |    4 +++-
 tools/imximage.h    |    2 ++
 3 files changed, 12 insertions(+), 7 deletions(-)

doc/README.imximage +7 -6

index c3704a4..073e3fc 100644
@@ -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

tools/imximage.c +3 -1

index 8e81bdb..f3da139 100644
@@ -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)",                 },
 };

tools/imximage.h +2 -0

index d126a46..d784a8d 100644
@@ -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

Signature · 1 line

1.7.0.4

Jason Hui

2012-01-16 13:54 UTC #2 lore raw

PATCH 2/3 imximage: Add support for i.MX6

Quoted 84 lines · 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 <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
CC Stefano Babic <[email protected]>
CC Jason Liu <[email protected]>
---
?doc/README.imximage | ? 13 +++++++------
?tools/imximage.c ? ?| ? ?4 +++-
?tools/imximage.h ? ?| ? ?2 ++
?3 files changed, 12 insertions(+), 7 deletions(-)
doc/README.imximage +0 -0
index c3704a4..073e3fc 100644
@@ -2,12 +2,13 @@
?Imximage Boot Image generation using mkimage
?---------------------------------------------
doc/README.imximage +3 -3
-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
doc/README.imximage +2 -1
-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.
doc/README.imximage +0 -0
@@ -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
tools/imximage.c +2 -0
index 8e81bdb..f3da139 100644
@@ -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)", ? ? ? ? ? ? ? ? }, ?};
tools/imximage.h +0 -0
index d126a46..d784a8d 100644
@@ -37,6 +37,8 @@
?#define FLASH_OFFSET_SD ? ? ? ? ? ? ? ?FLASH_OFFSET_STANDARD ?#define FLASH_OFFSET_SPI ? ? ? FLASH_OFFSET_STANDARD ?#define FLASH_OFFSET_ONENAND ? 0x100
tools/imximage.h +2 -0
+#define FLASH_OFFSET_NOR ? ? ? 0x1000
+#define FLASH_OFFSET_SATA ? ? ?FLASH_OFFSET_STANDARD

Quoted 2 lines

?#define IVT_HEADER_TAG 0xD1
?#define IVT_VERSION 0x40

Acked-by Jason Liu <[email protected]>

Quoted 3 lines

--
1.7.0.4

Stefano Babic

2012-01-17 09:32 UTC #3 lore raw

PATCH 2/3 imximage: Add support for i.MX6

In reply to Dirk Behme

Quoted 9 lines · 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 <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
CC Stefano Babic <[email protected]>
CC Jason Liu <[email protected]>
---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Dirk Behme

author

2012-01-12 09:28 UTC #4 lore raw

PATCH 3/3 imximage: Sort bootops alphabetically

In reply to Dirk Behme

Signed-off-by Dirk Behme <[email protected]>

CC Fabio Estevam <[email protected]>

CC Stefano Babic <[email protected]>

CC Jason Liu <[email protected]>

---
Note: This was requested by Wolfgang in

      http://www.mail-archive.com/u-boot at lists.denx.de/msg71842.html

 tools/imximage.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

tools/imximage.c +3 -3

index f3da139..1e0f5d4 100644
@@ -47,12 +47,12 @@ static table_entry_t imximage_cmds[] = {
  * this is needed to set the correct flash offset
  */
 static table_entry_t imximage_bootops[] = {
-	{FLASH_OFFSET_SPI,	"spi",		"SPI Flash",	},
-	{FLASH_OFFSET_NAND,	"nand",		"NAND Flash",	},
-	{FLASH_OFFSET_SD,	"sd",		"SD Card",	},
 	{FLASH_OFFSET_ONENAND,	"onenand",	"OneNAND Flash",},
+	{FLASH_OFFSET_NAND,	"nand",		"NAND Flash",	},
 	{FLASH_OFFSET_NOR,	"nor",		"NOR Flash",	},
 	{FLASH_OFFSET_SATA,	"sata",		"SATA Disk",	},
+	{FLASH_OFFSET_SD,	"sd",		"SD Card",	},
+	{FLASH_OFFSET_SPI,	"spi",		"SPI Flash",	},
 	{-1,			"",		"Invalid",	},
 };

Signature · 1 line

1.7.0.4

Jason Hui

2012-01-16 13:55 UTC #5 lore raw

PATCH 3/3 imximage: Sort bootops alphabetically

Quoted 22 lines · Dirk Behme

Signed-off-by Dirk Behme <[email protected]>
CC Fabio Estevam <[email protected]>
CC Stefano Babic <[email protected]>
CC Jason Liu <[email protected]>
---
Note: This was requested by Wolfgang in
? ? ?http://www.mail-archive.com/u-boot at lists.denx.de/msg71842.html
?tools/imximage.c | ? ?6 +++---
?1 files changed, 3 insertions(+), 3 deletions(-)
tools/imximage.c +0 -0
index f3da139..1e0f5d4 100644
@@ -47,12 +47,12 @@ static table_entry_t imximage_cmds[] = {
?* this is needed to set the correct flash offset
?*/
?static table_entry_t imximage_bootops[] = {
- ? ? ? {FLASH_OFFSET_SPI, ? ? ?"spi", ? ? ? ? ?"SPI Flash", ? ?},
- ? ? ? {FLASH_OFFSET_NAND, ? ? "nand", ? ? ? ? "NAND Flash", ? },
- ? ? ? {FLASH_OFFSET_SD, ? ? ? "sd", ? ? ? ? ? "SD Card", ? ? ?},

Quoted 8 lines

? ? ? ?{FLASH_OFFSET_ONENAND, ?"onenand", ? ? ?"OneNAND Flash",},
+ ? ? ? {FLASH_OFFSET_NAND, ? ? "nand", ? ? ? ? "NAND Flash", ? }, ? ? ? ?{FLASH_OFFSET_NOR, ? ? ?"nor", ? ? ? ? ?"NOR Flash", ? ?}, ? ? ? ?{FLASH_OFFSET_SATA, ? ? "sata", ? ? ? ? "SATA Disk", ? ?},
+ ? ? ? {FLASH_OFFSET_SD, ? ? ? "sd", ? ? ? ? ? "SD Card", ? ? ?},
+ ? ? ? {FLASH_OFFSET_SPI, ? ? ?"spi", ? ? ? ? ?"SPI Flash", ? ?}, ? ? ? ?{-1, ? ? ? ? ? ? ? ? ? ?"", ? ? ? ? ? ? "Invalid", ? ? ?}, ?};

Yes, this looks better.

Acked-by Jason Liu <[email protected]>

Quoted 4 lines

--
1.7.0.4

Stefano Babic

2012-01-17 09:32 UTC #6 lore raw

PATCH 3/3 imximage: Sort bootops alphabetically

In reply to Dirk Behme

Quoted 5 lines · Dirk Behme

Signed-off-by Dirk Behme <[email protected]>
CC Fabio Estevam <[email protected]>
CC Stefano Babic <[email protected]>
CC Jason Liu <[email protected]>
---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Jason Hui

2012-01-16 13:58 UTC #7 lore raw

PATCH 1/3 imximage: Add MX53 to the documentation

In reply to Dirk Behme

Quoted 23 lines · Dirk Behme

i.MX53 is supported, too. Add this to the introduction of the documentation.
Signed-off-by Dirk Behme <[email protected]>
CC Fabio Estevam <[email protected]>
CC Stefano Babic <[email protected]>
CC Jason Liu <[email protected]>
---
?doc/README.imximage | ? ?2 +-
?1 files changed, 1 insertions(+), 1 deletions(-)
doc/README.imximage +0 -0
index c74239d..c3704a4 100644
@@ -3,7 +3,7 @@ Imximage Boot Image generation using mkimage
?---------------------------------------------
?This document describes how to set up a U-Boot image
doc/README.imximage +1 -1
-that can be booted by Freescale MX25, MX35 and MX51
+that can be booted by Freescale MX25, MX35, MX51 and MX53
?processors via internal boot mode.

Quoted 1 line

?These processors can boot directly from NAND, SPI flash and SD card flash

This change is too trivial. I wonder whether it can be squashed with pach 2/3?

Jason

Quoted 3 lines

--
1.7.0.4

Dirk Behme

author

2012-01-16 14:05 UTC #8 lore raw

PATCH 1/3 imximage: Add MX53 to the documentation

Quoted 19 lines · Jason Hui

Quoted 18 lines · Dirk Behme
i.MX53 is supported, too. Add this to the introduction of the documentation.
Signed-off-by Dirk Behme <[email protected]>
CC Fabio Estevam <[email protected]>
CC Stefano Babic <[email protected]>
CC Jason Liu <[email protected]>
---
 doc/README.imximage |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
doc/README.imximage +0 -0
index c74239d..c3704a4 100644
@@ -3,7 +3,7 @@ Imximage Boot Image generation using mkimage
 ---------------------------------------------
 

Quoted 8 lines

doc/README.imximage Imximage Boot Image generation using mkimage · line 9
Quoted 6 lines
doc/README.imximage +1 -1
 This document describes how to set up a U-Boot image
-that can be booted by Freescale MX25, MX35 and MX51
+that can be booted by Freescale MX25, MX35, MX51 and MX53
 processors via internal boot mode.
 
 These processors can boot directly from NAND, SPI flash and SD card flash
This change is too trivial. I wonder whether it can be squashed with pach 2/3?

Sure, it could. But from logical point of view I've done two patches to separate

1/3: Correct existing stuff
2/3: Add new stuff (mx6)

Best regards

Dirk

Stefano Babic

2012-01-16 15:05 UTC #9 lore raw

PATCH 1/3 imximage: Add MX53 to the documentation

Quoted 12 lines · Dirk Behme

Quoted 11 lines
Quoted 8 lines
This document describes how to set up a U-Boot image
doc/README.imximage +1 -1
-that can be booted by Freescale MX25, MX35 and MX51
+that can be booted by Freescale MX25, MX35, MX51 and MX53
 processors via internal boot mode.
 
 These processors can boot directly from NAND, SPI flash and SD card
flash
This change is too trivial. I wonder whether it can be squashed with pach 2/3?

Quoted 5 lines

Sure, it could. But from logical point of view I've done two patches to separate
1/3: Correct existing stuff
2/3: Add new stuff (mx6)

Well, another way to see (as I can understand Jason's point of view) was to set them as:
1/2 Update documentation
2/2 Add new feature (mx6)

By the way, even if I agree that the first patch could be squashed together with the second one, there is no open issues and the substance is not changed at all ;-)

I will merge the current three patches into u-boot-imx.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Stefano Babic

2012-01-17 09:32 UTC #10 lore raw

PATCH 1/3 imximage: Add MX53 to the documentation

In reply to Dirk Behme

Quoted 8 lines · Dirk Behme

i.MX53 is supported, too. Add this to the introduction of the documentation.
Signed-off-by Dirk Behme <[email protected]>
CC Fabio Estevam <[email protected]>
CC Stefano Babic <[email protected]>
CC Jason Liu <[email protected]>
---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================