Commit Graph

63 Commits

Author SHA1 Message Date
Gonzalo Ruiz 9b4a03c14c trustfence: [cosmetic] rename script to trustfence-sign-artifact
The signing script is used for signing multiple artifacts, not just the
kernel, so rename it for a broader use.

https://jira.digi.com/browse/DEL-7047

Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2020-06-04 19:01:34 +02:00
Arturo Buzarra da4145dd13 imx-mkimage: move recipe to native and include its binaries in the SDK
imx-mkimage is a host recipe to provide the mkimage_imx8 binaries, required
for the trustfence support with platform based on AHAB (ccimx8x). Since
these binaries are required to the sign process we need to export it in the
SDK to allow the standalone sign mode, and with that we can simplify the
mechanism to share these binaries with another recipes (u-boot, linux).

Also the do_deploy() from imx-mkimage recipe was removed to avoid overriding
the implementation from the native class and allow populating the mkimage
binaries.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2020-06-01 08:56:20 +02:00
Gabriel Valcazar aa68675f45 ccimx8x-sbc-pro: add support for the C0 SOC in the fw installation scripts
The scripts need to know the SOC's revision to be able to select the correct
imx-boot image. Modify the boot-artifacts bbclass so the renamed imx-boot files
are included in the installation .zip.

Also, bypass the SECO fw check in the uSD script so it can install future
versions that aren't recognized by U-Boot's SECO fw checking logic. The UUU
script doesn't require this bypass, since it doesn't use the Digi update
command to flash the bootloader.

https://jira.digi.com/browse/DEL-7069

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2020-05-28 18:03:09 +02:00
Mike Engel 826ca9b63d trustfence: Export variables that are needed by sign tools.
This commit exports variables that are needed by the sign tools to
select the target HAB.

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2020-02-12 18:50:19 +01:00
Hector Palacios 8320168821 trustfence: homogenize SIGN_MODE variables
* prefix TRUSTFENCE_ to variable SIGN_MODE for DEY
* prefix CONFIG_ to variable SIGN_MODE for script

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-02-12 18:50:19 +01:00
Arturo Buzarra bb36013e7a dey-image-installer: fix BOOTABLE_ARTIFACTS for ConnectCore 8M Nano platform
The bootable artifacts that must go inside the installer ZIP image, are defined
in the variable BOOTABLE_ARTIFACTS. For platforms without RAM_CONFIGS, these
artifacts are obtained from the UBOOT_CONFIG variable.

This commit fixes the final artifact name added to the BOOTABLE_ARTIFACTS that
for some platform is not strictly the same that the UBOOT_CONFIG name.
For example for the U-Boot configuration "ccimx8mn_dvk", corresponds the
bootable artifact "ccimx8mn-dvk"

https://jira.digi.com/browse/DEL-6974

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2020-02-10 14:22:52 +01:00
Mike Engel 1516bd03d0 image-type_digi.bbclass: Fix copy of initramfs when Trustfence is disabled.
This commit fixes the copy of the initramfs final image with the extension
*.tf when Trustfence is disabled. This was introduced by commit
5beec04b ("trustfence: Add Trustfence support for CCMX8X")

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2020-02-05 16:45:34 +01:00
Mike Engel 7477196c9b image-types_digi.bbclass: fix imx-mkimage dependency with sign mode is AHAB
Commit 5beec04b ("trustfence: Add Trustfence support for CCMX8X") introduces
a dependency when the imx-mkimage recipe and the SIGN_MODE is equal to AHAB.
However this dependency should be added only when the TRUSTFENCE_SIGN is equal
to 1 and when the SIGN_MODE is equal to AHAB, not only when the SIGN_MODE is
equal to AHAB. This commit introduces this double check.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2020-02-05 16:31:37 +01:00
Mike Engel 5beec04b6a trustfence: Add Trustfence support for CCMX8X
This commit adds Trustfence support for the CCMX8X
platform.

Signed-off-by: Mike Engel <Mike.Engel@digi.com>

https://jira.digi.com/browse/DEL-6917
2020-02-04 12:20:38 +01:00
Gabriel Valcazar 44487faf6c fsl-eula-unpack: sync with meta-fsl-bsp-release branch sumo-4.14.98-2.3.0
Update the license file checksum

https://jira.digi.com/browse/DEL-6932

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2020-01-16 13:27:54 +01:00
Gabriel Valcazar 0a6941f681 fsl-eula-unpack: sync with meta-fsl-bsp-release branch sumo-4.14.98-2.1.0
Change the license checksum.

https://jira.digi.com/browse/DEL-6722

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2019-09-02 09:43:15 +02:00
Hector Palacios 65ec66b659 dey-image-installer: loop on new BOOTABLE_ARTIFACTS variable
The artifacts that must go inside the installer ZIP image are not anymore
the ones in UBOOT_CONFIG. For CC8X, the artifacts are combinations of
UBOOT_CONFIG and RAM_CONFIGS.

This commit adds a function 'get_bootable_artifacts()' to boot-artifacts class
to generate a new variable BOOTABLE_ARTIFACTS with the list of bootable
artifacts DEY produces.

The installer recipe can then simply iterate on that list, rather than
needing to calculate it by itself.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://jira.digi.com/browse/DEL-6641
2019-07-12 12:49:03 +02:00
Hector Palacios 7d61198cc8 imx-boot: iterate on matching RAM sizes in do_install/do_append
The existing loops were iterating through all RAM_CONFIGS, but
they must only iterate over those that match the RAM size on the
platform's UBOOT_CONFIG.

This commit adds a Python class 'boot-artifacts' to get the list of matching
combinations of RAM_CONFIGS and UBOOT_CONFIG so that the iteration
is easier to do than nesting loops inside one another.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://jira.digi.com/browse/DEL-6641
2019-07-12 12:33:18 +02:00
Hector Palacios e50f6c3e91 u-boot: fix the use of boot image recipe and prefix
A variable called IMAGE_BOOTLOADER was being used without distinction for
referring to two different things:
 - the recipe that builds the bootable artifacts
 - the prefix of those artifacts

The value of this is "u-boot" for most platforms, but "imx-boot" for the
CC8X based platforms.

The name of the variable is misleading, so this commit splits it into two:
 - BOOTLOADER_IMAGE_RECIPE, to refer to the recipe
 - UBOOT_PREFIX, to refer to the prefix of the bootable artifact

With the separation, the variable UBOOT_SYMLINK becomes a generic formed
one, so it is moved to digi-defaults.inc.

While on it, fix the image_types_digi.bbclass which was not making use of
the original variable to establish all the dependencies.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2019-07-12 11:04:47 +02:00
Gabriel Valcazar 3531a6521f classes: update NXP bbclasses
Update NXP's .bbclass files with the ones in meta-fsl-bsp-release branch
sumo-4.14.98-2.0.0_ga.

https://jira.digi.com/browse/DEL-6603

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2019-05-15 10:32:41 +02:00
Arturo Buzarra 13c316db25 thud migration: image_types_digi: fix DTB file names to generate boot images
Device tree names don't use KERNEL_IMAGETYPE as a prefix anymore,
since in this version, there are different variable names to generate
device tree files.

https://jira.digi.com/browse/DEL-6443

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2019-02-07 13:32:54 +01:00
Arturo Buzarra 5eb88b8c5d sumo migration: meta-digi: replace the deprecated base_conditional function
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2019-01-11 13:26:44 +01:00
Gabriel Valcazar 39b247438c sdcard: generalize bootloader processing when generating sdcard images
This allows for other platforms to use different bootloaders (like imx-boot),
while leaving the default behaviour intact.

https://jira.digi.com/browse/DEL-6159

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2018-09-04 17:11:41 +02:00
Hector Palacios 4750c36030 image_types: remove potential sub-folder from device tree files
The boot.(ext) image class was looping over ${KERNEL_DEVICETREE}
variable which is normally the list of device tree filenames.
The loop however does not take into account the possibility that
this list of files are within a sub-folder, as it happens with
ARM64 device tree files in the kernel tree.

Use 'basename' to remove any potential subfolder on the iterations.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://jira.digi.com/browse/DEL-6060
2018-07-10 13:34:40 +02:00
Hector Palacios 59d1d37c2f classes: add some required NXP classes
These are required for the imx-m4-demos. The classes exist in
meta-fsl-bsp-release but will eventually be moved to meta-freescale
so, presumably, they could be removed in the future.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2018-07-03 08:33:31 +02:00
Jose Diaz de Grenu 8a81b2cb25 rocko migration: trustfence: fix dependencies
https://jira.digi.com/browse/DEL-5518

Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
2018-01-12 15:59:04 +01:00
Jose Diaz de Grenu ebc927b220 rocko migration: adapt trustfence conversion
https://jira.digi.com/browse/DEL-5518

Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
2018-01-09 11:33:19 +01:00
Jose Diaz de Grenu 203dc44300 rocko migration: add missing dependency for 'truncate'
Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
2018-01-05 14:08:23 +01:00
Jose Diaz de Grenu 199e48d635 rocko migration: adapt dependencies for images
As per Yocto 2.4, do_image_<type>[depends] has replaced IMAGE_DEPENDS_<type>.

The previous trick to propagate *boot* dependencies from *boot.[vfat|ubifs]*
is no longer needed.

https://jira.digi.com/browse/DEL-5518

Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
2018-01-05 14:08:05 +01:00
Javier Viguera d2df029153 ccardimx28js removal: clean image_type class
Actually remove the code to generate SD card images.

https://jira.digi.com/browse/DEL-4771

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-08-04 17:38:30 +02:00
Javier Viguera efba5b5e7c image_types class: fix build error due to missing images dependencies
A couple of commits in poky.git broke the dependence from our boot and
recovery images to the trustfence and recovery initramfs images:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=morty&id=6c3d10ea62ad282a764da83aa701f92c6d3db6cb
http://git.yoctoproject.org/cgit.cgi/poky/commit/?h=morty&id=99c6c878ee122a04f23ef49ea653208ca1c7aa77

This commit fixes the dependencies again, so when you build those images,
it builds first the required initramfs images.

https://jira.digi.com/browse/DEL-4320

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-05-26 18:32:34 +02:00
David Escalona 42856f87aa boot-script: merge 'recovery' and 'boot' scripts into 'boot'
- Instead of using a different boot script when booting from linux
  and from recovery, merge them into one script that checks the
  boot source.

https://jira.digi.com/browse/DEL-3836

Signed-off-by: David Escalona <david.escalona@digi.com>
2017-03-14 18:45:53 +01:00
Javier Viguera 0cb35907cd morty migration: meta-digi-arm: update image_types bbclass
* Transfer dependences from base types 'boot' and 'recovery' to the
  actual image types 'boot.vfat', 'boot.ubifs', 'recovery.vfat' and
  'recovery.ubifs' using IMAGE_TYPEDEP variable.

* Now the images are created in a per image recipe deploy directory
  (IMGDEPLOYDIR), so use that instead of the final DEPLOY_DIR_IMAGE.

* Remove manual creation of symbolic links and let Poky create them. For
  this, we need to remove the default 'rootfs' image suffix using the
  imgsuffix variable flag for the corresponding do_image_* functions.

https://jira.digi.com/browse/DEL-3451

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-02-28 11:46:57 +01:00
Javier Viguera 41b3631934 morty migration: image_types_digi: fix initramfs Trustfence signing
As of Yocto 2.2, the way to generate images has changed. Now the image
fstypes have a basetype and then conversion types that define functions
that apply sequentially.

So implement the TrustFence initramfs sign process as a conversion type
of the base initramfs type (cpio).

This fixes following build issue:

mv: cannot stat ‘dey-image-recovery-initramfs-ccimx6ulstarter-20170220152625.rootfs.cpio.gz.u-boot’

https://jira.digi.com/browse/DEL-3451

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-02-28 11:46:57 +01:00
David Escalona 047849b848 recovery: add recovery image types for DEY images generation
- Added the new image type 'recovery.vfat' to the DEY images
  generation process. This new image is a clone of the 'boot.vfat'
  but including the recovery ramdisk and the recovery boot script.

- Added the new image type 'recovery.ubifs' to the DEY images
  generation process. This new image is similar to the 'boot.ubifs'
  but including the recovery ramdisk and the recovery boot script.

Signed-off-by: David Escalona <david.escalona@digi.com>
2016-12-27 17:37:53 +01:00
Diaz de Grenu, Jose b30cd6eb2b Revert "meta-digi-arm: Add rootfs.initramfs image generation."
This image type is not used anymore.

This reverts commit aef38bc285.
2016-11-29 19:40:47 +01:00
Alex Gonzalez b3e5837cf4 trustfence-initramfs: Extend for the ccimx6ul
https://jira.digi.com/browse/DEL-3173

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2016-11-14 18:40:30 +01:00
Diaz de Grenu, Jose 796334fa9a trustfence: fix initramfs name when signed images are disabled
It is desirable to keep the name of the initramfs images the same regardless of
the sign and encryption configuration.

https://jira.digi.com/browse/DEL-3141

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-10-24 17:39:02 +02:00
Diaz de Grenu, Jose 7a02e1b00a trustfence: define new type of image for signed/encrypted ramdisks
Also change the image type of dey-image-trustfence-initramfs.

https://jira.digi.com/browse/DUB-615

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-10-19 10:33:34 +02:00
Javier Viguera 0d2130625b image-types_digi.bbclass: fix u-boot image for SDCARD when TF is enabled
When TRUSTFENCE_SIGN is enabled, the u-boot binary for the SDCARD image
needs to be the "signed" one.

https://jira.digi.com/browse/DEL-2876

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-08-10 13:11:50 +02:00
Javier Viguera d80aa91c28 meta-digi-arm: set 'boot.ubifs' image depends explictly
To build the CC6UL boot image, the u-boot and linux images need to be
already deployed. Also the native mtd-utils package needs to be
available in the sysroot.

Make all this dependences explicit for deterministic reproducibility.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-07-19 12:35:51 +02:00
Javier Viguera 6f8c58291e meta-digi: add support for Trustfence secure rootfs
When Trustfence is enabled, this adds a dependence on the TF initramfs,
so it's built and added to the boot image.

It also modifies the u-boot boot script on the fly, to boot correctly
using the Trustfence initramfs.

https://jira.digi.com/browse/DEL-2278

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-07-07 18:04:08 +02:00
Hector Palacios 846e1cd07f image-types_digi.bbclass: implement boot.ubifs image type
This creates a UBIFS file with the kernel, device tree files, and U-Boot
bootscripts generated by Digi Embedded Yocto.
The resulting image can be then programmed into the boot (linux) partition.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://jira.digi.com/browse/DEL-2697
2016-07-06 18:05:30 +02:00
Jose Diaz de Grenu de Pedro 3549a999fc meta-digi-arm: image_types_digi: use TARGET_ARCH instead of ARCH
ARCH is not a documented variable in yocto, use the documented
TARGET_ARCH instead.

https://jira.digi.com/browse/DEL-2032

Signed-off-by: Jose Diaz de Grenu de Pedro <Jose.DiazdeGrenudePedro@digi.com>
2015-11-24 16:27:20 +01:00
Javier Viguera 6b31e716a5 meta-digi-arm: rework SD card generation class
This is needed in the context of CC6 variants 0x7 and 0x9 (EMMC-less).

Changes:

* Do not use 'meta-fsl-arm' image generation class: removed include and
  override SDCARD generation function
* Use same VFAT boot image for EMMC and SD card. The u-boot bootscript
  has been adapted to be able to boot Linux from both SD and EMMC.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
(cherry picked from commit 8b8456b8fd90facd92dfc87632effa582ca60475)
2015-06-25 18:44:13 +02:00
Javier Viguera d9b4d0731e meta-digi-arm: set BOARD_BOOTIMAGE_PARTITION_SIZE in KiB
This will allow in following commit to use the same VFAT boot image for
EMMC and SD. Until now we were creating different boot images for EMMC
and SD card images.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
(cherry picked from commit 13e9ec7608d42430c2a01a728d030752a71f7948)
2015-06-25 18:43:37 +02:00
Javier Viguera f8da7787ef image-types_digi.bbclass: fix typo
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2015-03-13 18:43:12 +01:00
Javier Viguera e42a291557 meta-digi: support ccardimx28js SD images based on kernel 2.6.35
Notes:

  * This version of u-boot does not support comments in scripts
  * Enabled EXT4 in kernel config (for the SDCARD rootfs)

https://jira.digi.com/browse/DEL-197

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2015-01-12 16:45:04 +01:00
Javier Viguera 0a5aa1c24d meta-digi: support generation of sdcard images for ccardimx28js
https://jira.digi.com/browse/DEL-197

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2015-01-09 19:13:33 +01:00
Javier Viguera 09e72aa0f4 meta-digi-arm: simplify flash images generation
We inherited from DEL the requirement to build more than one flash image
for the same rootfs contents depending on the EBS of the flash chip.

Yocto does not have support to generate more than one flash image so we
had to create functions in the image_types_digi bbclass to provide this
feature.

This commit removes that functionality and uses the standard yocto
support to generate ubifs and jffs2 flash images. The way to customize
the flash parameters is via EXTRA_IMAGECMD_jffs2 and MKUBIFS_ARGS
variables. In our case those variables are already set depending on the
different hardware variants.

https://jira.digi.com/browse/DEL-232

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2014-12-02 16:49:12 +01:00
Alex Gonzalez aef38bc285 meta-digi-arm: Add rootfs.initramfs image generation.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2014-12-01 11:51:51 +01:00
Javier Viguera 8a8054fccc image-types_digi.bbclass: remove USE_DEVFS override
USE_DEVFS = "1" is the default now in poky

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2014-10-06 18:20:26 +02:00
Robert Hodaszi 7b649a1f03 image-types_digi.bbclass: add possibility to append extra arguments to UBIFS image creation
Add possibility for other layers to add additional features for UBIFS creation,
e.g. "-R <rp_size>" for super-user reserved pool.

Signed-off-by: Robert Hodaszi <robert.hodaszi@digi.com>
2014-09-12 17:48:19 +02:00
Javier Viguera e639db7ebf meta-digi-arm: rename kernel and fdt files to uboot defaults
https://jira.digi.com/browse/DEL-1057

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2014-05-06 14:09:03 +02:00
Javier Viguera be88589716 meta-digi-arm: fix code to generate JFFS2 and UBIFS images
It was broken after the upgrade to Yocto 1.6 because the framework to
generate images in Yocto 1.6 changed.

https://jira.digi.com/browse/DEL-1032

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2014-04-03 19:40:00 +02:00