Commit Graph

1427 Commits

Author SHA1 Message Date
Hector Palacios 2ade93d8eb u-boot-dey: restore modified env vars in case of error on bootscript
The boot script appends values to certain variables such as
$extra_bootargs and $overlays.

If the final instruction of the boot script (dboot command)
fails, these variables contain the new values, plus the original
one. Since the user recovers the prompt, he may do a 'saveenv'
to save the environment, and the modified variables will be
saved, only to be enlarged again on the next boot.
This can lead to repeated strings on such variables.

Save the original value and restore it in case of failure on
the dboot command.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-10-01 16:13:46 +02:00
Hector Palacios 3786647d1c ccimx8x/mn: rename dt overlays filenames
Follow the syntax:

  _ov_<som|board>_<functionality>[_<hardware>].dts

where:
  _ov_          identifies the file as an overlay.
  som|board     identifies whether the overlay applies to the SOM
		or to the carrier board.
  functionality identifies the function of the overlay.
  hardware      identifies the hardware to which the overlay
		applies.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-09-29 18:06:02 +02:00
Hector Palacios b198602b0c Merge branch 'zeus' into dey-3.0/maint
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-09-29 17:02:25 +02:00
Gabriel Valcazar ff756dd8f7 meta-digi: revert revisions to AUTOREV 2020-09-28 13:50:28 +02:00
Gabriel Valcazar 5cb7ecc3a5 meta-digi: update revisions for dey-3.0-r1.6
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2020-09-28 13:47:32 +02:00
Hector Palacios fe6d67ad2c u-boot: fix scripts for variants with old-style HWID
Wrapping unterminated lines doesn't work for scripts (even
if they contain the backslash).
Substitute with full non-wrapped if/elif sentences.

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

https://jira.digi.com/browse/DEL-7252
2020-09-28 11:24:23 +02:00
Gabriel Valcazar 66471fd0c2 ccimx6qpsbc: bootscript: hardcode imx6qp soc_family for all SOC variants
In the ccimx6sbc, since each SOC has a separate set of device trees, we can use
the soc_family environment variable when generating the name of the final
device tree in the bootscript. However, for the ccimx6qpsbc, there is only one
set of device trees with the "imx6qp" prefix, even though there are SOC
variants such as the imx6dp. Running the bootscript on a ccimx6qpsbc with an
imx6dp SOC assembled will result in a failure, since it will look for a
non-existing device tree starting with a "imx6dp" prefix.

Stop using the soc_family variable and hardcode "imx6qp" instead.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2020-09-25 10:23:45 +02:00
Gonzalo Ruiz 4db64974c1 imx-mkimage: ccimx8mn: preserve dtb file after running make
With the latest version of imx-mkimage, the original dtb file is being
removed at the end of the build.

Add a patch to preserve it and be able to run several builds during the
same compile run, like we do for imx-boot signing.

Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2020-09-23 14:50:37 +02:00
Gonzalo Ruiz 358305ffb8 trustfence: enable encrypted environment for CC8MN
Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2020-09-18 16:31:07 +02:00
Mike Engel 4a68333fef meta-digi-arm: machine: Add xwayland support to CCIMX6 platforms
With this change, the ccimx6sbc and ccimx6qpsbc default images will now use the
xwayland backend instead of x11.

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

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2020-09-16 16:09:03 +02:00
Gabriel Valcazar f8f8228d67 recipes-kernel: use Linux v5.4 on the ccimx6/6qp
Remove all v4.9 recipes and build Linux using the same branch on all platforms.
The .inc files were only needed because of the existence of multiple Linux
versions, but that's not the case anymore, so remove them.

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

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2020-09-16 16:09:03 +02:00
Gabriel Valcazar 4d0ae35a52 trustfence-cst: add byacc-native as a dependency when building the SDK
The CST package requires byacc to compile, and even though this dependency is
met when building images for the target, said dependency needs to be made
explicit when the package is built for the SDK in order to avoid build errors.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2020-09-16 14:31:42 +02:00
Hector Palacios 27be059de4 digi: switch recipes to maint branches
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-09-16 10:48:08 +02:00
Mike Engel 8eedf4407e meta-digi-arm: Add new CC6UL variants
Signed-off-by: Mike Engel <Mike.Engel@digi.com>

https://jira.digi.com/browse/DEL-7169
2020-09-14 18:14:03 +02:00
Francisco Gil Martinez 9249c60c88 ccimx8mn: add support for QUAD overlay
Signed-off-by: Francisco Gil Martinez <francisco.gilmartinez@digi.com>
2020-09-14 16:39:57 +02:00
Francisco Gil Martinez 1306bbd3ee ccimx8mn: remove the soc type from overlays
With the previous solution we would need to generate
multiple overlays for each soc_type, so if we have a
new soc type (for example the solo), we would need
to generate 3 different overlays.

Signed-off-by: Francisco Gil Martinez <francisco.gilmartinez@digi.com>
2020-09-14 16:39:57 +02:00
Gonzalo Ruiz e4c3104712 trustfence: enable encrypted environment for CC8X
Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2020-09-14 12:20:00 +02:00
Arturo Buzarra bbb73aad2b imx-boot: generate signed U-Boot binary even when encryption is enabled
This commit fixed the sdcard generation when encryption is enabled.
In the sdcard image always is included the signed image instead of the
encrypted.

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

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2020-09-09 09:03:58 +02:00
Gonzalo Ruiz d516aa96d3 u-boot-dey: add 2020.04 recipe for ccimx8x
Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2020-09-03 13:36:14 +02:00
Arturo Buzarra 68720f869b trustfence-cst: add support for cst v3.3.1
This version supports encryption for devices with Advanced High Assurance Boot
(AHAB) capabilities. This commit also updates and simplifies Digi custom
patches.

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

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2020-09-03 12:04:30 +02:00
Arturo Buzarra 91fcbffe99 imx-boot: add encryption support to the build images
https://jira.digi.com/browse/DEL-7175

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2020-09-01 11:29:25 +02:00
Arturo Buzarra 6a6ff5080b trustfence: [cosmetic] fix typos on cst templates
https://jira.digi.com/browse/DEL-7175

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2020-09-01 11:29:25 +02:00
Gabriel Valcazar 5ea641fc14 meta-digi: revert revisions to AUTOREV 2020-08-25 11:34:18 +02:00
Gabriel Valcazar 84d3506432 meta-digi: update revisions for dey-3.0-r1.5
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2020-08-25 11:34:06 +02:00
Gabriel Valcazar 51c7498af0 meta-digi: revert revisions to AUTOREV 2020-08-24 12:07:44 +02:00
Gabriel Valcazar aa63318cf1 meta-digi: update revisions for dey-3.0-r1.4
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2020-08-24 12:01:12 +02:00
Gonzalo Ruiz ae05d9633a u-boot-dey: add mmc partconf command to uuu scripts
Add running 'mmc partconf 0 1 1 1' command to the uuu scripts after
writing the new U-Boot into the internal eMMC.

This is required for blank eMMCs on CC8MN and CC8X SOMs where the
'update' command has never been run to be able to boot from eMMC.

Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2020-08-20 10:36:12 +02:00
Gabriel Valcazar 6609611d2b digi-sc-firmware: update to v1.5.1
Update to NXP's v1.4.0 porting kit

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2020-08-14 11:16:17 +02:00
Mike Engel 3fdb880213 ccimx8x: add Fusion 10 overlay to KERNEL_DEVICETREE
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2020-07-27 11:21:42 +02:00
Hector Palacios 5403b831df u-boot-fw-utils: update patch to support encrypted env
The encryption of the U-Boot environment uses the HWID as key
modifier. The HWID was being read using the fsl_otp driver sysfs
entries and over two words. The driver is now deprecated and also
the cc8x and cc8m platforms have different number of HWID words.

This patch modifies the function that reads the HWID words by
using new entries on the device tree 'digi,hwid_X' where X is the
index of the HWID word.

It also removes the need to select CONFIG_MD5 which is already
auto-selected on sandbox_defconfig by other config switches.

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

https://jira.digi.com/browse/DEL-7185
(cherry picked from commit 8ced362766)
2020-07-24 13:13:40 +02:00
Hector Palacios 8ced362766 u-boot-fw-utils: update patch to support encrypted env
The encryption of the U-Boot environment uses the HWID as key
modifier. The HWID was being read using the fsl_otp driver sysfs
entries and over two words. The driver is now deprecated and also
the cc8x and cc8m platforms have different number of HWID words.

This patch modifies the function that reads the HWID words by
using new entries on the device tree 'digi,hwid_X' where X is the
index of the HWID word.

It also removes the need to select CONFIG_MD5 which is already
auto-selected on sandbox_defconfig by other config switches.

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

https://jira.digi.com/browse/DEL-7185
2020-07-24 13:12:13 +02:00
Mike Engel e8d4360ebf imx-atf: Fix build error with disable Cortex-M7 debug console patch
The Cortex-M7 uses the UART4 as debug console, and it is
shared with the Cortex-A53. This commit disables it for the
ConnectCore 8M Nano DVK board to avoid conflicts.

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2020-07-17 20:14:20 +02:00
Gonzalo Ruiz bdc8f0fa6f imx-boot: ccimx8x: store mkimage log for signing
Store mkimage log for every built target so it can be later used by the
signing script to create the correct CSF file for every target.

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

Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2020-07-16 17:53:24 +02:00
Gonzalo Ruiz 6fe7cbb1bf imx-boot: create mkimage log symlink before signing
The mkimage.log file is required by the signing script to create the CSF file.

Since there is one mkimage log file per target, update the mkimage.log symlink
right before signing the imx-boot file to ensure creating the CSF with the
corresponding mkimage log for every target.

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

Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2020-07-16 17:53:24 +02:00
Mike Engel faa088982b meta-digi-arm: enable Trustfence root file system encryption support
Signed-off-by: Mike Engel <Mike.Engel@digi.com>

https://jira.digi.com/browse/DEL-7163
2020-07-16 12:51:49 +02:00
Hector Palacios 16a429a037 ccimx8x: add missing HDMI bridge overlay to KERNEL_DEVICETREE
Reported-by: Alfonso Martín Rey <alfonso.martinrey@digi.com>
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-07-16 08:19:55 +02:00
Mike Engel 18419c29c3 imx-m7-demos: Update imx8mn to new package v2.8.0 to EULA 228c72f
This commit updates the M7 demos to new package version v2.8.0
of the new NXP release imx-5.4.24-2.1.0.

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2020-07-15 12:00:53 +02:00
Mike Engel 98999fbf79 imx-m4-demos: Update imx8qx to new package v2.8.0 to EULA 228c72f
This commit updates the M4 demos to new package version v2.8.0
of the new NXP release imx-5.4.24-2.1.0.

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2020-07-15 12:00:53 +02:00
Mike Engel efe5d48cf7 recipes-bsp: imx-vpu: Update to new NXP BSP release imx-5.4.24-2.1.0.
Signed-off-by: Mie Engel <Mike.Engel@digi.com>
2020-07-15 12:00:53 +02:00
Mike Engel aeb8042efa recipes-bsp: imx-seco Update to new NXP BSP release imx-5.4.24-2.1.0.
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2020-07-15 12:00:53 +02:00
Mike Engel 284563b71c recipes-bsp: imx-mkimage Update to latest NXP release.
This commit updates to the NXP imx-5.4.24-2.1.0 BSP.

Including following changes

In M4 MCUX SDK 2.8.0, it added PMS demo for CM40 to support Partition
reboot feature besides rpmsg pingpong. So change the m40 default image
to imx8qm_m4_0_TCM_power_mode_switch_m40.bin

Build i.MX 8DXL flash_linux_m4 with V2X off
Use option V2X=NO to switch V2X off.

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2020-07-15 12:00:53 +02:00
Mike Engel 98a16a31d6 recipes-bsp: imx-aft: Update recipes to new BSP release imx-5.4.24-2.1.0.
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2020-07-15 12:00:53 +02:00
Mike Engel 10d610dfad recipes-bsp: firmware-imx: Update to new BSP version imx-5.4.24-2.1.0.
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2020-07-15 12:00:53 +02:00
Hector Palacios c4932093f2 ccimx8x: add missing HDMI bridge overlay to KERNEL_DEVICETREE
Reported-by: Alfonso Martín Rey <alfonso.martinrey@digi.com>
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-07-15 06:48:25 +02:00
Hector Palacios 9935120fe4 linux-dey: change master branch to newest BSP v5.4.24/master
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-07-09 11:31:20 +02:00
Hector Palacios e56f201a57 Merge branch 'dey-3.0/maint' into 'dey-3.0/master'
Merge at commit right after 'dey-3.0-r1.3'.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-06-29 16:41:36 +02:00
Gabriel Valcazar 332438f5b7 meta-digi: revert revisions to AUTOREV 2020-06-25 13:08:41 +02:00
Gabriel Valcazar 5ebc893b58 meta-digi: update revisions for dey-3.0-r1.3
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2020-06-25 12:15:52 +02:00
Gonzalo Ruiz 45c3f1e0ef imx-boot: ccimx8x: do not sign flash_regression_linux_m4 files
imx-boot files for target flash_regression_linux_m4 fail the signature
process, so skip them while signing the rest of the targets.

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

Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2020-06-22 23:08:09 +02:00
Arturo Buzarra d36bce0ee4 meta-digi: revert revisions to AUTOREV 2020-06-22 17:37:52 +02:00