Merge "bl30: AO PIC claim and complete consistency for rtos_sdk [1/2]" into projects/amlogic-dev