Conflicts: arch/arm/boards/chumby_falconwing/falconwing.c arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c arch/x86/mach-x86.dox scripts/setupmbr/setupmbr.c
Register the board specific environment during runtime using defaultenv_append_directory() to make it available for multi image support. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>