From: Tom Rini <trini@kernel.crashing.org>

From: Geoffrey LEVAND <geoffrey.levand@am.sony.com>

Fix some of the problems with 'make O=...'

Ack'd by Sam Ravnborg.