Merge the machine dependent boot directories for v10 and v32.
This avoids some code duplication and eases the way for further
merging later on.
Signed-off-by: NJesper Nilsson <jesper.nilsson@axis.com>