Index: recipes-kernel/linux/linux-dey_%.bbappend =================================================================== diff -u -rf2090269fe7042d2a705ce43a46da82c578c8707 -r9e75fcf97db2e4a8bff61135be953f4fa62a2a86 --- recipes-kernel/linux/linux-dey_%.bbappend (.../linux-dey_%.bbappend) (revision f2090269fe7042d2a705ce43a46da82c578c8707) +++ recipes-kernel/linux/linux-dey_%.bbappend (.../linux-dey_%.bbappend) (revision 9e75fcf97db2e4a8bff61135be953f4fa62a2a86) @@ -7,16 +7,26 @@ DTSO_SRC_DIR = "${WORKDIR}/${DTSO_SRC_LOC}" DTSO_OUT_DIR = "${STAGING_KERNEL_DIR}/${KERNEL_OUTPUT_DIR}/dts/digi" -LEAHI_DISPLAY_SRC = "leahi-display.dtso" -LEAHI_DISPLAY_BIN = "leahi-display.dtbo" +CCIMX8MM_LEAHI_SRC = "ccimx8mm-leahi.dts" +CCIMX8MM_LEAHI_BIN = "ccimx8mm-leahi.dtb" -EXTRA_OEMAKE += 'ccimx8m_dvk_overlays+="${LEAHI_DISPLAY_BIN}"' -KERNEL_DEVICETREE:append = " digi/leahi-display.dtbo" +LEAHI_DVK_OVERLAY_SRC = "ccimx8mm-leahi-dvk.dtso" +LEAHI_DVK_OVERLAY_BIN = "ccimx8mm-leahi-dvk.dtbo" +MULTITOUCH_SRC = "hid-multitouch.cfg" + +EXTRA_OEMAKE += 'ccimx8m_dvk_overlays+="${LEAHI_DVK_OVERLAY_BIN}"' + +KERNEL_DEVICETREE:append = " \ + digi/${CCIMX8MM_LEAHI_BIN} \ + digi/${LEAHI_DVK_OVERLAY_BIN} \ + " + SRC_URI += " \ file://logo_diality_1280_800.ppm \ - file://${DTSO_SRC_LOC}/ccimx8mm-dvk.dts.patch \ - file://${DTSO_SRC_LOC}/${LEAHI_DISPLAY_SRC} \ + file://${DTSO_SRC_LOC}/${CCIMX8MM_LEAHI_SRC} \ + file://${DTSO_SRC_LOC}/${LEAHI_DVK_OVERLAY_SRC} \ + file://${MULTITOUCH_SRC} \ " do_configure:prepend() { @@ -26,5 +36,6 @@ bbplain " ---------- Leahi: Setup Display Overlay" install -d ${DTSO_OUT_DIR} - cp ${DTSO_SRC_DIR}/${LEAHI_DISPLAY_SRC} ${DTSO_OUT_DIR} + cp ${DTSO_SRC_DIR}/${CCIMX8MM_LEAHI_SRC} ${DTSO_OUT_DIR} + cp ${DTSO_SRC_DIR}/${LEAHI_DVK_OVERLAY_SRC} ${DTSO_OUT_DIR} }