Merge "bl30: supplementary submit for gerrit 260252 [1/1]" into projects/amlogic-dev