diff --git a/layers/meta-ked-imx/recipes-bsp/u-boot/u-boot-ktn/sl-mx8mm.env b/layers/meta-ked-imx/recipes-bsp/u-boot/u-boot-ktn/sl-mx8mm.env index 09b14654bb953a14172ed58a4eaf19041cf56575..09971abc60ee8c0bd1d218b2b39b103beae17daf 100644 --- a/layers/meta-ked-imx/recipes-bsp/u-boot/u-boot-ktn/sl-mx8mm.env +++ b/layers/meta-ked-imx/recipes-bsp/u-boot/u-boot-ktn/sl-mx8mm.env @@ -43,12 +43,39 @@ vendor_bootcmd_net= run vendor_bootm; vendor_bootm= - if test -n "${bootcfg}"; then - bootm ${loadaddr}#${bootcfg}; - else + if test -n "${touch_type}"; then + run vendor_enable_touch; + bootm ${loadaddr} - ${fdt_addr_r}; + elif test -n "${bootcfg}"; then + bootm ${loadaddr}#${bootcfg}; + else bootm ${loadaddr}; fi; +vendor_enable_touch= + imxtract ${loadaddr} fdt-freescale_imx8mm-kontron-bl${board_type}.dtb ${fdt_addr_r}; + fdt addr ${fdt_addr_r}; + fdt resize 61440; + imxtract ${loadaddr} fdt-freescale_imx8mm-kontron-dl${board_type}.dtbo ${fdtoverlay_addr_r}; + fdt apply ${fdtoverlay_addr_r}; + fdt set /soc/bus@30800000/i2c@30a30000/${touch_type} status okay; + +vendor_detect_touch= + gpio clear ${touch_rst_gpio}; + sleep 0.02; + gpio set ${touch_rst_gpio}; + sleep 0.1; + i2c dev 1; + if i2c probe 0x5d; then + echo 'LVDS Panel, Goodix Touch detected'; + setenv touch_type gt911@5d; + else + if i2c probe 0x55; then + echo 'LVDS Panel, Sitronix Touch detected'; + setenv touch_type st1633@55; + fi; + fi; + vendor_detect_config= gpio clear ${touch_rst_gpio}; sleep 0.02; @@ -62,15 +89,13 @@ vendor_detect_config= fi; setenv bootcfg conf-freescale_imx8mm-kontron-bl${board_type}.dtb; setenv bootcfg_ext conf-freescale_imx8mm-kontron-bl${board_type}-extension.dtbo; - if i2c probe 0x5d; then - echo 'LVDS Panel detected'; - setenv bootcfg ${bootcfg}#conf-freescale_imx8mm-kontron-dl${board_type}.dtbo; - fi; + if test ${extension_board} = 1; then setenv bootcfg ${bootcfg}#${bootcfg_ext}; else setenv bootcfg ${bootcfg}; fi; + run vendor_detect_touch; vendor_ab_boot= if load mmc ${devnum}:${devpart} ${loadaddr} ${active_part_file}; then diff --git a/layers/meta-ked-imx/recipes-kernel/linux/linux-ktn/meta/kernel-meta/cfg/common-drivers.cfg b/layers/meta-ked-imx/recipes-kernel/linux/linux-ktn/meta/kernel-meta/cfg/common-drivers.cfg index 356e2ba46de34f8d025bc3438ea528538a87c5d3..e01f40d6c5ece3b755b77ace530fd4c1a132e49d 100644 --- a/layers/meta-ked-imx/recipes-kernel/linux/linux-ktn/meta/kernel-meta/cfg/common-drivers.cfg +++ b/layers/meta-ked-imx/recipes-kernel/linux/linux-ktn/meta/kernel-meta/cfg/common-drivers.cfg @@ -139,6 +139,7 @@ CONFIG_TOUCHSCREEN_EGALAX=m CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_IMX6UL_TSC=m CONFIG_TOUCHSCREEN_SIS_I2C=m +CONFIG_TOUCHSCREEN_ST1232=m CONFIG_USB_CONN_GPIO=y CONFIG_USB_ONBOARD_HUB=y CONFIG_USB_ONBOARD_DEV=y