Avoid some code ducplication and be more future-proof.
Signed-off-by: NChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: NBjorn Andersson <bjorn.andersson@linaro.org>