Changed some line formatting to make commands more robust as well.

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Tested-by: Victor Chong <victor.chong@linaro.org> (hikey)
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>