summaryrefslogtreecommitdiffstats
path: root/commands/bootm.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-04-18 20:42:17 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-18 20:42:17 +0200
commita7ddbc40865a8ffe716aca686763780febad575c (patch)
tree66084fa9f4ac31bff8a3326198d47930f1ccf7b5 /commands/bootm.c
parent030b5a1ba5bfb5cbbf8ff88f8880184b5fc76354 (diff)
parent2b26b148f4c8633a19bca0cbb96d4393ece8f54e (diff)
downloadbarebox-a7ddbc40865a8ffe716aca686763780febad575c.tar.gz
barebox-a7ddbc40865a8ffe716aca686763780febad575c.tar.xz
Merge branch 'binfmt' of git://git.jcrosoft.org/barebox into next
Diffstat (limited to 'commands/bootm.c')
-rw-r--r--commands/bootm.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/commands/bootm.c b/commands/bootm.c
index c89a3cc7f0..322e74fdd7 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -46,6 +46,7 @@
#include <uncompress.h>
#include <memory.h>
#include <filetype.h>
+#include <binfmt.h>
#include <asm-generic/memory_layout.h>
static LIST_HEAD(handler_list);
@@ -457,6 +458,17 @@ BAREBOX_CMD_END
BAREBOX_MAGICVAR(bootargs, "Linux Kernel parameters");
+static struct binfmt_hook binfmt_uimage_hook = {
+ .type = filetype_uimage,
+ .exec = "bootm",
+};
+
+static int binfmt_uimage_init(void)
+{
+ return binfmt_register(&binfmt_uimage_hook);
+}
+fs_initcall(binfmt_uimage_init);
+
/**
* @file
* @brief Boot support for Linux