summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorDenys Drozdov <denys.drozdov@toradex.com>2021-03-29 19:10:37 +0300
committerMax Krummenacher <max.krummenacher@toradex.com>2021-06-04 14:23:01 +0200
commit051abad9010562723286f5783b073f55b516d637 (patch)
treeefb2738099276140b3064a9b735561d4b06654b7 /conf/machine
parent1ae79646e5b0464f52e560ce827c12524edc67cb (diff)
colibri-imx6/7: Default VGA overlay for upstream kernel
Default now Vesa VGA on VGA port overlay Related-to: ELB-3887 Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com> (cherry picked from commit 8581f337e7332ff12cd66f934dc7508271d86ec0)
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/include/colibri-imx6.inc2
-rw-r--r--conf/machine/include/colibri-imx7-emmc.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index fe723fe..dac8b07 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -8,7 +8,7 @@ OFFSET_SPL_PAYLOAD = "138"
MACHINE_NAME = "Colibri-iMX6"
TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx6_lcd-vga_overlay.dtbo colibri-imx6_stmpe-ts_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT_use-mainline-bsp = "colibri-imx6_parallel-rgb_overlay.dtbo colibri-imx6_stmpe-ts_overlay.dtbo display-edt7_overlay.dtbo"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT_use-mainline-bsp = "colibri-imx6_parallel-rgb_overlay.dtbo colibri-imx6_stmpe-ts_overlay.dtbo display-vga_overlay.dtbo"
KERNEL_DEVICETREE += " \
imx6dl-colibri-iris.dtb \
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index ccfe04e..1b10c24 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -28,7 +28,7 @@ KERNEL_DEVICETREE_append_use-mainline-bsp = " \
PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx7_lcd-vga_overlay.dtbo colibri-imx7_ad7879_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT_use-mainline-bsp = "colibri-imx7_parallel-rgb_overlay.dtbo colibri-imx7_ad7879_overlay.dtbo display-lt161010_overlay.dtbo"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT_use-mainline-bsp = "colibri-imx7_parallel-rgb_overlay.dtbo colibri-imx7_ad7879_overlay.dtbo display-vga_overlay.dtbo"
UBOOT_DTB_LOADADDRESS_colibri-imx7-emmc = "0x82000000"
UBOOT_DTBO_LOADADDRESS_colibri-imx7-emmc = "0x82010000"