Revert "Switch to diferent boards"

This reverts commit a049144f0d77176ae43a98e4f1c3059dabdc8053.
Fix issues with bcm21553 merged board

Change-Id: I8fd5e3b157adba4f837c4083f80423f19eb3dc9d