Merge "s6: bringup fip add bl30 board [1/1]" into amlogic-dev