This reverts commit 0ceafe1. Conflicts: include/image.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
0ceafe1