g2: Tidy up
g2: Fix qcom boot script doesn't execute on booting