diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-08 08:26:35 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-08 08:26:35 +0100 |
| commit | 129fb7d893a067232b28a471c4d24a0638404c95 (patch) | |
| tree | 7c242c842f7ec523d071a6baa3a2cc03e042206f /arch/arm/mach-omap | |
| parent | e229ce086c780d27a08227c938dbba9fcfb75bc0 (diff) | |
| parent | 436481a993e8a18b08f96656245a9bf96bebed10 (diff) | |
| download | barebox-129fb7d893a067232b28a471c4d24a0638404c95.tar.gz barebox-129fb7d893a067232b28a471c4d24a0638404c95.tar.xz | |
Merge branch 'for-next/fit'
Diffstat (limited to 'arch/arm/mach-omap')
| -rw-r--r-- | arch/arm/mach-omap/omap_generic.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap/omap_generic.c b/arch/arm/mach-omap/omap_generic.c index 4e26c6ba0b..34ed94007e 100644 --- a/arch/arm/mach-omap/omap_generic.c +++ b/arch/arm/mach-omap/omap_generic.c @@ -79,6 +79,11 @@ static int do_bootm_omap_barebox(struct image_data *data) if (!barebox) return -EINVAL; + if (data->dryrun) { + free(barebox); + return 0; + } + omap_start_barebox(barebox); } |