diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-13 14:56:06 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-13 14:56:06 +0200 |
commit | 074a8fdc929a9cdb13b2ed7e637055d0acc05de2 (patch) | |
tree | 2e6182c70403ad1db43e3128903e3c79531ce1dd /common | |
parent | 0e1892b2e9348a94f58d1a4518e931c8ba46843e (diff) | |
parent | 994fa02f5d7d815265b625f6114d19f156547b69 (diff) | |
download | barebox-074a8fdc929a9cdb13b2ed7e637055d0acc05de2.tar.gz barebox-074a8fdc929a9cdb13b2ed7e637055d0acc05de2.tar.xz |
Merge branch 'for-next/socfpga'
Diffstat (limited to 'common')
-rw-r--r-- | common/filetype.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/common/filetype.c b/common/filetype.c index a8666a1439..4728f877c9 100644 --- a/common/filetype.c +++ b/common/filetype.c @@ -61,6 +61,7 @@ static const struct filetype_str filetype_str[] = { [filetype_xz_compressed] = { "XZ compressed", "xz" }, [filetype_exe] = { "MS-DOS executable", "exe" }, [filetype_mxs_bootstream] = { "Freescale MXS bootstream", "mxsbs" }, + [filetype_socfpga_xload] = { "SoCFPGA prebootloader image", "socfpga-xload" }, }; const char *file_type_to_string(enum filetype f) @@ -294,6 +295,9 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize) if (le32_to_cpu(buf[5]) == 0x504d5453) return filetype_mxs_bootstream; + if (buf[16] == 0x31305341) + return filetype_socfpga_xload; + if (is_barebox_arm_head(_buf)) return filetype_arm_barebox; if (buf[9] == 0x016f2818 || buf[9] == 0x18286f01) |