This reverts commit b652896b.

Unfortunately this commit prevents multiplatform from booting to
the point where a serial console is available. Revert it while
a solution is sought.
Signed-off-by: NSimon Horman <horms+renesas@verge.net.au>