summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/beaglebone
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-01-06 09:16:03 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-01-06 10:01:22 +0100
commit2a0b57b9dee92acdbdf0ca66661179e61bfdc6cb (patch)
treeaaf18bef98e0071e91370428da6e3bc067322370 /arch/arm/boards/beaglebone
parentb9ac7f304937674a48af8a6ed8a305f11b2e9bef (diff)
downloadbarebox-2a0b57b9dee92acdbdf0ca66661179e61bfdc6cb.tar.gz
barebox-2a0b57b9dee92acdbdf0ca66661179e61bfdc6cb.tar.xz
ARM: am335x bone: Fix Booting from eMMC
Booting a beaglebone black from eMMC is broken since: commit 0d6392de4ad824a6553c0e3e3e18edef689a7c85 Author: Sascha Hauer <s.hauer@pengutronix.de> Date: Thu Jun 5 12:09:07 2014 +0200 ARM: AM335x: Beaglebone: Use stripped down devicetree for MLO The stripped down device tree does not have the eMMC device node which the beaglebone black needs for booting. Add this node to the common dts file, but keep it disabled. It gets enabled later with a call to am33xx_of_register_bootdevice() when the system is booted from eMMC. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/beaglebone')
-rw-r--r--arch/arm/boards/beaglebone/board.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boards/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c
index 3042189f6d..9b1a9ecdc2 100644
--- a/arch/arm/boards/beaglebone/board.c
+++ b/arch/arm/boards/beaglebone/board.c
@@ -92,6 +92,9 @@ static int beaglebone_devices_init(void)
armlinux_set_architecture(MACH_TYPE_BEAGLEBONE);
+ if (IS_ENABLED(CONFIG_SHELL_NONE))
+ return am33xx_of_register_bootdevice();
+
return 0;
}
coredevice_initcall(beaglebone_devices_init);