Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conf/machine/xilinx-zynq.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
TARGET_ARCH = "arm"
DEFAULTTUNE = "cortexa9-vfpv3"

KERNEL_CLASSES += "kernel-fitimage"
KERNEL_IMAGETYPE = "fitImage"
KERNEL_CLASSES += "kernel-fit-extra-artifacts"
KERNEL_IMAGETYPE = "zImage"

KERNEL_FEATURES:remove = "cfg/fs/vfat.scc"

Expand Down
5 changes: 4 additions & 1 deletion recipes-core/images/nilrt-runmode-rootfs.bb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ IMAGE_INSTALL:append:x64 = "\
nilrt-grub-runmode \
"

IMAGE_INSTALL:append:xilinx-zynq = "\
linux-nilrt-fitimage \
"
require includes/nilrt-image-base.inc
require includes/nilrt-xfce.inc
require includes/nilrt-proprietary.inc
Expand All @@ -40,7 +43,7 @@ bootimg_fixup_x64() {
}

bootimg_fixup_arm() {
mv "${IMAGE_ROOTFS}/${KERNEL_IMAGEDEST}/fitImage" "${IMAGE_ROOTFS}/${KERNEL_IMAGEDEST}/linux_runmode.itb"
mv "${IMAGE_ROOTFS}/${KERNEL_IMAGEDEST}/zImage" "${IMAGE_ROOTFS}/${KERNEL_IMAGEDEST}/linux_runmode.itb"
}

IMAGE_PREPROCESS_COMMAND:append:x64 = " bootimg_fixup_x64; "
Expand Down
13 changes: 13 additions & 0 deletions recipes-kernel/linux/linux-nilrt-fitimage.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
SUMMARY = "The Linux kernel as a FIT image (optionally with initramfs) for NILRT"
SECTION = "kernel"

# If an initramfs is included in the FIT image more licenses apply.
# But also the kernel uses more than one license (see Documentation/process/license-rules.rst)
LICENSE = "GPL-2.0-with-Linux-syscall-note"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-with-Linux-syscall-note;md5=0bad96c422c41c3a94009dcfe1bff992"

inherit linux-kernel-base kernel-fit-image

# Set the version of this recipe to the version of the included kernel
# (without taking the long way around via PV)
PKGV = "${@get_kernelversion_file("${STAGING_KERNEL_BUILDDIR}")}"