diff --git a/arch/arm/boards/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c
index 3042189..9b1a9ec 100644
--- a/arch/arm/boards/beaglebone/board.c
+++ b/arch/arm/boards/beaglebone/board.c
@@ -92,6 +92,9 @@
 
 	armlinux_set_architecture(MACH_TYPE_BEAGLEBONE);
 
+	if (IS_ENABLED(CONFIG_SHELL_NONE))
+		return am33xx_of_register_bootdevice();
+
 	return 0;
 }
 coredevice_initcall(beaglebone_devices_init);
diff --git a/arch/arm/boards/freescale-mx53-qsb/board.c b/arch/arm/boards/freescale-mx53-qsb/board.c
index 9a9bffa..1128e68 100644
--- a/arch/arm/boards/freescale-mx53-qsb/board.c
+++ b/arch/arm/boards/freescale-mx53-qsb/board.c
@@ -81,7 +81,8 @@
 	struct mc13xxx *mc34708;
 	int rev;
 
-	if (!of_machine_is_compatible("fsl,imx53-qsb"))
+	if (!of_machine_is_compatible("fsl,imx53-qsb") &&
+	    !of_machine_is_compatible("fsl,imx53-qsrb"))
 		return 0;
 
 	device_detect_by_name("mmc0");
@@ -167,7 +168,8 @@
 
 static int loco_postcore_init(void)
 {
-	if (!of_machine_is_compatible("fsl,imx53-qsb"))
+	if (!of_machine_is_compatible("fsl,imx53-qsb") &&
+	    !of_machine_is_compatible("fsl,imx53-qsrb"))
 		return 0;
 
 	imx53_init_lowlevel(1000);
diff --git a/arch/arm/dts/am335x-bone-common.dts b/arch/arm/dts/am335x-bone-common.dts
index bbc5561..5d3d2ed 100644
--- a/arch/arm/dts/am335x-bone-common.dts
+++ b/arch/arm/dts/am335x-bone-common.dts
@@ -1,5 +1,12 @@
 /dts-v1/;
 
+/*
+ * DTS for the beaglebone white/black MLO
+ *
+ * Only contains the common parts of both boards which is
+ * all we need for the MLO
+ */
+
 #include "am33xx.dtsi"
 #include "am335x-bone-common.dtsi"
 
@@ -7,3 +14,12 @@
 	model = "TI AM335x BeagleBone";
 	compatible = "ti,am335x-bone", "ti,am33xx";
 };
+
+&mmc2 {
+	vmmc-supply = <&vmmcsd_fixed>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&emmc_pins>;
+	bus-width = <8>;
+	status = "disabled"; /* only present on beaglebone black, enabled during runtime */
+	ti,vcc-aux-disable-is-sleep;
+};
diff --git a/arch/arm/mach-samsung/lowlevel-s3c24x0.S b/arch/arm/mach-samsung/lowlevel-s3c24x0.S
index 52079ff..09b6d7b 100644
--- a/arch/arm/mach-samsung/lowlevel-s3c24x0.S
+++ b/arch/arm/mach-samsung/lowlevel-s3c24x0.S
@@ -251,7 +251,7 @@
 	beq 2f
 	mov pc, lr	/* NOR case: nothing to do here */
 
-2:	ldr sp, =(TEXT_BASE - SZ_2M)	/* Setup a temporary stack in SDRAM */
+2:	ldr sp, =_text	/* Setup a temporary stack in SDRAM */
 /*
  * We still run at a location we are not linked to. But lets still running
  * from the internal SRAM, this may speed up the boot
@@ -262,7 +262,7 @@
 /*
  * Adjust the return address to the correct address in SDRAM
  */
-	ldr r1, =(TEXT_BASE - SZ_2M)
+	ldr r1, =_text
 	add lr, lr, r1
 
 	mov pc, lr
diff --git a/commands/memset.c b/commands/memset.c
index f869306..bb5f46d 100644
--- a/commands/memset.c
+++ b/commands/memset.c
@@ -98,7 +98,7 @@
 BAREBOX_CMD_START(memset)
 	.cmd		= do_memset,
 	BAREBOX_CMD_DESC("memory fill")
-	BAREBOX_CMD_OPTS("[-bwld] ADDR COUNT DATA")
+	BAREBOX_CMD_OPTS("[-bwld] ADDR DATA COUNT")
 	BAREBOX_CMD_GROUP(CMD_GRP_MEM)
 	BAREBOX_CMD_HELP(cmd_memset_help)
 BAREBOX_CMD_END
diff --git a/net/eth.c b/net/eth.c
index b830f79..89bddba 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -246,7 +246,7 @@
 	if (ret)
 		return ret;
 
-	return edev->recv(eth_current);
+	return edev->recv(edev);
 }
 
 int eth_rx(void)