Merge "intel: stratix10: Fix BL31 memory mapping" into integration