bootstd: Drop the system bootdev

This was a work-around for the fact that global bootmeths such as EFI
bootmgr and VBE don't use a particular bootdev, or at least select it
themselves so that we don't need to scan all bootdevs when using that
bootmeth.

Drop the system bootdev entirely.

Signed-off-by: Simon Glass <sjg@chromium.org>

3 files changed, 1 insertions, 73 deletions

diff --git a/boot/Makefile b/boot/Makefile
index 124065a..854b391 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -18,7 +18,7 @@ obj-y += image.o image-board.o
 obj-$(CONFIG_ANDROID_AB) += android_ab.o
 obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o image-android-dt.o
 
-obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootdev-uclass.o system_bootdev.o
+obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootdev-uclass.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootmeth-uclass.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootstd-uclass.o
diff --git a/boot/bootstd-uclass.c b/boot/bootstd-uclass.c
index 5107b6d..565c22a 100644
--- a/boot/bootstd-uclass.c
+++ b/boot/bootstd-uclass.c
@@ -145,12 +145,6 @@ int dm_scan_other(bool pre_reloc_only)
 		}
 	}
 
-	/* Create the system bootdev too */
-	ret = device_bind_driver(bootstd, "system_bootdev", "system-bootdev",
-				 &dev);
-	if (ret)
-		return log_msg_ret("sys", ret);
-
 	return 0;
 }
 
diff --git a/boot/system_bootdev.c b/boot/system_bootdev.c
deleted file mode 100644
index 432d203..0000000
--- a/boot/system_bootdev.c
+++ /dev/null
@@ -1,66 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Bootdevice for system, used for bootmeths not tied to any partition device
- *
- * Copyright 2021 Google LLC
- * Written by Simon Glass <sjg@chromium.org>
- */
-
-#define LOG_CATEGORY UCLASS_BOOTSTD
-
-#include <common.h>
-#include <bootdev.h>
-#include <bootflow.h>
-#include <bootmeth.h>
-#include <command.h>
-#include <distro.h>
-#include <dm.h>
-#include <log.h>
-#include <net.h>
-
-static int system_get_bootflow(struct udevice *dev, struct bootflow_iter *iter,
-			       struct bootflow *bflow)
-{
-	int ret;
-
-	/* Must be an bootstd device */
-	ret = bootflow_iter_uses_system(iter);
-	if (ret)
-		return log_msg_ret("net", ret);
-
-	ret = bootmeth_check(bflow->method, iter);
-	if (ret)
-		return log_msg_ret("check", ret);
-
-	ret = bootmeth_read_bootflow(bflow->method, bflow);
-	if (ret)
-		return log_msg_ret("method", ret);
-
-	return 0;
-}
-
-static int system_bootdev_bind(struct udevice *dev)
-{
-	struct bootdev_uc_plat *ucp = dev_get_uclass_plat(dev);
-
-	ucp->prio = BOOTDEVP_6_SYSTEM;
-
-	return 0;
-}
-
-struct bootdev_ops system_bootdev_ops = {
-	.get_bootflow	= system_get_bootflow,
-};
-
-static const struct udevice_id system_bootdev_ids[] = {
-	{ .compatible = "u-boot,bootdev-system" },
-	{ }
-};
-
-U_BOOT_DRIVER(system_bootdev) = {
-	.name		= "system_bootdev",
-	.id		= UCLASS_BOOTDEV,
-	.ops		= &system_bootdev_ops,
-	.bind		= system_bootdev_bind,
-	.of_match	= system_bootdev_ids,
-};