Merge "ipq40xx: remove the unnecessary configs"