[PATCH 1/2] filetype: add arm u-boot support

Jean-Christophe PLAGNIOL-VILLARD plagnioj at jcrosoft.com
Tue Sep 17 03:52:18 EDT 2013


Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 common/filetype.c  | 3 +++
 include/filetype.h | 1 +
 2 files changed, 4 insertions(+)

diff --git a/common/filetype.c b/common/filetype.c
index 7507d85..59ea25a 100644
--- a/common/filetype.c
+++ b/common/filetype.c
@@ -35,6 +35,7 @@ static const struct filetype_str filetype_str[] = {
 	[filetype_lzo_compressed] = { "lzo compressed", "lzo" },
 	[filetype_lz4_compressed] = { "lz4 compressed", "lz4" },
 	[filetype_arm_barebox] = { "arm barebox image", "arm-barebox" },
+	[filetype_arm_uboot] = { "arm u-boot image", "arm-u-boot" },
 	[filetype_uimage] = { "U-Boot uImage", "u-boot" },
 	[filetype_ubi] = { "UBI image", "ubi" },
 	[filetype_jffs2] = { "JFFS2 image", "jffs2" },
@@ -226,6 +227,8 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize)
 
 	if (is_barebox_arm_head(_buf))
 		return filetype_arm_barebox;
+	if (buf[15] == 0xdeadbeef)
+		return filetype_arm_uboot;
 	if (buf[9] == 0x016f2818 || buf[9] == 0x18286f01)
 		return filetype_arm_zimage;
 
diff --git a/include/filetype.h b/include/filetype.h
index 9a864da..b83b9be 100644
--- a/include/filetype.h
+++ b/include/filetype.h
@@ -12,6 +12,7 @@ enum filetype {
 	filetype_lzo_compressed,
 	filetype_lz4_compressed,
 	filetype_arm_barebox,
+	filetype_arm_uboot,
 	filetype_uimage,
 	filetype_ubi,
 	filetype_jffs2,
-- 
1.8.4.rc1




More information about the barebox mailing list