Fix conflict in board flags for CPU architecture

Change-Id: I533cba8c5a92a96df026357b5d94059aabe81991
Reorganize device tree - nothing changed

Change-Id: Ieed18fcb38d0a690a7f11951ce4157e5ae3d132b