Fix additional board configurations

Change-Id: Ia1cc5118f78d2e3363149b54740ca36ce90a7d07