add values needed for rp1000
Merge branch 'master' into rp1000
Merge mainline RP1000 changes.