Merge branch 'for-next/op-tee'

3 files changed, 26 insertions, 20 deletions

diff --git a/arch/arm/boards/stm32mp13xx-dk/Makefile b/arch/arm/boards/stm32mp13xx-dk/Makefile
index 9961af02a3..a031ae91bd 100644
--- a/arch/arm/boards/stm32mp13xx-dk/Makefile
+++ b/arch/arm/boards/stm32mp13xx-dk/Makefile
@@ -1,2 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0-only
-lwl-y += lowlevel.o
+obj-y += board.o
diff --git a/arch/arm/boards/stm32mp13xx-dk/board.c b/arch/arm/boards/stm32mp13xx-dk/board.c
new file mode 100644
index 0000000000..24104328f0
--- /dev/null
+++ b/arch/arm/boards/stm32mp13xx-dk/board.c
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <driver.h>
+#include <init.h>
+#include <mach/stm32mp/bbu.h>
+#include <deep-probe.h>
+
+static int stm32mp13xx_dk_probe(struct device *dev)
+{
+	stm32mp_bbu_mmc_fip_register("sd", "/dev/mmc0", BBU_HANDLER_FLAG_DEFAULT);
+	return 0;
+}
+
+static const struct of_device_id stm32mp13xx_dk_of_match[] = {
+	{ .compatible = "st,stm32mp135f-dk" },
+	{ /* sentinel */ },
+};
+BAREBOX_DEEP_PROBE_ENABLE(stm32mp13xx_dk_of_match);
+
+static struct driver stm32mp13xx_dk_board_driver = {
+	.name = "board-stm32mp13xx_dk",
+	.probe = stm32mp13xx_dk_probe,
+	.of_compatible = stm32mp13xx_dk_of_match,
+} ;
+device_platform_driver(stm32mp13xx_dk_board_driver);
diff --git a/arch/arm/boards/stm32mp13xx-dk/lowlevel.c b/arch/arm/boards/stm32mp13xx-dk/lowlevel.c
deleted file mode 100644
index 4253dde9d6..0000000000
--- a/arch/arm/boards/stm32mp13xx-dk/lowlevel.c
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include <mach/stm32mp/entry.h>
-#include <debug_ll.h>
-
-extern char __dtb_z_stm32mp135f_dk_start[];
-
-ENTRY_FUNCTION(start_stm32mp13xx_dk, r0, r1, r2)
-{
-	void *fdt;
-
-	stm32mp_cpu_lowlevel_init();
-
-	putc_ll('>');
-
-	fdt = __dtb_z_stm32mp135f_dk_start  + get_runtime_offset();
-
-	stm32mp1_barebox_entry(fdt);
-}