Merge patch series "Enable AVS support for AM68, AM69 and J784S4"

[J-u-boot.git] / boot / bootstd-uclass.c

diff --git a/boot/bootstd-uclass.c b/boot/bootstd-uclass.c
index 3c6c32ae604c11c3a87fa968a8d79d2b1f860783..fdb8d69e3209a3980670d5547eb4871c3266aa68 100644 (file)
--- a/boot/bootstd-uclass.c
+++ b/boot/bootstd-uclass.c
@@ -6,10 +6,10 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bootflow.h>
 #include <bootstd.h>
 #include <dm.h>
+#include <env.h>
 #include <log.h>
 #include <malloc.h>
 #include <dm/device-internal.h>
@@ -33,6 +33,8 @@ static int bootstd_of_to_plat(struct udevice *dev)
                                           &priv->prefixes);
                dev_read_string_list(dev, "bootdev-order",
                                     &priv->bootdev_order);
+
+               priv->theme = ofnode_find_subnode(dev_ofnode(dev), "theme");
        }
 
        return 0;
@@ -70,9 +72,23 @@ static int bootstd_remove(struct udevice *dev)
        return 0;
 }
 
-const char *const *const bootstd_get_bootdev_order(struct udevice *dev)
+const char *const *const bootstd_get_bootdev_order(struct udevice *dev,
+                                                  bool *okp)
 {
        struct bootstd_priv *std = dev_get_priv(dev);
+       const char *targets = env_get("boot_targets");
+
+       *okp = true;
+       log_debug("- targets %s %p\n", targets, std->bootdev_order);
+       if (targets && *targets) {
+               str_free_list(std->env_order);
+               std->env_order = str_to_list(targets);
+               if (!std->env_order) {
+                       *okp = false;
+                       return NULL;
+               }
+               return std->env_order;
+       }
 
        return std->bootdev_order;
 }
@@ -106,7 +122,7 @@ static int bootstd_probe(struct udevice *dev)
        return 0;
 }
 
-/* For now, bind the boormethod device if none are found in the devicetree */
+/* For now, bind the bootmethod device if none are found in the devicetree */
 int dm_scan_other(bool pre_reloc_only)
 {
        struct driver *drv = ll_entry_start(struct driver, driver);
@@ -133,12 +149,7 @@ int dm_scan_other(bool pre_reloc_only)
                return 0;
 
        for (i = 0; i < n_ents; i++, drv++) {
-               /*
-                * Disable EFI Manager for now as no one uses it so it is
-                * confusing
-                */
-               if (drv->id == UCLASS_BOOTMETH &&
-                   strcmp("efi_mgr_bootmeth", drv->name)) {
+               if (drv->id == UCLASS_BOOTMETH) {
                        const char *name = drv->name;
 
                        if (!strncmp("bootmeth_", name, 9))
@@ -150,12 +161,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;
 }