dtsi fixes for Tianchi & Flamingo

Tianchi: Now we can use v2 dt.img like other devices
Flamingo: Consolidate dtsi files