diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:11:48 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:11:48 +0200 |
| commit | bee8dddbfcb07de469105a660e426fa132f96b6a (patch) | |
| tree | 11568bb2d8fa6cbbdc1b468093b5202eb5bcddeb /common | |
| parent | d8b30e6c3823bfe50c3e060aab39b0fab2de933f (diff) | |
| parent | 93ca711e64d7a4d79aee15b4ce415688f5415fda (diff) | |
| download | barebox-bee8dddbfcb07de469105a660e426fa132f96b6a.tar.gz barebox-bee8dddbfcb07de469105a660e426fa132f96b6a.tar.xz | |
Merge branch 'for-next/omap'
Conflicts:
Makefile
Diffstat (limited to 'common')
| -rw-r--r-- | common/filetype.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/filetype.c b/common/filetype.c index 6a0dcfb760..3d544cd6ce 100644 --- a/common/filetype.c +++ b/common/filetype.c @@ -102,7 +102,7 @@ enum filetype file_detect_type(void *_buf) if (strncmp(buf8, "#!/bin/sh", 9) == 0) return filetype_sh; - if (buf[8] == 0x65726162 && buf[9] == 0x00786f62) + if (is_barebox_arm_head(_buf)) return filetype_arm_barebox; if (buf[9] == 0x016f2818 || buf[9] == 0x18286f01) return filetype_arm_zimage; |