Commit Graph

166 Commits

Author SHA1 Message Date
Diaz de Grenu, Jose 4b1f84e49b Merge branch 'dey-2.0/master' into dey-2.0/maint
Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-11-18 11:54:01 +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
Hector Palacios 86cb5b15ae install script: do a saveenv before reset
A corner case requires to save the environment so that the
boot command works after reset.

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

https://jira.digi.com/browse/DUB-681
2016-10-19 15:54:17 +02:00
Diaz de Grenu, Jose 934c819fd9 meta-digi-arm: sign/encrypt bootscript
https://jira.digi.com/browse/DUB-679

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-10-19 10:47:09 +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
Hector Palacios ec8555f936 ccimx6ulsbc: update install script to match default recipe
The default DEY image recipe for ccimx6ulsbc builds dey-image-qt.
The graphical backend is determined dynamically.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2016-10-03 12:01:24 +02:00
Javier Viguera ab5f50e16a meta-digi: trailing whitespace cleanup
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-08-31 13:52:15 +02:00
Diaz de Grenu, Jose 3a2c35d850 meta-digi: meta-digi-arm: add environment encryption support to fw_* utils
This patch adds the functionality to automatically detect if the enviroment
is encrypted (through the device tree). If it is, the environment is encrypted
and decrypted as required in a transparent way for the user.

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

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-08-26 10:13:17 +02:00
Isaac Hermida b952cdce8b ccimx6ulsbc: add U-Boot scripts for deploying and booting the system
- boot.txt
    Sets the device tree filename basing on the SOM variant read from
    the HWID and boots from NAND.
- install_linux_fw_sd
    Deploys a full system (as generated by Digi Embedded Yocto) from
    a FAT formatted micro SD card into the NAND flash.

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

Signed-off-by: Isaac Hermida <isaac.hermida@digi.com>
2016-08-25 13:24:01 +02:00
Javier Viguera a7400b47f4 Merge tag 'dey-2.0-r3.2' into dey-2.0/master
Tweaked to maintain the u-boot and linux revisions to AUTOREV instead of
the fixed SHA1s from the tag.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-08-16 12:30:29 +02:00
Javier Viguera d19e9196a0 meta-digi: revert kernel and u-boot revisions to AUTOREV
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-08-11 16:26:21 +02:00
Javier Viguera c92db49554 meta-digi: update revisions for dey-2.0-r3.2
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-08-11 16:24:58 +02:00
Javier Viguera 45763aec39 u-boot-dey: cosmetic, add quotes to warning message
So the warning message shows the TF variable setting in the correct
syntax that they should be written in the project's local.conf

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-08-10 16:45:38 +02:00
Alex Gonzalez 35271a8dc9 Merge branch 'dey-2.0/master' into dey-2.0/maint
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2016-08-04 19:13:00 +02:00
Diaz de Grenu, Jose 4070d9efae meta-digi: meta-digi-arm: u-boot: copy the new artifact u-boot-usb-signed
https://jira.digi.com/browse/DEL-2843

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-08-04 10:34:42 +02:00
Diaz de Grenu, Jose 9e5ee61851 meta-digi: use CAAM for environment encryption
https://jira.digi.com/browse/DUB-652

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-08-01 20:00:11 +02:00
Javier Viguera 5726d97702 meta-digi: revert kernel and u-boot revisions to AUTOREV
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-07-26 12:11:54 +02:00
Javier Viguera 3957edbb0b meta-digi: update revisions for dey-2.0-r3.1
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-07-22 11:48:23 +02:00
Javier Viguera fdf8978e57 linux, u-boot: configure recipes to use maintenance branches
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-07-22 10:32:00 +02:00
Diaz de Grenu, Jose 5ee4340942 meta-digi-arm: u-boot: [cosmetic] correct DEY macro name
https://jira.digi.com/browse/DEL-2804

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-07-21 11:20:03 +02:00
Diaz de Grenu, Jose ebbe0e6d3e Revert "meta-digi-arm: u-boot: use v2015.04 maintenance branch"
The correct U-Boot branch to be used with dey-2.0/master is v2015.04/master, as
it contains the latest development changes (just like dey-2.0/master).

This reverts commit 728619a5bc.
2016-07-19 18:38:12 +02:00
Diaz de Grenu, Jose 3f25006148 meta-digi-arm: u-boot: copy signed and encrypted artifacts
After commit b0a766eafc8 in the U-Boot repository, both signed and
encrypted images will be generated. Copy both of them to the deploy folder

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

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-07-19 18:38:05 +02:00
Diaz de Grenu, Jose f23d8c6abb trustfence: simplify TRUSTFENCE_ configuration macros
Adapt the U-Boot recipe to the last U-Boot Kconfig entries changes.

Simplify the name of some TRUSTFENCE_ configuration macros. These were
used to configure U-Boot, but they will also configure the uImage signature
and encryption processes.

https://jira.digi.com/browse/DUB-602
https://jira.digi.com/browse/DUB-618
https://jira.digi.com/browse/DUB-534

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-07-19 15:48:12 +02:00
Diaz de Grenu, Jose 8ac7da51ef meta-digi-arm: add recipe for the Code Signing Tools
NXP Code signing Tool for the High Assurance Boot library is needed for
signing and encrypting different artifacts (U-Boot image, uImage, ...).

As the CST cannot be included in DEY, the user needs to download the
tarball and add it to the recipe folder.

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

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-07-19 15:48:12 +02:00
Hector Palacios b71f2dacb5 u-boot-fw-utils: add support and config file for CC6UL platform
U-Boot environment on the CC6UL NAND is located at partition /dev/mtd1:
 - original copy is located at offset 0 in the partition
 - redundant copy is located 1 erase block (128K) after the original copy

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

https://jira.digi.com/browse/DEL-2552
2016-07-19 11:47:42 +02:00
Javier Viguera 8ccafb9492 u-boot: disable TF initramfs for CC6UL
At the moment there is no support for rootfs encryption for the CC6UL,
so there is not a ramdisk in the boot image. But with the initial
addition of TF support, the u-boot boot script was being on-the-fly
updated for TF regardless of the platform, making the CC6UL unable to
boot when TF was enabled.

This commit fixes the problem, by just changing the u-boot boot script
when TF is enabled only for the CC6.

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-07-18 11:35:09 +02:00
Isaac Hermida 728619a5bc meta-digi-arm: u-boot: use v2015.04 maintenance branch
Use the maintenance branch for the compatible platforms (ccimx6 and ccimx6ul)

Signed-off-by: Isaac Hermida <isaac.hermida@digi.com>
2016-07-15 16:16:32 +02:00
Alex Gonzalez 9585e313af meta-digi-arm: u-boot-dey: Do not use external compilation unless multiple
u-boots are being build.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2016-07-13 14:14:45 +02:00
Alex Gonzalez da92e2f07d meta-digi-arm: u-boot: Do not override defconfig targets on multiple u-boot
builds.

When building multiple u-boots they get compiled externally into a
directory named after machine defconfigs.

Once there is a directory with the same name as a defconfig it is not
possible to run the defconfig make target.

Fixes https://jira.digi.com/browse/DEL-2644

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2016-07-13 14:14:45 +02:00
Alex Gonzalez c43c9897ad meta-digi-arm: u-boot.inc: Do not override defconfig targets on multiple u-boot
builds.

When building multiple u-boots they get compiled externally into a
directory named after machine defconfigs.

Once there is a directory with the same name as a defconfig it is not
possible to run the defconfig make target.

This change should be only temporary until it gets upstream.

Fixes https://jira.digi.com/browse/DEL-2644

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2016-07-13 14:14:45 +02:00
Alex Gonzalez e22244edde meta-digi-arm: Add u-boot.inc from poky's meta layer.
Moving this file into meta-digi should be temporary until a patch is
upstreamed.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2016-07-13 14:14:45 +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 ff59bf653d ccimx6ulstarter: add U-Boot scripts for deploying and booting the system
- boot.txt
	Sets the device tree filename basing on the SOM variant read from
	the HWID and boots from NAND.
- install_linux_fw_sd
	Deploys a full system (as generated by Digi Embedded Yocto) from
	a FAT formatted micro SD card into the NAND flash.

The u-boot-dey recipe is now fully shared by ccimx6 and ccimx6ul platforms
so we can remove the platform-specific appends.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2016-07-06 16:26:49 +02:00
Hector Palacios 6f2acb17c6 install_linux_fw_sd: parametrize the mmc device index containing the firmware
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2016-07-06 16:26:49 +02:00
Hector Palacios a32cea139b install_linux_fw_sd: expand variables when setting bootcmd to avoid redefining them
The setting of 'bootcmd' in the script was done using single quotes, which
doesn't expand variables. As a consequence the following variables must
be defined again (during the execution of the second part of the script):
 - mmcdev
 - INSTALL_LINUX_FILENAME
 - INSTALL_ROOTFS_FILENAME

This patch changes the single quotes with double quotes, so that these
variables are expanded during the setting of 'bootcmd' with the values
assigned at the begining of the installation script (notice these are
not dynamically generated so there is no risk to expand them).

At the same time we need to escape with a backslash:
 - double quotes containing strings
 - variables that we don't want to expand (like the return value $?)

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2016-07-06 16:26:49 +02:00
Hector Palacios 052775a34c install_linux_fw_sd: fix semi-colons in script
- Add semi-colons to instructions inside 'setenv' commands
- Remove semi-colons in instructions where they are not needed (for
  consistency with the rest of instructions)

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2016-07-06 16:26:49 +02:00
Diaz de Grenu, Jose d7a26cc3e6 meta-digi-arm: u-boot: change name of encrypted artifacts for clarity
https://jira.digi.com/browse/DEL-2663

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-07-01 16:26:53 +02:00
Jose Diaz de Grenu de Pedro 62e0e1c6c6 meta-digi-arm: u-boot: fix trustfence checks logic
There are several possible values for TRUSTFENCE_UBOOT_ENV_DEK:
 * Not defined: if the trustfence support is not included.
                Should not include the feature.
 * 32 characters: when defining a valid key.
                Should include the feature.
 * "0": when explicetily disabling the feature.
                Should not include the feature
 * <other>: Invalid value, should trigger the error.

This commits fixes the logic so that 'None' (no defined) is taken as a valid
value.

Signed-off-by: Jose Diaz de Grenu de Pedro <Jose.DiazdeGrenudePedro@digi.com>
2016-06-20 15:04:47 +02:00
Jose Diaz de Grenu de Pedro ba6b5ffd8c meta-digi-arm: u-boot: add secure boot configuration checks
https://jira.digi.com/browse/DEL-2618

Signed-off-by: Jose Diaz de Grenu de Pedro <Jose.DiazdeGrenudePedro@digi.com>
2016-06-20 09:39:04 +02:00
Jose Diaz de Grenu de Pedro 5c6de74288 meta-digi-dey: trustfence: Explicitely check for "1" for variable enable.
https://jira.digi.com/browse/DEL-2603

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Signed-off-by: Jose Diaz de Grenu de Pedro <Jose.DiazdeGrenudePedro@digi.com>
2016-06-20 09:39:04 +02:00
Jose Diaz de Grenu de Pedro 64c488a821 meta-digi-arm: u-boot: fix syntax error in U-Boot recipe
Signed-off-by: Jose Diaz de Grenu de Pedro <Jose.DiazdeGrenudePedro@digi.com>
2016-06-06 10:06:22 +02:00
Jose Diaz de Grenu de Pedro 5f45a87ebd meta-digi-arm: trustfence: implement Yocto secure boot configuration
Implement the set of TRUSTFENCE_ macros to configure each secure boot feature
available in U-Boot.

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

Signed-off-by: Jose Diaz de Grenu de Pedro <Jose.DiazdeGrenudePedro@digi.com>
2016-06-03 17:46:52 +02:00
Alex Gonzalez 12b196bc0f meta-digi-arm: u-boot-dey: Add secure console trustfence configuration
support.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2016-05-31 17:51:00 +02:00
Javier Viguera 49f55ce7d0 u-boot: u-boot: use v2015.04 master branch
'v2015.04/master' is the branch with Trustfence support.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-05-27 18:25:35 +02:00
Isaac Hermida 68d5f7d536 recipes-bsp: u-boot: Support for ccimx6ul
https://jira.digi.com/browse/DEL-2381
https://jira.digi.com/browse/DEL-2529

Signed-off-by: Isaac Hermida <isaac.hermida@digi.com>
2016-05-13 10:10:13 +02:00
Isaac Hermida 620f94596f meta-digi: Replace COMPATIBLE_MACHINE string for ccimx6
COMPATIBLE_MACHINE is a regular expression, so we need to update the current
pattern for ccimx6 due to it will also match with ccimx6ul.

Signed-off-by: Isaac Hermida <isaac.hermida@digi.com>
2016-05-11 10:22:25 +02:00
Javier Viguera 25e37ca007 install_linux_fw_sd: cosmetic, remove comma and add newline
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-02-18 18:13:44 +01:00
Javier Viguera 1db41c8473 install_linux_fw_sd: workaround bad behavior of 'test' command
Old versions of u-boot 'v2013.0x' have a bug in the shell's test command
that makes structures like:

if test "${not-existing}" = "0x01"; then ...
if test -z "${not-existing}"; then ...

to fail when the checked variable does not exist.

So implement workarounds in the updater script to overcome this problem.

This is needed because the script may be used in modules with an old
pre-installed u-boot.

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-02-18 11:32:39 +01:00
Javier Viguera 792d214927 meta-digi: revert kernel and u-boot revisions to AUTOREV
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-02-15 18:02:34 +01:00
Javier Viguera 5ca0bf76c9 meta-digi: update revisions for dey-2.0-r1.2
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-02-15 17:51:17 +01:00