Update root_chooser6.c

Make it slightly more readable
Update root_chooser6.c

More cleanup
Merge branch 'patch-1' of https://github.com/xsacha/tf201-dev
root_chooser it's wrote in a more readable style.
it does not use the goto statements as kernel_chooser.