common, image: introduce new uimage types

PATCH New Heiko Schocher 3 participants 5 messages Jan 15, 2012 – Jan 16, 2012

Share & tools

Heiko Schocher

author

2012-01-15 07:45 UTC #0 lore raw

PATCH 1/1 common, image: introduce new uimage types

- ubootimage
U-Boot image
- splimage
SPL image
- dfenvimage
Default Environment image
- ublheader
TI davinci UBL header image

Signed-off-by Heiko Schocher <[email protected]>

---
 common/image.c  |    6 +++++-
 include/image.h |    4 ++++
 2 files changed, 9 insertions(+), 1 deletions(-)

common/image.c +5 -1

index 202c8a1..aca1318 100644
@@ -133,6 +133,7 @@ static const table_entry_t uimage_os[] = {
 
 static const table_entry_t uimage_type[] = {
 	{	IH_TYPE_AISIMAGE,   "aisimage",   "Davinci AIS image",},
+	{	IH_TYPE_DFENVIMAGE, "dfenvimage", "default Env image",  },
 	{	IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image",	},
 	{	IH_TYPE_FIRMWARE,   "firmware",	  "Firmware",		},
 	{	IH_TYPE_FLATDT,     "flat_dt",    "Flat Device Tree",	},

@@ -145,8 +146,11 @@ static const table_entry_t uimage_type[] = {
 	{	IH_TYPE_OMAPIMAGE,  "omapimage",  "TI OMAP SPL With GP CH",},
 	{	IH_TYPE_RAMDISK,    "ramdisk",	  "RAMDisk Image",	},
 	{	IH_TYPE_SCRIPT,     "script",	  "Script",		},
+	{	IH_TYPE_SPLIMAGE,   "splimage",   "SPL image",          },
 	{	IH_TYPE_STANDALONE, "standalone", "Standalone Program", },
-	{	IH_TYPE_UBLIMAGE,   "ublimage",   "Davinci UBL image",},
+	{	IH_TYPE_UBOOTIMAGE, "ubootimage", "U-Boot image",       },
+	{	IH_TYPE_UBLHEADER,  "ublheader",  "UBL header image",   },
+	{	IH_TYPE_UBLIMAGE,   "ublimage",   "Davinci UBL image",  },
 	{	-1,		    "",		  "",			},
 };

include/image.h +4 -0

index bbf80f0..3b5bd51 100644
@@ -164,6 +164,10 @@
 #define IH_TYPE_OMAPIMAGE	12	/* TI OMAP Config Header Image	*/
 #define IH_TYPE_AISIMAGE	13	/* TI Davinci AIS Image		*/
 #define IH_TYPE_KERNEL_NOLOAD	14	/* OS Kernel Image, can run from any load address */
+#define IH_TYPE_UBOOTIMAGE	15	/* U-Boot image			*/
+#define IH_TYPE_SPLIMAGE	16	/* SPL image			*/
+#define IH_TYPE_DFENVIMAGE	17	/* default Environment Image	*/
+#define IH_TYPE_UBLHEADER	18	/* UBL Header image		*/
 
 /*
  * Compression Types

Signature · 1 line

1.7.7.4

Mike Frysinger

2012-01-15 17:30 UTC #1 lore raw

PATCH 1/1 common, image: introduce new uimage types

Quoted 8 lines · On Sunday 15 January 2012 02:45:49 Heiko Schocher wrote:

- ubootimage
U-Boot image
- splimage
SPL image
- dfenvimage
Default Environment image
- ublheader
TI davinci UBL header image

for ... ?

is it even possible to bootm these currently ?
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120115/8c2fce48/attachment.pgp>

Heiko Schocher

author

2012-01-16 06:26 UTC #2 lore raw

PATCH 1/1 common, image: introduce new uimage types

Hello Mike,

Quoted 11 lines · Mike Frysinger

Quoted 8 lines · On Sunday 15 January 2012 02:45:49 Heiko Schocher wrote:
- ubootimage
U-Boot image
- splimage
SPL image
- dfenvimage
Default Environment image
- ublheader
TI davinci UBL header image
for ... ?

Oh, right, forgotten to add this in the commit message.

They are needed for cam_enc_4xx update:

http://patchwork.ozlabs.org/patch/136165/

There, the UBL-header, SPL-image, U-Boot image and an default image are wrapped in one FIT image.

Quoted 1 line

is it even possible to bootm these currently ?

No.

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Wolfgang Denk

2012-01-16 08:51 UTC #3 lore raw

PATCH 1/1 common, image: introduce new uimage types

Dear Heiko Schocher,

Quoted 12 lines · In message <[email protected]> you wrote:

Quoted 11 lines
Quoted 9 lines
- ubootimage
U-Boot image
- splimage
SPL image
- dfenvimage
Default Environment image
- ublheader
TI davinci UBL header image
for ... ?

Quoted 8 lines

Oh, right, forgotten to add this in the commit message.
They are needed for cam_enc_4xx update:
http://patchwork.ozlabs.org/patch/136165/
There, the UBL-header, SPL-image, U-Boot image and an default image are wrapped in one FIT image.

But this is conceptually broken. The IH_TYPE_* definitions are actually only relevant for legacy images.

FIX images use an XML based, extendable data format. The whole idea of this is that we do NOT have to change to code when anybody needs a new (probably private) entry or type or whatever.

In your case, it should be possible to use an existing image type (say, IH_TYPE_FIRMWARE) for your code, and use other distinguishing marks to determine which parts you work on. Probably it makes sense to define your own entry for each of the parts. Then only your own code needs to understand this.

Thanks.

Best regards,

Wolfgang Denk

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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Any time things appear to be going better, you have overlooked  some-
thing.

Heiko Schocher

author

2012-01-16 09:03 UTC #4 lore raw

PATCH 1/1 common, image: introduce new uimage types

Hello Wolfgang,

Quoted 28 lines · Wolfgang Denk

Dear Heiko Schocher,
Quoted 9 lines · In message <[email protected]> you wrote:
Quoted 9 lines
Quoted 8 lines
- ubootimage
U-Boot image
- splimage
SPL image
- dfenvimage
Default Environment image
- ublheader
TI davinci UBL header image
for ... ?
Quoted 8 lines
Oh, right, forgotten to add this in the commit message.
They are needed for cam_enc_4xx update:
http://patchwork.ozlabs.org/patch/136165/
There, the UBL-header, SPL-image, U-Boot image and an default image are wrapped in one FIT image.
But this is conceptually broken. The IH_TYPE_* definitions are actually only relevant for legacy images.
FIX images use an XML based, extendable data format. The whole idea of this is that we do NOT have to change to code when anybody needs a new (probably private) entry or type or whatever.

Quoted 5 lines

In your case, it should be possible to use an existing image type (say, IH_TYPE_FIRMWARE) for your code, and use other distinguishing marks to determine which parts you work on. Probably it makes sense to define your own entry for each of the parts. Then only your own code needs to understand this.

Yep, you are right, rework this.

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany