Merge "hikey960: Switch to bootcontrol 1.2"