This is a combination of 3 commits.
configs/socfpga: don't overwrite DTB bootargs