summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi28
-rw-r--r--arch/arm/mach-imx/imx9/container.cfg3
-rw-r--r--arch/arm/mach-imx/imx9/imximage.cfg2
3 files changed, 25 insertions, 8 deletions
diff --git a/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi b/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi
index aa88964f210..3b52d6bbd9b 100644
--- a/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi
@@ -7,12 +7,6 @@
#include "imx6ul-opos6ul-u-boot.dtsi"
-/ {
- aliases {
- display0 = &lcdif;
- };
-};
-
&aips1 {
bootph-pre-ram;
@@ -22,7 +16,29 @@
};
&lcdif {
+ display = <&display0>;
bootph-some-ram;
+
+ display0: display0 {
+ bits-per-pixel = <18>;
+ bus-width = <18>;
+
+ display-timings {
+ timing0 {
+ clock-frequency = <33300000>;
+ hactive = <800>;
+ vactive = <480>;
+ hback-porch = <36>;
+ hfront-porch = <210>;
+ vback-porch = <13>;
+ vfront-porch = <22>;
+ hsync-len = <10>;
+ vsync-len = <10>;
+ de-active = <1>;
+ pixelclk-active = <0>;
+ };
+ };
+ };
};
&pinctrl_uart1 {
diff --git a/arch/arm/mach-imx/imx9/container.cfg b/arch/arm/mach-imx/imx9/container.cfg
index f268bc9eb2c..72fe791eae6 100644
--- a/arch/arm/mach-imx/imx9/container.cfg
+++ b/arch/arm/mach-imx/imx9/container.cfg
@@ -7,4 +7,5 @@ BOOT_FROM SD 0x400
SOC_TYPE IMX9
CONTAINER
IMAGE A55 bl31.bin 0x204E0000
-IMAGE A55 u-boot.bin CONFIG_TEXT_BASE \ No newline at end of file
+IMAGE A55 u-boot.bin CONFIG_TEXT_BASE
+IMAGE A55 tee.bin 0x96000000 \ No newline at end of file
diff --git a/arch/arm/mach-imx/imx9/imximage.cfg b/arch/arm/mach-imx/imx9/imximage.cfg
index 3e440465b23..d327d6a6ef4 100644
--- a/arch/arm/mach-imx/imx9/imximage.cfg
+++ b/arch/arm/mach-imx/imx9/imximage.cfg
@@ -5,6 +5,6 @@
BOOT_FROM SD 0x400
SOC_TYPE IMX9
-APPEND mx93a0-ahab-container.img
+APPEND mx93a1-ahab-container.img
CONTAINER
IMAGE A55 u-boot-spl-ddr.bin 0x2049A000 \ No newline at end of file