Commit Graph

46 Commits

Author SHA1 Message Date
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 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
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
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
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 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
Javier Viguera e627bfb1b1 u-boot: use v2015.04 maintenance branch
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-02-12 13:51:21 +01:00
Hector Palacios e9481ecd19 meta-digi-arm: add DEY firmware install U-Boot script
The install script allows for an easy deployment of the DEY firmware
artifacts into the eMMC of the ConnectCore 6 by using a micro SD card.
The install script:
	- updates U-Boot
	- resets the U-Boot environmnet to default values
	- formats the User Data partition of the eMMC
	- installs the firmware images (linux and rootfs partitions)
	- resets/starts the system

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

https://jira.digi.com/browse/DEL-2192
2016-02-12 12:41:43 +01:00
Hector Palacios d59fab0cc9 u-boot-dey: remove canonical symlinks and add new ones (per U-Boot config)
The canonical symlinks created by poky's U-Boot class in u-boot.inc for
the different U-Boot configs are in the form:
	u-boot.imx-<config>
	u-boot-<machine>.imx-<config>

These symlinks have the .imx file extension hidden in the middle of the
file name, which looks ugly.
For DEY, remove these unused symlinks and generate new ones in the form:
	u-boot-<config>.imx

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

https://jira.digi.com/browse/DEL-2192
2016-02-12 12:15:45 +01:00
Hector Palacios 308c5c337d u-boot-dey: [cosmetic] add comment to DEY boot script
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2016-02-12 12:10:47 +01:00
Javier Viguera 76415ed99e meta-digi: revert kernel and u-boot revisions to AUTOREV
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-02-02 17:45:16 +01:00
Javier Viguera 842c17a9b2 meta-digi: update revisions for dey-2.0-r1.1
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-02-02 17:16:14 +01:00
Javier Viguera 7915cc9c3f meta-digi: update to new github account 'digi-embedded'
As the plan is to use the same git objects (SHA1) in the internal and
github repos, also remove that internal/external SRCREV infrastructure.

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-02-01 18:52:45 +01:00
Javier Viguera 79cca553e5 meta-digi: revert kernel and u-boot revisions to AUTOREV
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2015-12-04 14:43:05 +01:00
Javier Viguera cd2e929c92 meta-digi: update revisions for dey-2.0.0.1
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2015-12-04 14:28:05 +01:00
Javier Viguera 20c2fbd8ba meta-digi-arm: fix u-boot license md5sum
ERROR: u-boot-dey: md5 data is not matching for file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95
ERROR: u-boot-dey: The new md5 checksum is c7383a594871c03da76b3707929d2919

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2015-11-05 14:02:31 +01:00
Alex Gonzalez a81a7d586c meta-digi: revert revisions to AUTOREV
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2015-10-15 15:36:10 +02:00
Alex Gonzalez f032e1a132 meta-digi: update SRCREVs for dey-1.8.0.2
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2015-10-15 15:35:36 +02:00
Javier Viguera 3b0d4e1797 meta-digi-arm: rework u-boot 2015.04 recipe
* Merge u-boot-dey-rev_2015.04.inc into the recipe. There is no need to
  split the recipe, as there is no other recipe using this u-boot code.

* Update uboot configurations to the new format '_defconfig'. Also add
  the new 2GB variant.

* Remove PREFERRED_VERSION_u-boot-dey for CC6, as there is only one
  version available for this platform.

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2015-10-05 17:27:11 +02:00
Alex Gonzalez f33afc53b4 meta-digi-arm: update uboot to v2015.04 and make default for CC6
https://jira.digi.com/browse/DEL-1829

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2015-10-05 16:04:04 +02:00