ARM: beagleboard: Move to multiimage support

Breathe some life back into the beagleboard:

- switch to multiimage support
- update config
- initialize early UART for debugging

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

1 files changed, 13 insertions, 0 deletions

diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c
index 775621069c..b7efe95627 100644
--- a/arch/arm/boards/beagle/board.c
+++ b/arch/arm/boards/beagle/board.c
@@ -22,6 +22,7 @@
 #include <linux/sizes.h>
 #include <io.h>
 #include <ns16550.h>
+#include <envfs.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
 #include <mach/gpmc.h>
@@ -31,6 +32,7 @@
 #include <i2c/i2c.h>
 #include <linux/err.h>
 #include <usb/ehci.h>
+#include <asm/barebox-arm.h>
 
 #ifdef CONFIG_DRIVER_SERIAL_NS16550
 
@@ -42,6 +44,9 @@
  */
 static int beagle_console_init(void)
 {
+	if (barebox_arm_machine() != MACH_TYPE_OMAP3_BEAGLE)
+		return 0;
+
 	barebox_set_model("Texas Instruments beagle");
 	barebox_set_hostname("beagle");
 
@@ -82,6 +87,9 @@ static struct gpmc_nand_platform_data nand_plat = {
 
 static int beagle_mem_init(void)
 {
+	if (barebox_arm_machine() != MACH_TYPE_OMAP3_BEAGLE)
+		return 0;
+
 	omap_add_ram0(SZ_128M);
 
 	return 0;
@@ -90,6 +98,9 @@ mem_initcall(beagle_mem_init);
 
 static int beagle_devices_init(void)
 {
+	if (barebox_arm_machine() != MACH_TYPE_OMAP3_BEAGLE)
+		return 0;
+
 	i2c_register_board_info(0, i2c_devices, ARRAY_SIZE(i2c_devices));
 	omap3_add_i2c1(NULL);
 
@@ -107,6 +118,8 @@ static int beagle_devices_init(void)
 
 	armlinux_set_architecture(MACH_TYPE_OMAP3_BEAGLE);
 
+	defaultenv_append_directory(defaultenv_beagle);
+
 	return 0;
 }
 device_initcall(beagle_devices_init);