From 61bae3904e74f15cfa050e8d9609a04ded593634 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 2 May 2022 13:07:05 -0500 Subject: linux-imx-headers: Upgrade to 5.15 Drop ion.h as it is no longer needed. Signed-off-by: Tom Hochstein (cherry picked from commit 7e34c293e363190d451d6106645fa90b60696e8f) --- recipes-kernel/linux/linux-imx-headers_5.10.bb | 79 -------------------------- recipes-kernel/linux/linux-imx-headers_5.15.bb | 75 ++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 79 deletions(-) delete mode 100644 recipes-kernel/linux/linux-imx-headers_5.10.bb create mode 100644 recipes-kernel/linux/linux-imx-headers_5.15.bb diff --git a/recipes-kernel/linux/linux-imx-headers_5.10.bb b/recipes-kernel/linux/linux-imx-headers_5.10.bb deleted file mode 100644 index 5d158031..00000000 --- a/recipes-kernel/linux/linux-imx-headers_5.10.bb +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2017-2021 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Installs i.MX-specific kernel headers" -DESCRIPTION = "Installs i.MX-specific kernel headers to userspace. \ -New headers are installed in ${includedir}/imx." -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -SRCBRANCH = "lf-5.10.y" -LOCALVERSION = "-5.10.72-2.2.0" -SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" -SRCREV = "a68e31b63f864ff71cd4adb40fbc9e1edc75c250" - -S = "${WORKDIR}/git" - -do_configure[noexec] = "1" - -do_compile[noexec] = "1" - -IMX_UAPI_HEADERS = " \ - dma-buf.h \ - hantrodec.h \ - hx280enc.h \ - ion.h \ - ipu.h \ - isl29023.h \ - imx_vpu.h \ - mxc_asrc.h \ - mxc_dcic.h \ - mxc_mlb.h \ - mxc_sim_interface.h \ - mxc_v4l2.h \ - mxcfb.h \ - pxp_device.h \ - pxp_dma.h \ - version.h \ - videodev2.h \ -" - -do_install() { - # We install all headers inside of B so we can copy only the - # whitelisted ones, and there is no risk of a new header to be - # installed by mistake. - oe_runmake headers_install INSTALL_HDR_PATH=${B}${exec_prefix} - - # Kernel should not be exporting this header - rm -f ${D}${exec_prefix}/include/scsi/scsi.h - - # The ..install.cmd conflicts between various configure runs - find ${D}${includedir} -name ..install.cmd | xargs rm -f - - # FIXME: The ion.h is still on staging so "promote" it for now - cp ${S}/drivers/staging/android/uapi/ion.h ${B}${includedir}/linux - - # Install whitelisted headers only - for h in ${IMX_UAPI_HEADERS}; do - install -D -m 0644 ${B}${includedir}/linux/$h \ - ${D}${includedir}/imx/linux/$h - done -} - -# Allow to build empty main package, this is required in order for -dev package -# to be propagated into the SDK -# -# Without this setting the RDEPENDS in other recipes fails to find this -# package, therefore causing the -dev package also to be skipped effectively not -# populating it into SDK -ALLOW_EMPTY:${PN} = "1" - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS += "unifdef-native bison-native rsync-native" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" - -# Restrict this recipe to NXP BSP only, this recipe is not compatible -# with mainline BSP -COMPATIBLE_HOST = '(null)' -COMPATIBLE_HOST:use-nxp-bsp = '.*' diff --git a/recipes-kernel/linux/linux-imx-headers_5.15.bb b/recipes-kernel/linux/linux-imx-headers_5.15.bb new file mode 100644 index 00000000..b7fea42c --- /dev/null +++ b/recipes-kernel/linux/linux-imx-headers_5.15.bb @@ -0,0 +1,75 @@ +# Copyright 2017-2021 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Installs i.MX-specific kernel headers" +DESCRIPTION = "Installs i.MX-specific kernel headers to userspace. \ +New headers are installed in ${includedir}/imx." +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +SRCBRANCH = "lf-5.15.y" +LOCALVERSION = "-5.15.5-1.0.0" +SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" +SRCREV = "c1084c2773fc1005ed140db625399d5334d94a28" + +S = "${WORKDIR}/git" + +do_configure[noexec] = "1" + +do_compile[noexec] = "1" + +IMX_UAPI_HEADERS = " \ + dma-buf.h \ + hantrodec.h \ + hx280enc.h \ + ipu.h \ + isl29023.h \ + imx_vpu.h \ + mxc_asrc.h \ + mxc_dcic.h \ + mxc_mlb.h \ + mxc_sim_interface.h \ + mxc_v4l2.h \ + mxcfb.h \ + pxp_device.h \ + pxp_dma.h \ + version.h \ + videodev2.h \ +" + +do_install() { + # We install all headers inside of B so we can copy only the + # whitelisted ones, and there is no risk of a new header to be + # installed by mistake. + oe_runmake headers_install INSTALL_HDR_PATH=${B}${exec_prefix} + + # Kernel should not be exporting this header + rm -f ${D}${exec_prefix}/include/scsi/scsi.h + + # The ..install.cmd conflicts between various configure runs + find ${D}${includedir} -name ..install.cmd | xargs rm -f + + # Install whitelisted headers only + for h in ${IMX_UAPI_HEADERS}; do + install -D -m 0644 ${B}${includedir}/linux/$h \ + ${D}${includedir}/imx/linux/$h + done +} + +# Allow to build empty main package, this is required in order for -dev package +# to be propagated into the SDK +# +# Without this setting the RDEPENDS in other recipes fails to find this +# package, therefore causing the -dev package also to be skipped effectively not +# populating it into SDK +ALLOW_EMPTY:${PN} = "1" + +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS += "unifdef-native bison-native rsync-native" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" + +# Restrict this recipe to NXP BSP only, this recipe is not compatible +# with mainline BSP +COMPATIBLE_HOST = '(null)' +COMPATIBLE_HOST:use-nxp-bsp = '.*' -- cgit v1.2.3-54-g00ecf