* [PATCH 2/5] Yocto: kernel: Pull out the linux.bin generation
2014-08-07 15:17 [PATCH 0/5] Add initial fitImage support Marek Vasut
@ 2014-08-07 15:17 ` Marek Vasut
2014-08-07 15:17 ` [PATCH 3/5] Yocto: kernel: Clean up KERNEL_IMAGETYPE_FOR_MAKE Marek Vasut
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Marek Vasut @ 2014-08-07 15:17 UTC (permalink / raw)
To: openembedded-core; +Cc: Marek Vasut
Pull the generation of linux.bin image, which is then packed into uImage,
into a separate function. No functional change.
Signed-off-by: Marek Vasut <marex@denx.de>
---
meta/classes/kernel.bbclass | 40 +++++++++++++++++++++++-----------------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 2e2b1fe..62e3a4b 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -444,26 +444,32 @@ MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz"
MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz"
MODULE_TARBALL_DEPLOY ?= "1"
+uboot_prep_kimage() {
+ if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
+ vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
+ linux_suffix=""
+ linux_comp="none"
+ else
+ vmlinux_path="vmlinux"
+ linux_suffix=".gz"
+ linux_comp="gzip"
+ fi
+
+ ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin
+
+ if [ "${linux_comp}" != "none" ] ; then
+ rm -f linux.bin
+ gzip -9 linux.bin
+ mv -f "linux.bin${linux_suffix}" linux.bin
+ fi
+
+ echo "${linux_comp}"
+}
+
do_uboot_mkimage() {
if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
if test "x${KEEPUIMAGE}" != "xyes" ; then
- if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
- vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
- linux_suffix=""
- linux_comp="none"
- else
- vmlinux_path="vmlinux"
- linux_suffix=".gz"
- linux_comp="gzip"
- fi
-
- ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin
-
- if [ "${linux_comp}" != "none" ] ; then
- rm -f linux.bin
- gzip -9 linux.bin
- mv -f "linux.bin${linux_suffix}" linux.bin
- fi
+ uboot_prep_kimage
ENTRYPOINT=${UBOOT_ENTRYPOINT}
if test -n "${UBOOT_ENTRYSYMBOL}"; then
--
2.0.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/5] Yocto: kernel: Clean up KERNEL_IMAGETYPE_FOR_MAKE
2014-08-07 15:17 [PATCH 0/5] Add initial fitImage support Marek Vasut
2014-08-07 15:17 ` [PATCH 2/5] Yocto: kernel: Pull out the linux.bin generation Marek Vasut
@ 2014-08-07 15:17 ` Marek Vasut
2014-08-07 15:17 ` [PATCH 5/5] Yocto: kernel: Add basic fitImage support Marek Vasut
2014-08-07 20:10 ` [PATCH 0/5] Add initial " Saul Wold
3 siblings, 0 replies; 8+ messages in thread
From: Marek Vasut @ 2014-08-07 15:17 UTC (permalink / raw)
To: openembedded-core; +Cc: Marek Vasut
Remove the lambda function setting KERNEL_IMAGETYPE_FOR_MAKE and instead
set it in the anonymous python function. This also allows us to handle
image types which are not supported directly by kernel, but require some
other kernel target to be built. This is the case for example with the
fitImage, which is the uImage successor.
There is no functional change.
Signed-off-by: Marek Vasut <marex@denx.de>
---
meta/classes/kernel.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 62e3a4b..b23e2e0 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -18,6 +18,8 @@ python __anonymous () {
depends = "%s u-boot-mkimage-native" % depends
d.setVar("DEPENDS", depends)
+ d.setVar("KERNEL_IMAGETYPE_FOR_MAKE", re.sub(r'\.[^\.]$', '', kerneltype))
+
image = d.getVar('INITRAMFS_IMAGE', True)
if image:
d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_rootfs')
@@ -79,8 +81,6 @@ KERNEL_ALT_IMAGETYPE ??= ""
# they are staged.
KERNEL_SRC_PATH = "/usr/src/kernel"
-KERNEL_IMAGETYPE_FOR_MAKE = "${@(lambda s: s[:-3] if s[-3:] == ".gz" else s)(d.getVar('KERNEL_IMAGETYPE', True))}"
-
copy_initramfs() {
echo "Copying initramfs into ./usr ..."
# In case the directory is not created yet from the first pass compile:
--
2.0.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/5] Yocto: kernel: Add basic fitImage support
2014-08-07 15:17 [PATCH 0/5] Add initial fitImage support Marek Vasut
2014-08-07 15:17 ` [PATCH 2/5] Yocto: kernel: Pull out the linux.bin generation Marek Vasut
2014-08-07 15:17 ` [PATCH 3/5] Yocto: kernel: Clean up KERNEL_IMAGETYPE_FOR_MAKE Marek Vasut
@ 2014-08-07 15:17 ` Marek Vasut
2014-08-11 0:55 ` Otavio Salvador
2014-08-07 20:10 ` [PATCH 0/5] Add initial " Saul Wold
3 siblings, 1 reply; 8+ messages in thread
From: Marek Vasut @ 2014-08-07 15:17 UTC (permalink / raw)
To: openembedded-core
This patch adds support for generating a kernel fitImage, which is
a a successor to the uImage format. Unlike uImage, which could only
contain the kernel image itself, the fitImage can contain all kinds
of artifacts, like the kernel image, device tree blobs, initramfs
images, binary firmwares etc. Furthermore, the fitImage supports
different kinds of checksums, not only CRC32 like the uImage did.
Last, but not least, fitImage supports signatures such that either
the whole image or it's parts can be signed and then in turn can
be verified by the bootloader.
So far we only add support for wrapping the kernel image and DTB
into the fitImage. The fitImage uses the sha1 checksum, which is
the default.
Signed-off-by: Marek Vasut <marex@denx.de>
---
meta/classes/kernel.bbclass | 189 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 186 insertions(+), 3 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index b23e2e0..d0faab3 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -13,16 +13,20 @@ INITRAMFS_IMAGE_BUNDLE ?= ""
python __anonymous () {
kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or ''
- if kerneltype == 'uImage':
+ if kerneltype == 'uImage' or kerneltype == 'fitImage':
depends = d.getVar("DEPENDS", True)
depends = "%s u-boot-mkimage-native" % depends
d.setVar("DEPENDS", depends)
- d.setVar("KERNEL_IMAGETYPE_FOR_MAKE", re.sub(r'\.[^\.]$', '', kerneltype))
+ if kerneltype == 'fitImage':
+ d.setVar("KERNEL_IMAGETYPE_FOR_MAKE", "zImage")
+ else:
+ d.setVar("KERNEL_IMAGETYPE_FOR_MAKE", re.sub(r'\.[^\.]$', '', kerneltype))
image = d.getVar('INITRAMFS_IMAGE', True)
if image:
d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_rootfs')
+ d.appendVarFlag('do_assemble_fitimage', 'depends', ' ${INITRAMFS_IMAGE}:do_rootfs')
# NOTE: setting INITRAMFS_TASK is for backward compatibility
# The preferred method is to set INITRAMFS_IMAGE, because
@@ -485,6 +489,164 @@ do_uboot_mkimage() {
addtask uboot_mkimage before do_install after do_compile
+#
+# Emit the fitImage ITS header
+#
+fitimage_emit_section_start() {
+ cat << EOF >> fit-image.its
+/dts-v1/;
+
+/ {
+ description = "U-Boot fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}";
+ #address-cells = <1>;
+
+ images {
+EOF
+}
+
+#
+# Emit the fitImage ITS kernel section
+#
+# $1 ... Image counter
+# $2 ... Path to kernel image
+# $3 ... Compression type
+fitimage_emit_section_kernel() {
+
+ kernel_csum="sha1"
+
+ ENTRYPOINT=${UBOOT_ENTRYPOINT}
+ if test -n "${UBOOT_ENTRYSYMBOL}"; then
+ ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
+ awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
+ fi
+
+ cat << EOF >> fit-image.its
+ kernel@${1} {
+ description = "Linux kernel";
+ data = /incbin/("${2}");
+ type = "kernel";
+ arch = "${UBOOT_ARCH}";
+ os = "linux";
+ compression = "${3}";
+ load = <${UBOOT_LOADADDRESS}>;
+ entry = <${ENTRYPOINT}>;
+ hash@1 {
+ algo = "${kernel_csum}";
+ };
+ };
+EOF
+}
+
+#
+# Emit the fitImage ITS DTB section
+#
+# $1 ... Image counter
+# $2 ... Path to DTB image
+fitimage_emit_section_dtb() {
+
+ dtb_csum="sha1"
+
+ cat << EOF >> fit-image.its
+ fdt@${1} {
+ description = "Flattened Device Tree blob";
+ data = /incbin/("${2}");
+ type = "flat_dt";
+ arch = "${UBOOT_ARCH}";
+ compression = "none";
+ hash@1 {
+ algo = "${dtb_csum}";
+ };
+ };
+EOF
+}
+
+#
+# Emit the fitImage ITS configuration section
+#
+# $1 ... Linux kernel ID
+# $2 ... DTB image ID
+fitimage_emit_section_config() {
+
+ conf_csum="sha1"
+
+ # Test if we have any DTBs at all
+ if [ -z "${2}" ] ; then
+ conf_desc="Boot Linux kernel"
+ fdt_line=""
+ else
+ conf_desc="Boot Linxu kernel with FDT blob"
+ fdt_line="fdt = \"fdt@${2}\";"
+ fi
+ kernel_line="kernel = \"kernel@${1}\";"
+
+ cat << EOF >> fit-image.its
+ };
+
+ configurations {
+ default = "conf@1";
+ conf@1 {
+ description = "${conf_desc}";
+ ${kernel_line}
+ ${fdt_line}
+ hash@1 {
+ algo = "${conf_csum}";
+ };
+ };
+ };
+};
+EOF
+}
+
+do_assemble_fitimage () {
+ if test "x${KERNEL_IMAGETYPE}" = "xfitImage" ; then
+ kernelcount=1
+ dtbcount=""
+ rm -f fit-image.its
+
+ fitimage_emit_section_start
+ #
+ # Step 1: Prepare a kernel image section.
+ #
+ uboot_prep_kimage
+ fitimage_emit_section_kernel "${kernelcount}" linux.bin "${linux_comp}"
+
+ #
+ # Step 2: Prepare a DTB image section
+ #
+ if test -n "${KERNEL_DEVICETREE}"; then
+ dtbcount=1
+ for DTB in ${KERNEL_DEVICETREE}; do
+ if echo ${DTB} | grep -q '/dts/'; then
+ bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used."
+ DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
+ fi
+ DTB_PATH="arch/${ARCH}/boot/dts/${DTB}"
+ if [ ! -e "${DTB_PATH}" ]; then
+ DTB_PATH="arch/${ARCH}/boot/${DTB}"
+ fi
+
+ fitimage_emit_section_dtb ${dtbcount} ${DTB_PATH}
+ dtbcount=`expr ${dtbcount} + 1`
+ done
+
+ # Force the first DTB in the default config
+ dtbcount=1
+ fi
+
+ #
+ # Step 3: Prepare a configurations section
+ #
+ fitimage_emit_section_config ${kernelcount} ${dtbcount}
+
+ #
+ # Step 4: Assemble the image
+ #
+ uboot-mkimage -f fit-image.its arch/${ARCH}/boot/fitImage
+ fi
+}
+
+addtask assemble_fitimage before do_install after do_compile
+
kernel_do_deploy() {
install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
@@ -499,13 +661,34 @@ kernel_do_deploy() {
cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
cd ${B}
+
# Update deploy directory
+
+ if test "x${KERNEL_IMAGETYPE}" = "xfitImage" ; then
+ echo "Copying fit-image.its source file..."
+ its_base_name="${KERNEL_IMAGETYPE}-its-${PV}-${PR}-${MACHINE}-${DATETIME}"
+ its_symlink_name=${KERNEL_IMAGETYPE}-its-${MACHINE}
+ install -m 0644 fit-image.its ${DEPLOYDIR}/${its_base_name}.its
+ linux_bin_base_name="${KERNEL_IMAGETYPE}-linux.bin-${PV}-${PR}-${MACHINE}-${DATETIME}"
+ linux_bin_symlink_name=${KERNEL_IMAGETYPE}-linux.bin-${MACHINE}
+ install -m 0644 linux.bin ${DEPLOYDIR}/${linux_bin_base_name}.bin
+
+ fi
+
if [ -e "${KERNEL_OUTPUT}.initramfs" ]; then
echo "Copying deploy kernel-initramfs image and setting up links..."
initramfs_base_name=${INITRAMFS_BASE_NAME}
initramfs_symlink_name=${KERNEL_IMAGETYPE}-initramfs-${MACHINE}
install -m 0644 ${KERNEL_OUTPUT}.initramfs ${DEPLOYDIR}/${initramfs_base_name}.bin
- cd ${DEPLOYDIR}
+ fi
+
+ cd ${DEPLOYDIR}
+ if test "x${KERNEL_IMAGETYPE}" = "xfitImage" ; then
+ ln -sf ${its_base_name}.its ${its_symlink_name}.its
+ ln -sf ${linux_bin_base_name}.bin ${linux_bin_symlink_name}.bin
+ fi
+
+ if [ -e "${KERNEL_OUTPUT}.initramfs" ]; then
ln -sf ${initramfs_base_name}.bin ${initramfs_symlink_name}.bin
fi
}
--
2.0.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 5/5] Yocto: kernel: Add basic fitImage support
2014-08-07 15:17 ` [PATCH 5/5] Yocto: kernel: Add basic fitImage support Marek Vasut
@ 2014-08-11 0:55 ` Otavio Salvador
0 siblings, 0 replies; 8+ messages in thread
From: Otavio Salvador @ 2014-08-11 0:55 UTC (permalink / raw)
To: Marek Vasut; +Cc: Patches and discussions about the oe-core layer
On Thu, Aug 7, 2014 at 12:17 PM, Marek Vasut <marex@denx.de> wrote:
> This patch adds support for generating a kernel fitImage, which is
> a a successor to the uImage format. Unlike uImage, which could only
> contain the kernel image itself, the fitImage can contain all kinds
> of artifacts, like the kernel image, device tree blobs, initramfs
> images, binary firmwares etc. Furthermore, the fitImage supports
> different kinds of checksums, not only CRC32 like the uImage did.
> Last, but not least, fitImage supports signatures such that either
> the whole image or it's parts can be signed and then in turn can
> be verified by the bootloader.
>
> So far we only add support for wrapping the kernel image and DTB
> into the fitImage. The fitImage uses the sha1 checksum, which is
> the default.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
Could it be reworked and split in a class? it seems the code is quite
big to handle it and I think it will allow for more easy understanding
and development if we can rework this code to be move out of
kernel.bbclass. It does seem to be an image type.
You can take a look how ubifs has been included and do something
similar for FIT.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/5] Add initial fitImage support
2014-08-07 15:17 [PATCH 0/5] Add initial fitImage support Marek Vasut
` (2 preceding siblings ...)
2014-08-07 15:17 ` [PATCH 5/5] Yocto: kernel: Add basic fitImage support Marek Vasut
@ 2014-08-07 20:10 ` Saul Wold
2014-08-07 20:15 ` Marek Vasut
3 siblings, 1 reply; 8+ messages in thread
From: Saul Wold @ 2014-08-07 20:10 UTC (permalink / raw)
To: Marek Vasut, openembedded-core
On 08/07/2014 08:17 AM, Marek Vasut wrote:
> The fitImage is a successor of the U-Boot uImage format, which is considered
> legacy for years now. The fitImage allows packing multiple kernel images,
> DTBs and other artifacts into a single image, which can then be protected
> by SHA checksums and does even support signing the images for verified boot.
>
> This patchset is the first stab at adding the new image format into Yocto.
>
> Marek Vasut (5):
> Yocto: kernel: Rework do_uboot_mkimage
> Yocto: kernel: Pull out the linux.bin generation
> Yocto: kernel: Clean up KERNEL_IMAGETYPE_FOR_MAKE
> Yocto: kernel: Build DTBs early
> Yocto: kernel: Add basic fitImage support
>
> meta/classes/kernel.bbclass | 229 +++++++++++++++++++++++++++++---
> meta/recipes-kernel/linux/linux-dtb.inc | 14 +-
> 2 files changed, 226 insertions(+), 17 deletions(-)
>
Hi Marek,
I am going to make a general request, can you please review the Commit
Guildlines Wiki for Openembedded:
http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
We appreciate your patches, but the commit messages need to be formatted
correctly. The Yocto: tag is not needed and you could clearly include
which recipe, bbclass, file or subsystem (if across multiple files) so
in the above it would be kernel.bbclass: ...
If you could please resubmit your changes with the correct commit
summary for this series and your other patches that would be greatly
appreciated.
Myself and others may have further feedback on your patches.
Thanks
Sau!
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 0/5] Add initial fitImage support
2014-08-07 20:10 ` [PATCH 0/5] Add initial " Saul Wold
@ 2014-08-07 20:15 ` Marek Vasut
0 siblings, 0 replies; 8+ messages in thread
From: Marek Vasut @ 2014-08-07 20:15 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
On Thursday, August 07, 2014 at 10:10:28 PM, Saul Wold wrote:
> On 08/07/2014 08:17 AM, Marek Vasut wrote:
> > The fitImage is a successor of the U-Boot uImage format, which is
> > considered legacy for years now. The fitImage allows packing multiple
> > kernel images, DTBs and other artifacts into a single image, which can
> > then be protected by SHA checksums and does even support signing the
> > images for verified boot.
> >
> > This patchset is the first stab at adding the new image format into
> > Yocto.
> >
> > Marek Vasut (5):
> > Yocto: kernel: Rework do_uboot_mkimage
> > Yocto: kernel: Pull out the linux.bin generation
> > Yocto: kernel: Clean up KERNEL_IMAGETYPE_FOR_MAKE
> > Yocto: kernel: Build DTBs early
> > Yocto: kernel: Add basic fitImage support
> >
> > meta/classes/kernel.bbclass | 229
> > +++++++++++++++++++++++++++++---
> > meta/recipes-kernel/linux/linux-dtb.inc | 14 +-
> > 2 files changed, 226 insertions(+), 17 deletions(-)
>
> Hi Marek,
>
> I am going to make a general request, can you please review the Commit
> Guildlines Wiki for Openembedded:
>
> http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
>
> We appreciate your patches, but the commit messages need to be formatted
> correctly. The Yocto: tag is not needed and you could clearly include
> which recipe, bbclass, file or subsystem (if across multiple files) so
> in the above it would be kernel.bbclass: ...
>
> If you could please resubmit your changes with the correct commit
> summary for this series and your other patches that would be greatly
> appreciated.
>
> Myself and others may have further feedback on your patches.
Ah, thanks! I'll give it a few days and will do V2 as per guidelines. Sorry for
the mistake.
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 8+ messages in thread