Commit Graph

3368 Commits

Author SHA1 Message Date
Hector Palacios fbeb7f6720 read-only: remove regular rootfs fstypes for read-only-rootfs
If IMAGE_FEATURE 'read-only-rootfs' is active, the rootfs image
will be SQUASHFS.
Remove other root file system images, such as ext4, ubifs, sdcard.gz
to avoid confusion and use by install scripts.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-12-01 11:49:20 +01:00
Gabriel Valcazar b97d824d38 busybox: add support to run mdev in daemon mode
This mode is necessary in the recovery initramfs to be able to properly detect
any external storage device that might contain an update package. The
configuration option associated with this mode became explicit after upgrading
busybox to v1.34.1, so enable it in our defconfig.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2021-11-30 14:08:50 +01:00
Arturo Buzarra 46f7d6a64c u-boot-dey: ccimx6ul: sync boot script with new dualboot variables
U-Boot uses partition names instead of partition indexes for the nand devices.
This commit syncs the boot scripts with the new dualboot variables.

https://onedigi.atlassian.net/browse/CC6UL-1254

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2021-11-29 11:55:17 +01:00
Francisco Gil b8d46f0120 read_only: create folders in build time
These folders /mnt/linux, /mnt/update and /mnt/data are
created by the automount_block.sh script. In a read only
system, these folders are not created raising some errors.

Creating these folders solves the issue.

Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
2021-11-25 12:42:59 +01:00
Francisco Gil afc61dfb83 wifi: add symbolics links needed by the read only filesystem.
Create this symbolics links in build time instead of doing it
in run-time. This simplifies the system and allows it to work
with read only filesystems.

Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
2021-11-25 12:39:28 +01:00
Francisco Gil 179d4315ef wireless: mac: create symbolic links for the wireless macs
Before this patch the MAC addresses were read from the device
tree in the qualcomm.sh script executed at init, and a creates
a file where the MAC where located.

In 0a92f5d9e8df644de74e74f152ed6ff3dd8d3369 in the qca driver
the support to read these MAC addresses from the filesystem
was added.

This commits creates the simbolic link between the device tree
and the expected path where the MAC addresses where located, and
gets rid of the file with the MAC addresses.

Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
2021-11-25 11:38:27 +01:00
Francisco Gil 24063490ea recovery-initramfs-init: fix condition for nand devices
The nand devices doesn't need to call the mount_cryptrootfs
script.

Reported-by: Francisco Gil <francisco.gilmartinez@digi.com>
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2021-11-25 08:41:03 +01:00
Gonzalo Ruiz 446ecdd2e0 imx-boot: install mkimage logs into imx-boot-tools directory
mkimage logs are required for signature on CC8X and CC8M platforms. Create a
copy in the 'imx-boot-tools' deploy directory so a prebuilt imx-boot file can
be later signed using the standalone signature procedure.

Build the 'print_fit_hab' target unconditionally so the log is available for
future standalone signature processes.

Also, use 'CONFIG_MKIMAGE_LOG_PATH' and 'CONFIG_FIT_HAB_LOG_PATH' variables to
point to the logs before calling the sign scripts. We no longer require
creating a symbolic link of the log files.

Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2021-11-19 17:45:34 +01:00
Arturo Buzarra ed03674968 firmware-qualcomm: update proprietary firmware to release r00006.3
Latest release r00006.3 - CS3 0.0.006.3 updates the following files from
qca6574au-le-2-2-2_qca_oem repository:

qca65X4_pcie:   qwlan30.bin ->  c0741f39de31ee92a623e15adf60881e
                utf.bin     ->  875b0f52c9b80130c78f9ed2b64d7148
qca65X4_sdio:   qwlan30.bin ->  066692969db9bbb82f36cdb2352d3aa8
                utf30.bin   ->  d3b5042c3dd316b15d72db6214b60fbc

https://onedigi.atlassian.net/browse/DEL-7730

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2021-11-17 11:53:31 +01:00
Gabriel Valcazar 500cc96394 kernel-module-qualcomm: re-add compatibility with the ccimx6sbc
This change was accidentally reverted when merging to dey-3.2/maint, causing
the qualcomm module to be missing in the rootfs.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2021-11-17 11:44:14 +01:00
Arturo Buzarra 291c64d343 cryptoauthlib: set ATECC508A as default device type in default configuration
https://onedigi.atlassian.net/browse/DEL-7727

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2021-11-16 15:49:13 +01:00
Arturo Buzarra 916f383d8c cryptoauthlib: fix default i2c bus speed
By default, all platforms except ccimx6qpsbc work at 400 kHz on the i2c bus
connected to the ATECC508A crypto chip.

https://onedigi.atlassian.net/browse/DEL-7727

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2021-11-16 15:29:16 +01:00
Gabriel Valcazar f3aab304c6 busybox: upgrade to v1.34.1
Backport the recipes from the honister poky branch. This version includes fixes
for several CVEs:

https://thehackernews.com/2021/11/14-new-security-flaws-found-in-busybox.html

Sync our defconfig with the latest version while keeping our custom config
changes.

https://onedigi.atlassian.net/browse/DEL-7728

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2021-11-16 13:16:34 +01:00
Hector Palacios 82dd2cbc4d trustfence-sign-artifact: re-use RAMDISK address for rootfs
Re-use RAMDISK address for authenticating the rootfs instead
of allocating a new address (if authenticating a rootfs, we're
not using a ramdisk).

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-11-12 09:01:44 +01:00
Hector Palacios 116fb5e203 meta-digi-dey: append 'dey' distro override to PACKAGECONFIG_remove
Some recipes were forcibly removing conflicting packages.
This does not allow to add those packages back for users that
want to use meta-digi layer, but a different distro than 'dey'.
With the 'dey' distro override, such removals are only done
if using this distro.

Reported-by: Michael Burr <michael.burr@digi.com>
Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://onedigi.atlassian.net/browse/DEL-7712
2021-11-12 09:01:44 +01:00
Hector Palacios fe2a1f281e Merge branch 'dey-3.2/master' into dey-3.2/maint
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-11-11 16:23:43 +01:00
Mike Engel 2145614724 images: add function to sign read only rootfs when Trustfence is enabled
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2021-11-11 13:37:30 +01:00
Mike Engel eb730358e5 trustfence: add read only rootfs signing option to signing script
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2021-11-11 13:37:30 +01:00
Hector Palacios 75fca73cc5 u-boot: cc6ul: fix script adding missing call to 'uuu'
Add missing call to 'uuu' and erase the partition before creating
the UBI volumes.

Also add larger timeouts to erase operations.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-11-11 13:32:16 +01:00
Francisco Gil efa9d527a1 MM: Stop MM daemon before going to suspend
In the cc6ul we are not powering-off the supply of the XBee.
This is making that after a suspend/resume action the XBee
hangs due to ModemManager hasn't been stopped before the suspend.

Stopping ModemManager before going to suspend solves the issue.

https://onedigi.atlassian.net/browse/DEL-7701

Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
2021-11-08 16:17:50 +01:00
Arturo Buzarra d81444a574 swu-images: fix support to preinstallation script in swu update package
Since commit 11558352 ("swu-images: add "installed-directly" flag to
sw-description") the swu package images are streamed into the target without
any temporary copy to support devices with low memory available, that forces a
different order according with the swupdate documentation because scripts
should packed before the rest. This means that all the pre, post and shell
scripts will be executed after the images will be installed. This behavior
breaks the current support to mount the cryptorootfs node before install an
encrypted rootfs.

This commit moves the shell script to mount the cryptorootfs node to the
recovery initramfs and modifies the swupdate command line to call the shell
script before the images installation.

https://onedigi.atlassian.net/browse/CC8X-320

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2021-11-08 08:39:18 +01:00
Arturo Buzarra b03a2af5b2 recovery-initramfs-init: fix support to identify encrypted rootfs images
Since we added support for compressing rootfs images, we need to manage SWU
packages with a regular rootfs image and with compressed images. That support
was missing in the identification process when the SWU packet was verified.
This commit fixes the identification of compressed rootfs images.

https://onedigi.atlassian.net/browse/CC8X-320

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2021-11-08 08:22:11 +01:00
Gabriel Valcazar 4e303ab542 swu-images: remove ccimx6ul preinstallation script
Since commit bf8c73322b, the script is no longer
used, so remove it.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2021-11-05 14:20:36 +01:00
Hector Palacios 71b3623b59 init-ifupdown: adapt recipe for read-only-rootfs
This recipe had a post install script to do the following:
 - create runlevel symlinks.
 - comment the 'auto' lines of /etc/network/interfaces if running on
   a non-Wi-Fi variant.
 - add Atheros or QCA bridge examples depending on the detected chip.
 - add wlan1 interface only if QCA chip is detected.

This post install cannot run on a read-only-rootfs so the recipe has been
reworked to do the same things at build time:

 - the runlevel symlinks have been removed because they are taken care
   of by a poky class.
 - add a pre-up condition (the existance of a wireless entry on the device
   tree) so that the interface is not brought up if the condition is not met.
 - for the cc6/cc6n, since the Wi-Fi chip can be Atheros or QCA, add
   specific wlan1 and br0 fragments with a pre-up condition basing on the
   detected ID of the Wi-Fi chip

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

https://onedigi.atlassian.net/browse/DEL-7708
2021-11-05 11:30:12 +01:00
Hector Palacios bc88451131 machines: add SQUASFS to IMAGE_FSTYPES for read-only-rootfs
Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://onedigi.atlassian.net/browse/DEL-7708
2021-11-05 11:18:16 +01:00
Hector Palacios 0ba9b85574 hostapd: adapt recipe for read-only-rootfs
The access point configuration files are dynamically modified on a post
install script to generate an SSID name based on the last digits of the
MAC address (physical or virtual) assigned to a wlanX interface.

On read-only file systems, this is not possible, so add some conditional
code to the do_install() to use instead the $DIGI_FAMILY name.

Caveat: if several identical SOMs with read-only-rootfs co-exist on the
same network as APs, they will identify with the same SSID.

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

https://onedigi.atlassian.net/browse/DEL-7708
2021-11-05 11:18:16 +01:00
Hector Palacios 7cd57a40e3 libubootenv: adapt recipe for read-only-rootfs
The config file /etc/fw_env.config is generated dynamically basing on
the partition table and, in the case of NAND-based SOMs, on the NAND
geometry. This is done on a postinst script that modifies the file on the
first boot of the target. Since this is not allowed on read-only-rootfs,
this commit adds a default fw_env.config file to use instead when
read-only-rootfs is enabled.

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

https://onedigi.atlassian.net/browse/DEL-7708
2021-11-05 11:18:16 +01:00
Javier Viguera c89a66480b meta-digi: remove postinst on target when using read-only-rootfs image feature
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2021-11-05 11:18:16 +01:00
Arturo Buzarra a93176815d sdk: remove framebuffer from ccimx6ulsbc platform
Framebuffer support has been removed for all platforms, however it was missing
from the ccimx6ulsbc configuration notes.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2021-11-04 12:27:34 +01:00
Gabriel Valcazar f3210db348 ccimx6sbc: adapt recipes to support Atheros and Qualcomm wireless chips
Some packages require different scripts, configuration files or installations
depending on the wireless chip assembled on the target. In general, the way
to support both chips in one image is to have the recipes install both
versions of the aforementioned files, then leave only the strictly necessary
version once the wireless chip can be deduced.

In the case of the init-ifupdown recipe, this involves installing temporary
configuration fragments that are later erased. In the case of the standby
script, the logic can be implemented in a single file.

https://onedigi.atlassian.net/browse/DEL-7661
https://onedigi.atlassian.net/browse/DEL-7666

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2021-11-03 15:58:53 +01:00
Gabriel Valcazar dcd97799c9 ccimx6sbc: install Qualcomm-related packages along with the Atheros ones
The idea is to have the support for both chips co-exist in the same image, then
have the system detect which chip is being used during runtime.

https://onedigi.atlassian.net/browse/DEL-7661
https://onedigi.atlassian.net/browse/DEL-7666

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2021-11-03 15:58:53 +01:00
Gabriel Valcazar 7ea02c26aa qualcomm: adapt firmware and module recipes to be compatible with the ccimx6sbc
This allows the packages to be included in the ccimx6sbc images. While at it,
include the Qualcomm bluez patches in ccimx6 builds. These patches aren't
destructive, they simply add functionality required by the Qualcomm chip, so
they shouldn't have any secondary effects when using the Atheros chip.

https://onedigi.atlassian.net/browse/DEL-7661
https://onedigi.atlassian.net/browse/DEL-7666

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2021-11-03 15:58:53 +01:00
Arturo Buzarra 67c1ef2c9e recovery-initramfs-init: fix psplash communication FIFO path
The latest version of psplash changed the default path to store the
communication FIFO with other processes to "/run" to allow keeping the
information between reboots, however we are using this tool from an initramfs
where "/run" does not exist, producing multiple errors trying to write to a
nonexistent path, delaying the update process.

This commit forces psplash to use an existing path like "/tmp" to handle the
communication FIFO, because we don't need to maintain the update information.

https://onedigi.atlassian.net/browse/CC8X-318

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2021-10-29 11:26:43 +02:00
Arturo Buzarra 4a54512d64 recovery-initramfs-init: fix psplash communication FIFO path
The latest version of psplash changed the default path to store the
communication FIFO with other processes to "/run" to allow keeping the
information between reboots, however we are using this tool from an initramfs
where "/run" does not exist, producing multiple errors trying to write to a
nonexistent path, delaying the update process.

This commit forces psplash to use an existing path like "/tmp" to handle the
communication FIFO, because we don't need to maintain the update information.

https://onedigi.atlassian.net/browse/CC8X-318

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2021-10-29 09:35:53 +02:00
Hector Palacios 899f89eb33 digi-defaults: use '+=' operator in assignment of BOOT_SCRIPTS
Other layers, such as meta-digi-dualboot, may add scripts to this
list on their layer.conf file. Depending on the order and priority
of layers, using a strict '=' here completely overrides previous
values, which is not desired.

Reported-by: Francisco Gil <francisco.gilmartinez@digi.com>
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-10-20 10:10:40 +02:00
Hector Palacios 2e35d16e03 linux-dey: fix apply of kernel configuration fragments
- Add the '-m' parameter. Without it, the script doesn't
  generate the output merged configuration file, and the
  fragments are not applied.
- Fix the if condition. The '*.cfg' expands to a list of
  files, but the '-f' only admits one parameter. Use instead
  the Python find_cfgs() function.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-10-15 19:14:27 +02:00
Hector Palacios 9ac3bd46ca uboot: install-uuu: restore variables on bootcmd after 'env default -a'
The variable 'dualboot' (and 'singlemtdsys' for CC6UL) was restored
after the bootcmd that runs the first time after programming U-Boot runs
fastboot again to resume the script.
This is ok for the CC6UL but not for the rest of platforms, that run the
partition script on the bootcmd, *before* running fastboot.

Restore the variables for all platforms in the bootcmd right after
resetting the environment.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-10-14 13:35:46 +02:00
Hector Palacios 3ab0340741 u-boot: print what system is booting after update
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-10-11 11:36:00 +02:00
Hector Palacios 13a46ed323 conf: move UBOOT_HAS_FASTBOOT to ccimx8x common include
The SBC Express also supports fastboot now.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-10-08 14:20:22 +02:00
Hector Palacios f7a1a484a6 conf: move BOOT_SCRIPTS variable to common include file
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-10-08 14:15:13 +02:00
Francisco Gil e67ed06dd5 dualboot: move the logic of fallback boot to altbootcmd
U-Boot has embedded support to handle bootcount tries.
When the limit of tries is reached, U-Boot runs the script
in `altbootcmd` rather than the usual `bootcmd`.
This other script resides on meta-digi-dualboot layer.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
2021-10-08 12:59:30 +02:00
Francisco Gil 3334568347 bluez5: patch to fix CVE-2021-37577
This CVE is fixed in bluez 5.57

Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
2021-10-06 12:27:43 +02:00
Gonzalo Ruiz 825dd6a555 install_linux_fw_uuu: remove redirection in every case
Ensure stdout redirection to the USB interface is removed in every case.
Otherwise, it would be left redirected when INSTALL_UBOOT_FILENAME is
manually set.

Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2021-09-30 10:36:40 +02:00
Gonzalo Ruiz 555be511a6 u-boot-dey: customize install_linux_fw_uuu script for ccimx6/ccimx6qp
Also, set UBOOT_HAS_FASTBOOT = "true" for these platforms.

Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2021-09-30 10:32:17 +02:00
Gonzalo Ruiz 1166981fa1 u-boot-dey: add install_linux_fw_uuu.sh for ccimx6/ccimx6qp
Add initially as a copy of the script used on the ccimx8x platform.

Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2021-09-29 18:52:29 +02:00
Gonzalo Ruiz 2e375b2e3f u-boot-dey: [cosmetic] change permissions for install_linux_fw_uuu.sh
Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
2021-09-29 18:52:29 +02:00
Hector Palacios cc2df395c5 uboot: ccimx6ul: rename variable for single MTD system partition
Rename from 'ubisysvols' to 'singlemtdsys'.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-09-29 13:44:50 +02:00
Hector Palacios fa3028a17e uboot: install sd/usb: convert double condition in a simpler single condition
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-09-29 13:44:50 +02:00
Hector Palacios f3ae964d10 uboot: cc6ul: force erase of partitions before update on install scripts
Install scripts may rework the partition table basing on the value of
env variables. Information of UBI volumes may remain on the NAND that
could later not correspond to the new partition table.
Make sure the MTD partitions are erased prior to updating:
- For Multi-MTD, append '-e' option to the update command.
- For Single-MTD, erase the system partition.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-09-29 13:44:50 +02:00
Hector Palacios f647e6d442 uboot: add dualboot support to fw install script from SD/USB
Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://onedigi.atlassian.net/browse/DEL-7649
2021-09-24 09:42:59 +02:00