mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
oe-selftest: fitimage: support new FIT recipe as well
Enable all existing tests to be compatible with FIT images generated either by the new linux-yocto-fitimage recipe or the legacy kernel-fitimage.bbclass approach. - Make the following configurations optional: - KERNEL_IMAGETYPES += "fitImage" - KERNEL_CLASSES = "kernel-fitimage" - Allow the tests to specify which kernel recipe should be used for the build (e.g., linux-yocto, linux-yocto-fitimage, etc.) (From OE-Core rev: 20cbb095f8685848aa5e31d04006b9842b387912) Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Adrian Freihofer
Richard Purdie
parent
87fc591150
commit
0208abfd4b
|
|
@ -413,6 +413,7 @@ class KernelFitImageBase(FitImageTestCase):
|
|||
'INITRAMFS_IMAGE_BUNDLE',
|
||||
'INITRAMFS_IMAGE_NAME',
|
||||
'INITRAMFS_IMAGE',
|
||||
'KERNEL_DEPLOYSUBDIR',
|
||||
'KERNEL_DEVICETREE',
|
||||
'KERNEL_FIT_LINK_NAME',
|
||||
'MACHINE',
|
||||
|
|
@ -429,10 +430,21 @@ class KernelFitImageBase(FitImageTestCase):
|
|||
'UBOOT_SIGN_KEYDIR',
|
||||
'UBOOT_SIGN_KEYNAME',
|
||||
}
|
||||
bb_vars = get_bb_vars(list(internal_used | set(additional_vars)), "virtual/kernel")
|
||||
bb_vars = get_bb_vars(list(internal_used | set(additional_vars)), self.kernel_recipe)
|
||||
self.logger.debug("bb_vars: %s" % pprint.pformat(bb_vars, indent=4))
|
||||
return bb_vars
|
||||
|
||||
def _config_add_kernel_classes(self, config):
|
||||
config += '# Use kernel-fitimage.bbclass for the creation of the fitImage' + os.linesep
|
||||
config += 'KERNEL_IMAGETYPES += " fitImage "' + os.linesep
|
||||
config += 'KERNEL_CLASSES = " kernel-fitimage "' + os.linesep
|
||||
return config
|
||||
|
||||
@property
|
||||
def kernel_recipe(self):
|
||||
# virtual/kernel does not work with SRC_URI:append:pn-%s
|
||||
return "linux-yocto"
|
||||
|
||||
def _config_add_uboot_env(self, config):
|
||||
"""Generate an u-boot environment
|
||||
|
||||
|
|
@ -446,7 +458,7 @@ class KernelFitImageBase(FitImageTestCase):
|
|||
config += '# Add an u-boot script to the fitImage' + os.linesep
|
||||
config += 'FIT_UBOOT_ENV = "%s"' % fit_uenv_file + os.linesep
|
||||
config += 'FILESEXTRAPATHS:prepend := "${TOPDIR}/%s:"' % test_files_dir + os.linesep
|
||||
config += 'SRC_URI:append:pn-linux-yocto = " file://${FIT_UBOOT_ENV}"' + os.linesep
|
||||
config += 'SRC_URI:append:pn-%s = " file://${FIT_UBOOT_ENV}"' % self.kernel_recipe + os.linesep
|
||||
|
||||
if not os.path.isdir(test_files_dir):
|
||||
os.makedirs(test_files_dir)
|
||||
|
|
@ -458,7 +470,7 @@ class KernelFitImageBase(FitImageTestCase):
|
|||
|
||||
def _bitbake_fit_image(self, bb_vars):
|
||||
"""Bitbake the kernel and return the paths to the its file and the FIT image"""
|
||||
bitbake("virtual/kernel")
|
||||
bitbake(self.kernel_recipe)
|
||||
|
||||
# Find the right its file and the final fitImage and check if both files are available
|
||||
deploy_dir_image = bb_vars['DEPLOY_DIR_IMAGE']
|
||||
|
|
@ -477,8 +489,13 @@ class KernelFitImageBase(FitImageTestCase):
|
|||
fitimage_name = "fitImage" # or fitImage-${KERNEL_IMAGE_LINK_NAME}${KERNEL_IMAGE_BIN_EXT}
|
||||
else:
|
||||
self.fail('Invalid configuration: INITRAMFS_IMAGE_BUNDLE = "1" and not INITRAMFS_IMAGE')
|
||||
fitimage_its_path = os.path.realpath(os.path.join(deploy_dir_image, fitimage_its_name))
|
||||
fitimage_path = os.path.realpath(os.path.join(deploy_dir_image, fitimage_name))
|
||||
kernel_deploysubdir = bb_vars['KERNEL_DEPLOYSUBDIR']
|
||||
if kernel_deploysubdir:
|
||||
fitimage_its_path = os.path.realpath(os.path.join(deploy_dir_image, kernel_deploysubdir, fitimage_its_name))
|
||||
fitimage_path = os.path.realpath(os.path.join(deploy_dir_image, kernel_deploysubdir, fitimage_name))
|
||||
else:
|
||||
fitimage_its_path = os.path.realpath(os.path.join(deploy_dir_image, fitimage_its_name))
|
||||
fitimage_path = os.path.realpath(os.path.join(deploy_dir_image, fitimage_name))
|
||||
return (fitimage_its_path, fitimage_path)
|
||||
|
||||
def _get_req_its_paths(self, bb_vars):
|
||||
|
|
@ -677,6 +694,7 @@ class KernelFitImageBase(FitImageTestCase):
|
|||
uboot_sign_keyname = bb_vars['UBOOT_SIGN_KEYNAME']
|
||||
uboot_sign_img_keyname = bb_vars['UBOOT_SIGN_IMG_KEYNAME']
|
||||
deploy_dir_image = bb_vars['DEPLOY_DIR_IMAGE']
|
||||
kernel_deploysubdir = bb_vars['KERNEL_DEPLOYSUBDIR']
|
||||
fit_sign_individual = bb_vars['FIT_SIGN_INDIVIDUAL']
|
||||
fit_hash_alg_len = FitImageTestCase.MKIMAGE_HASH_LENGTHS[fit_hash_alg]
|
||||
fit_sign_alg_len = FitImageTestCase.MKIMAGE_SIGNATURE_LENGTHS[fit_sign_alg]
|
||||
|
|
@ -690,6 +708,8 @@ class KernelFitImageBase(FitImageTestCase):
|
|||
self.assertEqual(len(sign_value), fit_sign_alg_len, 'Signature value for section %s not expected length' % section)
|
||||
dtb_file_name = section.replace(bb_vars['FIT_CONF_PREFIX'], '')
|
||||
dtb_path = os.path.join(deploy_dir_image, dtb_file_name)
|
||||
if kernel_deploysubdir:
|
||||
dtb_path = os.path.join(deploy_dir_image, kernel_deploysubdir, dtb_file_name)
|
||||
# External devicetrees created by devicetree.bbclass are in a subfolder and have priority
|
||||
dtb_path_ext = os.path.join(deploy_dir_image, "devicetree", dtb_file_name)
|
||||
if os.path.exists(dtb_path_ext):
|
||||
|
|
@ -735,10 +755,7 @@ class KernelFitImageTests(KernelFitImageBase):
|
|||
Author: Usama Arif <usama.arif@arm.com>
|
||||
"""
|
||||
config = """
|
||||
# Enable creation of fitImage
|
||||
KERNEL_IMAGETYPE = "Image"
|
||||
KERNEL_IMAGETYPES += " fitImage "
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
|
||||
# RAM disk variables including load address and entrypoint for kernel and RAM disk
|
||||
IMAGE_FSTYPES += "cpio.gz"
|
||||
|
|
@ -752,6 +769,7 @@ UBOOT_ENTRYPOINT = "0x80080000"
|
|||
FIT_DESC = "A model description"
|
||||
FIT_CONF_PREFIX = "foo-"
|
||||
"""
|
||||
config = self._config_add_kernel_classes(config)
|
||||
self.write_config(config)
|
||||
bb_vars = self._fit_get_bb_vars()
|
||||
self._test_fitimage(bb_vars)
|
||||
|
|
@ -813,11 +831,10 @@ MACHINE = "beaglebone-yocto"
|
|||
config = """
|
||||
# Enable creation of fitImage
|
||||
MACHINE = "beaglebone-yocto"
|
||||
KERNEL_IMAGETYPES += " fitImage "
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
# Add a devicetree overlay which does not need kernel sources
|
||||
PREFERRED_PROVIDER_virtual/dtb = "bbb-dtbs-as-ext"
|
||||
"""
|
||||
config = self._config_add_kernel_classes(config)
|
||||
config = self._config_add_uboot_env(config)
|
||||
self.write_config(config)
|
||||
bb_vars = self._fit_get_bb_vars()
|
||||
|
|
@ -841,14 +858,13 @@ PREFERRED_PROVIDER_virtual/dtb = "bbb-dtbs-as-ext"
|
|||
config = """
|
||||
# Enable creation of fitImage
|
||||
MACHINE = "beaglebone-yocto"
|
||||
KERNEL_IMAGETYPES += " fitImage "
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
UBOOT_SIGN_ENABLE = "1"
|
||||
UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys"
|
||||
UBOOT_SIGN_KEYNAME = "dev"
|
||||
UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'"
|
||||
FIT_CONF_DEFAULT_DTB = "am335x-bonegreen.dtb"
|
||||
"""
|
||||
config = self._config_add_kernel_classes(config)
|
||||
config = self._config_add_uboot_env(config)
|
||||
self.write_config(config)
|
||||
|
||||
|
|
@ -890,8 +906,6 @@ FIT_CONF_DEFAULT_DTB = "am335x-bonegreen.dtb"
|
|||
config = """
|
||||
# Enable creation of fitImage
|
||||
MACHINE = "beaglebone-yocto"
|
||||
KERNEL_IMAGETYPES += " fitImage "
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
UBOOT_SIGN_ENABLE = "1"
|
||||
FIT_GENERATE_KEYS = "1"
|
||||
UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys"
|
||||
|
|
@ -900,6 +914,7 @@ UBOOT_SIGN_KEYNAME = "cfg-oe-selftest"
|
|||
FIT_SIGN_INDIVIDUAL = "1"
|
||||
UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'"
|
||||
"""
|
||||
config = self._config_add_kernel_classes(config)
|
||||
config = self._config_add_uboot_env(config)
|
||||
self.write_config(config)
|
||||
bb_vars = self._fit_get_bb_vars()
|
||||
|
|
@ -930,8 +945,6 @@ MACHINE = "beaglebone-yocto"
|
|||
INITRAMFS_IMAGE = "core-image-minimal-initramfs"
|
||||
INITRAMFS_SCRIPTS = ""
|
||||
UBOOT_MACHINE = "am335x_evm_defconfig"
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
KERNEL_IMAGETYPES = "fitImage"
|
||||
UBOOT_SIGN_ENABLE = "1"
|
||||
UBOOT_SIGN_KEYNAME = "beaglebonekey"
|
||||
UBOOT_SIGN_KEYDIR ?= "${DEPLOY_DIR_IMAGE}"
|
||||
|
|
@ -949,6 +962,7 @@ KERNEL_IMAGETYPE_REPLACEMENT = "zImage"
|
|||
FIT_KERNEL_COMP_ALG = "none"
|
||||
FIT_HASH_ALG = "sha256"
|
||||
"""
|
||||
config = self._config_add_kernel_classes(config)
|
||||
config = self._config_add_uboot_env(config)
|
||||
self.write_config(config)
|
||||
|
||||
|
|
@ -986,8 +1000,6 @@ INITRAMFS_IMAGE_BUNDLE = "1"
|
|||
INITRAMFS_IMAGE = "core-image-minimal-initramfs"
|
||||
INITRAMFS_SCRIPTS = ""
|
||||
UBOOT_MACHINE = "am335x_evm_defconfig"
|
||||
KERNEL_CLASSES = " kernel-fitimage "
|
||||
KERNEL_IMAGETYPES = "fitImage"
|
||||
UBOOT_SIGN_ENABLE = "1"
|
||||
UBOOT_SIGN_KEYNAME = "beaglebonekey"
|
||||
UBOOT_SIGN_KEYDIR ?= "${DEPLOY_DIR_IMAGE}"
|
||||
|
|
@ -1003,12 +1015,14 @@ KERNEL_IMAGETYPE_REPLACEMENT = "zImage"
|
|||
FIT_KERNEL_COMP_ALG = "none"
|
||||
FIT_HASH_ALG = "sha256"
|
||||
"""
|
||||
config = self._config_add_kernel_classes(config)
|
||||
config = self._config_add_uboot_env(config)
|
||||
self.write_config(config)
|
||||
bb_vars = self._fit_get_bb_vars()
|
||||
self._gen_signing_key(bb_vars)
|
||||
self._test_fitimage(bb_vars)
|
||||
|
||||
|
||||
class FitImagePyTests(KernelFitImageBase):
|
||||
"""Test cases for the fitimage.py module without calling bitbake"""
|
||||
|
||||
|
|
@ -1114,6 +1128,8 @@ class FitImagePyTests(KernelFitImageBase):
|
|||
class UBootFitImageTests(FitImageTestCase):
|
||||
"""Test cases for the uboot-sign bbclass"""
|
||||
|
||||
BOOTLOADER_RECIPE = "virtual/bootloader"
|
||||
|
||||
def _fit_get_bb_vars(self, additional_vars=[]):
|
||||
"""Get bb_vars as needed by _test_sign_fit_image
|
||||
|
||||
|
|
@ -1155,13 +1171,13 @@ class UBootFitImageTests(FitImageTestCase):
|
|||
'UBOOT_SIGN_KEYDIR',
|
||||
'UBOOT_SIGN_KEYNAME',
|
||||
}
|
||||
bb_vars = get_bb_vars(list(internal_used | set(additional_vars)), "virtual/bootloader")
|
||||
bb_vars = get_bb_vars(list(internal_used | set(additional_vars)), UBootFitImageTests.BOOTLOADER_RECIPE)
|
||||
self.logger.debug("bb_vars: %s" % pprint.pformat(bb_vars, indent=4))
|
||||
return bb_vars
|
||||
|
||||
def _bitbake_fit_image(self, bb_vars):
|
||||
"""Bitbake the bootloader and return the paths to the its file and the FIT image"""
|
||||
bitbake("virtual/bootloader")
|
||||
bitbake(UBootFitImageTests.BOOTLOADER_RECIPE)
|
||||
|
||||
deploy_dir_image = bb_vars['DEPLOY_DIR_IMAGE']
|
||||
machine = bb_vars['MACHINE']
|
||||
|
|
@ -1675,7 +1691,7 @@ FIT_SIGN_INDIVIDUAL = "1"
|
|||
bb_vars = self._fit_get_bb_vars()
|
||||
self._gen_signing_key(bb_vars)
|
||||
|
||||
bitbake("virtual/bootloader")
|
||||
bitbake(UBootFitImageTests.BOOTLOADER_RECIPE)
|
||||
|
||||
# Just check the DTB of u-boot since there is no u-boot FIT image
|
||||
self._check_kernel_dtb(bb_vars)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user