phytec: set bootdevices and bootmeths in devicetree for imx8 boards

Standardboot allows setting bootdevices and bootmeths in devicetree.
This is already implemented for imx8mp-libra board.

Signed-off-by: Benjamin Hahn <B.Hahn@phytec.de>

diff --git a/arch/arm/dts/imx8mm-phyboard-polis-rdk-u-boot.dtsi b/arch/arm/dts/imx8mm-phyboard-polis-rdk-u-boot.dtsi
index 512dbc9ee86aa79632b91b1dfe19e0f3e89bf9c2..143ce6a6d77ce64b1dabe5ad644c046d561f2ced 100644 (file)
--- a/arch/arm/dts/imx8mm-phyboard-polis-rdk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-phyboard-polis-rdk-u-boot.dtsi
@@ -12,6 +12,22 @@
                wdt = <&wdog1>;
                bootph-pre-ram;
        };
+
+       bootstd {
+               bootph-verify;
+               compatible = "u-boot,boot-std";
+
+               filename-prefixes = "/", "/boot/";
+               bootdev-order = "mmc2", "mmc1", "ethernet";
+
+               rauc {
+                       compatible = "u-boot,distro-rauc";
+               };
+
+               script {
+                       compatible = "u-boot,script";
+               };
+       };
 };
 
 &pinctrl_i2c1 {

diff --git a/arch/arm/dts/imx8mm-phygate-tauri-l-u-boot.dtsi b/arch/arm/dts/imx8mm-phygate-tauri-l-u-boot.dtsi
index f59f119374f796f43b41c4350626d38465dfbc69..26361780c01a09e942476bef047a162e31b37371 100644 (file)
--- a/arch/arm/dts/imx8mm-phygate-tauri-l-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-phygate-tauri-l-u-boot.dtsi
@@ -11,6 +11,22 @@
                wdt = <&wdog1>;
                bootph-pre-ram;
        };
+
+       bootstd {
+               bootph-verify;
+               compatible = "u-boot,boot-std";
+
+               filename-prefixes = "/", "/boot/";
+               bootdev-order = "mmc2", "mmc1", "ethernet";
+
+               rauc {
+                       compatible = "u-boot,distro-rauc";
+               };
+
+               script {
+                       compatible = "u-boot,script";
+               };
+       };
 };
 
 &pinctrl_uart3 {

diff --git a/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi b/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi
index b4efff27a70b8944129ad6f07be191b9f5bbf182..4804a204e9225e3d5fb7a31b5d0a9cc0adee0645 100644 (file)
--- a/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi
@@ -12,6 +12,26 @@
                wdt = <&wdog1>;
                bootph-pre-ram;
        };
+
+       bootstd {
+               bootph-verify;
+               compatible = "u-boot,boot-std";
+
+               filename-prefixes = "/", "/boot/";
+               bootdev-order = "mmc2", "mmc1", "ethernet";
+
+               efi {
+                       compatible = "u-boot,distro-efi";
+               };
+
+               rauc {
+                       compatible = "u-boot,distro-rauc";
+               };
+
+               script {
+                       compatible = "u-boot,script";
+               };
+       };
 };
 
 &reg_usdhc2_vmmc {

diff --git a/board/phytec/phycore_imx8mp/phycore_imx8mp.env b/board/phytec/phycore_imx8mp/phycore_imx8mp.env
index 1ebd9f06a0c4039947a802d2870b1aff7dbd78f4..f825c7bc61ff8e07cd6f4f7e7e65b4c288d3e00c 100644 (file)
--- a/board/phytec/phycore_imx8mp/phycore_imx8mp.env
+++ b/board/phytec/phycore_imx8mp/phycore_imx8mp.env
@@ -3,12 +3,6 @@ bootcmd=
                fastboot 0;
        fi;
        bootflow scan -lb;
-#ifdef CONFIG_BOOTMETH_RAUC
-bootmeths=rauc script efi
-#else
-bootmeths=script efi
-#endif
-boot_targets=mmc2 mmc1 usb ethernet
 boot_script_dhcp=net_boot_fit.scr.uimg
 console=ttymxc0,115200
 dofastboot=0