diff options
Diffstat (limited to 'recipes-kernel/linux/linux-qoriq.inc')
| -rw-r--r-- | recipes-kernel/linux/linux-qoriq.inc | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc index 7f70260a..5d28ae84 100644 --- a/recipes-kernel/linux/linux-qoriq.inc +++ b/recipes-kernel/linux/linux-qoriq.inc @@ -3,27 +3,29 @@ inherit fsl-kernel-localversion SUMMARY = "Linux Kernel for NXP QorIQ platforms" SECTION = "kernel" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" S = "${WORKDIR}/git" -DEPENDS_append = " libgcc" +DEPENDS:append = " libgcc" # not put Images into /boot of rootfs, install kernel-image if needed -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" -KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}" -KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}" +KERNEL_CC:append = " ${TOOLCHAIN_OPTIONS}" +KERNEL_LD:append = " ${TOOLCHAIN_OPTIONS}" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" ZIMAGE_BASE_NAME = "zImage-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" ZIMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +# Set the PV to the correct kernel version to satisfy the kernel version sanity check +PV = "${LINUX_VERSION}+git${SRCPV}" + SCMVERSION ?= "y" LOCALVERSION = "" DELTA_KERNEL_DEFCONFIG ?= "" -DELTA_KERNEL_DEFCONFIG_prepend_qoriq-arm64 = "lsdk.config " -DELTA_KERNEL_DEFCONFIG_prepend_fsl-lsch2-32b = "multi_v7_lpae.config multi_v8.config lsdk.config " -DELTA_KERNEL_DEFCONFIG_prepend_ls102xa = "multi_v7_lpae.config lsdk.config " +DELTA_KERNEL_DEFCONFIG:prepend:qoriq-arm64 = "lsdk.config " +DELTA_KERNEL_DEFCONFIG:prepend:qoriq-arm = "multi_v7_lpae.config lsdk.config " do_merge_delta_config[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot bison-native:do_populate_sysroot" do_merge_delta_config[dirs] = "${B}" @@ -50,16 +52,7 @@ do_merge_delta_config() { done cp .config ${WORKDIR}/defconfig } -addtask merge_delta_config before do_preconfigure after do_patch - -# The link of dts folder is needed for 32b compile of aarch64 targets(e.g. ls1043ardb-32b) -do_compile_prepend_fsl-lsch2-32b() { - ln -sfT ${STAGING_KERNEL_DIR}/arch/arm64/boot/dts/freescale ${STAGING_KERNEL_DIR}/arch/arm/boot/dts/freescale -} - -do_install_prepend_fsl-lsch2-32b() { - rm -f ${STAGING_KERNEL_DIR}/arch/arm/boot/dts/freescale -} +addtask merge_delta_config before do_kernel_localversion after do_patch -FILES_${KERNEL_PACKAGE_NAME}-image += "/boot/zImage*" +FILES:${KERNEL_PACKAGE_NAME}-image += "/boot/zImage*" COMPATIBLE_MACHINE = "(qoriq)" |