Commit Graph

189 Commits

Author SHA1 Message Date
Javier Viguera c8d17d4a93 Merge tag 'dey-2.0-r5.3' 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>
2017-02-15 13:25:35 +01:00
Javier Viguera 99afac66f4 meta-digi: update revisions for dey-2.0-r5.3
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-02-13 12:05:13 +01:00
Javier Viguera 2e003d8385 meta-digi: revert revisions to AUTOREV
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-02-03 17:00:47 +01:00
Javier Viguera c4643eaf0f meta-digi: update revisions for dey-2.0-r5.2
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-02-03 16:58:40 +01:00
Javier Viguera 161117caf0 install_linux: fix failure to boot into recovery
On a CC6, the 'env default -a' command deletes the 'soc_family' variable
that is used on the U-Boot boot scripts to configure the name of the
device tree file to load.

Then if we try to boot into recovery directly (without a reset) because
the variable is not available, it fails to compose the correct name for
the fdt, and gives the error:

  reading uImage--ccimx6sbc-id129.dtb
  ** Unable to read file uImage--ccimx6sbc-id129.dtb **

Force a reset, so the 'soc_family' variable is available again and the
correct fdt_file is loaded.

While on it, add some blank lines to the 'recovery reboot' message, so
it's easier to read.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-02-02 13:32:18 +01:00
Javier Viguera 165f7097e4 Merge branch 'dey-2.0/master' into dey-2.0/maint
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-02-02 12:47:05 +01:00
Diaz de Grenu, Jose 6a431c5363 meta-digi-arm: fix encrypted env support when using ubootenv
The caam encryption check was only done from fw_env_write and fw_env_read
functions, which are not called when using the functions exported as a library.

Move the check_caam_encryption() call to fw_env_open(), which is called from
all code paths. A similar check for AES encryption cannot be moved because it
requires the AES key as an argument.

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

Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2017-02-01 16:29:50 +01:00
Alex Gonzalez 26187f47c6 meta-digi-arm: Add weak assignment for Linux and U-Boot
This will allow to override the variable easily.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
2017-01-31 17:47:32 +01:00
Hector Palacios 50dc84d949 uboot: install_script: add missing semicolons
Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://jira.digi.com/browse/DEL-3603
2017-01-31 11:37:37 +01:00
Javier Viguera 1b387bbe5d meta-digi: revert revisions to AUTOREV
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-01-27 12:01:55 +01:00
Javier Viguera 615350dd26 meta-digi: update revisions for dey-2.0-r5.1
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-01-27 11:58:29 +01:00
Javier Viguera 7005b0a330 Merge branch 'dey-2.0/master' into dey-2.0/maint
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-01-26 18:17:12 +01:00
Hector Palacios 9ea7568d8d install_linux_fw_sd: erase NAND partitions before update
NAND partitions may have pre-existing UBI volume information
and that will tell U-Boot to use 'ubiwrite' to keep UBI wear
leveling information instead of erasing the NAND partition
beforehand. Given that the UBI support in U-Boot is not
particularly complete and stable, and specially if the NAND
partition table has been changed, this could result into
problems during the UBI volume initialization or during the
update process. To prevent such problems it is better that
the NAND partitions are erased.

This loses the UBI wear leveling information but provides
a more reliable deployment install script.

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

https://jira.digi.com/browse/DUB-718
2017-01-26 18:09:59 +01:00
Javier Viguera 85efbb87e2 u-boot-fw-utils: clean compiler warning
Modify patch to clean compiler warning:

warning: passing argument 1 of 'sysfs_mmcboot_set_protection' discards
'const' qualifier from pointer target type

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-01-24 13:55:19 +01:00
David Escalona 2771549da3 uboot: install_script: add recovery image and wipe_update to DEY install script
https://jira.digi.com/browse/DEL-3513

Signed-off-by: David Escalona <david.escalona@digi.com>
2017-01-20 13:25:36 +01:00
Javier Viguera f787a22ef1 u-boot-fw-utils: add patch with minimal U-Boot environment API
Implements functions to get and set variables from U-Boot's environment.

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-01-11 15:00:16 +01:00
David Escalona a7ab3e7fa5 recovery: add new bootscript for the recovery image
Signed-off-by: David Escalona <david.escalona@digi.com>
2016-12-27 17:37:53 +01:00
Javier Viguera 93db03bad7 u-boot-fw-utils: rework patch from meta-swupdate with higher precedence
The patch with the same name in 'meta-swupdate' fails to apply cleanly
after the patches we have done in meta-digi. So add here a version of
the patch that applies cleanly and with higher precedence in the search
path (using 'dey' distro override).

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-12-19 19:15:31 +01:00
Diaz de Grenu, Jose 66c85d94b1 Merge tag 'dey-2.0-r4.2' into dey-2.0/master
Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-11-29 13:39:12 +01:00
Diaz de Grenu, Jose ede7b9b6c0 meta-digi: revert revisions to AUTOREV
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2016-11-25 11:43:09 +01:00
Diaz de Grenu, Jose 6efd9263f3 meta-digi: update revisions for dey-2.0-r4.2
Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-11-25 11:40:48 +01:00
Diaz de Grenu, Jose ac54b0ec7e meta-digi: revert revisions to AUTOREV
This reverts commit 67aa4966ea.
2016-11-18 12:17:42 +01:00
Diaz de Grenu, Jose 67aa4966ea meta-digi: update revisions for dey-2.0-r4.1
Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
2016-11-18 12:14:37 +01:00
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