aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2025-01-27 10:11:36 -0600
committerTom Rini <trini@konsulko.com>2025-01-27 12:46:48 -0600
commitb39b3c9a4385ab76bd766e0c5b54a3aec1eeb740 (patch)
treea46731e812c3ebd7670491e8b733f4d35d63a879 /arch
parent082b41df8abd8b2d0f2dccce8ed74fe7f5c6509e (diff)
parent219b0488200633cda74ecc04cda2eb84443ab88d (diff)
downloadu-boot-b39b3c9a4385ab76bd766e0c5b54a3aec1eeb740.tar.gz
Merge tag 'u-boot-imx-master-20250127' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/24366 - Refactor the imx pinctrl driver. - Enable optional ENETREF clock on i.MX95 - Remove optional from tee-os entry on the i.MX8M u-boot devicetrees.
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/imx8mm-u-boot.dtsi1
-rw-r--r--arch/arm/dts/imx8mn-u-boot.dtsi1
-rw-r--r--arch/arm/dts/imx8mp-u-boot.dtsi1
-rw-r--r--arch/arm/dts/imx8mq-u-boot.dtsi1
4 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 8608fa004fd..abb3aa5b635 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -176,7 +176,6 @@
tee-os {
filename = "tee.bin";
- optional;
};
};
#endif
diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi
index bf2bb0f17c7..96a6df94c6c 100644
--- a/arch/arm/dts/imx8mn-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-u-boot.dtsi
@@ -252,7 +252,6 @@
tee-os {
filename = "tee.bin";
- optional;
};
};
#endif
diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
index 9e590c3bba0..6de9ab5d37c 100644
--- a/arch/arm/dts/imx8mp-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-u-boot.dtsi
@@ -197,7 +197,6 @@
tee-os {
filename = "tee.bin";
- optional;
};
};
#endif
diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi
index 458657fc474..8a536b16e8f 100644
--- a/arch/arm/dts/imx8mq-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-u-boot.dtsi
@@ -156,7 +156,6 @@
tee-os {
filename = "tee.bin";
- optional;
};
};
#endif