Merge "ipq807x: Adding SOC version to default env."