diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-08-13 16:56:05 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-08-13 16:56:05 +0200 |
| commit | 1ec421f533610f7af4544748300296fe7728ed70 (patch) | |
| tree | d70b6e63ff3d087ac30ed68a87c5199b1f568715 /arch/arm/lib32 | |
| parent | 64842a68070318c4c78e99bd69de2401e65de7a5 (diff) | |
| parent | 2b8466c26a911bed1ac5aa25c463f67b3bdbf1eb (diff) | |
| download | barebox-1ec421f533610f7af4544748300296fe7728ed70.tar.gz barebox-1ec421f533610f7af4544748300296fe7728ed70.tar.xz | |
Merge branch 'for-next/socfpga'
Diffstat (limited to 'arch/arm/lib32')
| -rw-r--r-- | arch/arm/lib32/bootm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/lib32/bootm.c b/arch/arm/lib32/bootm.c index 63713acf59..4cf570e577 100644 --- a/arch/arm/lib32/bootm.c +++ b/arch/arm/lib32/bootm.c @@ -434,6 +434,12 @@ static struct image_handler barebox_handler = { .filetype = filetype_arm_barebox, }; +static struct image_handler socfpga_xload_handler = { + .name = "SoCFPGA prebootloader image", + .bootm = do_bootm_linux, + .filetype = filetype_socfpga_xload, +}; + #include <aimage.h> static int aimage_load_resource(int fd, struct resource *r, void* buf, int ps) @@ -628,6 +634,7 @@ static int armlinux_register_image_handler(void) globalvar_add_simple_bool("bootm.boot_atag", &bootm_boot_atag); register_image_handler(&barebox_handler); + register_image_handler(&socfpga_xload_handler); register_image_handler(&uimage_handler); register_image_handler(&rawimage_handler); register_image_handler(&zimage_handler); |