From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 10/16] add file detection support
Date: Mon, 28 Nov 2011 23:10:03 +0100 [thread overview]
Message-ID: <1322518209-2965-11-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1322518209-2965-1-git-send-email-s.hauer@pengutronix.de>
Several filetypes can be autodetected. Barebox could make use
of this in several ways:
- Add a command to detect filetypes
- detect arm zImages and uImages to unify the different boot commands
- maybe detect UBI or JFFS2 images to construct parts of the kernel
command line
- select correct uncompression function based on filetype
This patch adds basic support to detect filetypes.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/Makefile | 1 +
common/filetype.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++
include/filetype.h | 23 +++++++++++
3 files changed, 128 insertions(+), 0 deletions(-)
create mode 100644 common/filetype.c
create mode 100644 include/filetype.h
diff --git a/common/Makefile b/common/Makefile
index 3edf38f..55d9dbc 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_CMD_BOOTM) += image.o
obj-y += startup.o
obj-y += misc.o
obj-y += memsize.o
+obj-y += filetype.o
obj-$(CONFIG_MENU) += menu.o
obj-$(CONFIG_PASSWORD) += password.o
obj-$(CONFIG_MODULES) += module.o
diff --git a/common/filetype.c b/common/filetype.c
new file mode 100644
index 0000000..5d246b4
--- /dev/null
+++ b/common/filetype.c
@@ -0,0 +1,104 @@
+/*
+ * filetype.c - detect filetypes
+ *
+ * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation.
+ */
+#include <common.h>
+#include <filetype.h>
+#include <asm/byteorder.h>
+#include <fcntl.h>
+#include <fs.h>
+#include <malloc.h>
+
+const char *file_type_to_string(enum filetype f)
+{
+ switch (f) {
+ case filetype_unknown:
+ return "unkown";
+ case filetype_arm_zimage:
+ return "arm Linux zImage";
+ case filetype_lzo_compressed:
+ return "lzo compressed";
+ case filetype_arm_barebox:
+ return "arm barebox image";
+ case filetype_uimage:
+ return "U-Boot uImage";
+ case filetype_ubi:
+ return "UBI image";
+ case filetype_jffs2:
+ return "JFFS2 image";
+ case filetype_gzip:
+ return "gzip compressed";
+ case filetype_bzip2:
+ return "bzip2 compressed";
+ }
+ return NULL;
+}
+
+enum filetype file_detect_type(void *_buf)
+{
+ u32 *buf = _buf;
+ u8 *buf8 = _buf;
+
+ if (buf[8] == 0x65726162 && buf[9] == 0x00786f62)
+ return filetype_arm_barebox;
+ if (buf[9] == 0x016f2818 || buf[9] == 0x18286f01)
+ return filetype_arm_zimage;
+ if (buf8[0] == 0x89 && buf8[1] == 0x4c && buf8[2] == 0x5a &&
+ buf8[3] == 0x4f)
+ return filetype_lzo_compressed;
+ if (buf[0] == be32_to_cpu(0x27051956))
+ return filetype_uimage;
+ if (buf[0] == 0x23494255)
+ return filetype_ubi;
+ if (buf[0] == 0x20031985)
+ return filetype_jffs2;
+ if (buf8[0] == 0x1f && buf8[1] == 0x8b && buf8[2] == 0x08)
+ return filetype_gzip;
+ if (buf8[0] == 'B' && buf8[1] == 'Z' && buf8[2] == 'h' &&
+ buf8[3] > '0' && buf8[3] <= '9')
+ return filetype_bzip2;
+
+ return filetype_unknown;
+}
+
+enum filetype file_name_detect_type(const char *filename)
+{
+ int fd, ret;
+ void *buf;
+ enum filetype type = filetype_unknown;
+
+ fd = open(filename, O_RDONLY);
+ if (fd < 0)
+ return fd;
+
+ buf = xmalloc(512);
+
+ ret = read(fd, buf, 512);
+ if (ret != 512)
+ goto err_out;
+
+ type = file_detect_type(buf);
+
+err_out:
+ close(fd);
+ free(buf);
+
+ return type;
+}
diff --git a/include/filetype.h b/include/filetype.h
new file mode 100644
index 0000000..64d32ef
--- /dev/null
+++ b/include/filetype.h
@@ -0,0 +1,23 @@
+#ifndef __FILE_TYPE_H
+#define __FILE_TYPE_H
+
+/*
+ * List of file types we know
+ */
+enum filetype {
+ filetype_unknown,
+ filetype_arm_zimage,
+ filetype_lzo_compressed,
+ filetype_arm_barebox,
+ filetype_uimage,
+ filetype_ubi,
+ filetype_jffs2,
+ filetype_gzip,
+ filetype_bzip2,
+};
+
+const char *file_type_to_string(enum filetype f);
+enum filetype file_detect_type(void *_buf);
+enum filetype file_name_detect_type(const char *filename);
+
+#endif /* __FILE_TYPE_H */
--
1.7.7.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2011-11-28 22:10 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-28 22:09 uncompress work Sascha Hauer
2011-11-28 22:09 ` [PATCH 01/16] armlinux: remove unnecessary include Sascha Hauer
2011-11-28 22:09 ` [PATCH 02/16] arm bootm: " Sascha Hauer
2011-11-28 22:09 ` [PATCH 03/16] scripts/mkimage.c: " Sascha Hauer
2011-11-28 22:09 ` [PATCH 04/16] use kernel bunzip implementation Sascha Hauer
2011-11-28 22:09 ` [PATCH 05/16] remove old bzlib Sascha Hauer
2011-11-28 22:09 ` [PATCH 06/16] add kernel gunzip implementation Sascha Hauer
2011-11-28 22:10 ` [PATCH 07/16] remove old zlib Sascha Hauer
2011-12-03 18:47 ` Jean-Christophe PLAGNIOL-VILLARD
2011-11-28 22:10 ` [PATCH 08/16] lib: prompt for uncompression functions Sascha Hauer
2011-11-28 22:10 ` [PATCH 09/16] bootm: do not select uncompression methods Sascha Hauer
2011-11-28 22:10 ` Sascha Hauer [this message]
2011-11-28 23:10 ` [PATCH 10/16] add file detection support Marc Kleine-Budde
2011-11-29 19:41 ` Sascha Hauer
2011-11-29 19:40 ` Sascha Hauer
2011-11-28 22:10 ` [PATCH 11/16] lzo: export decompress_unlzo function Sascha Hauer
2011-11-28 22:10 ` [PATCH 12/16] Add generic uncompress function Sascha Hauer
2011-11-28 22:10 ` [PATCH 13/16] add generic uncompress command Sascha Hauer
2011-11-28 22:10 ` [PATCH 14/16] update configs and default envs for uncompress Sascha Hauer
2011-11-28 22:10 ` [PATCH 15/16] remove now unused unlzo function Sascha Hauer
2011-11-28 22:10 ` [PATCH 16/16] bootm: use generic uncompress function Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1322518209-2965-11-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox