Since this overlay is only used in the SBC Pro bootscript, have a separate
bootscript for the SBC Express.
https://jira.digi.com/browse/DEL-7276
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
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>
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>
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
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>
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>
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>
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)
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
The signing script is used for signing multiple artifacts, not just the
kernel, so rename it for a broader use.
https://jira.digi.com/browse/DEL-7047
Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
Signing with AHAB mode only requires an additional prior step, so
reuse as much code as possible.
https://jira.digi.com/browse/DEL-7047
Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
TRUSTFENCE_SIGN_MODE for ccimx8mn is "HAB", although the
BOOTLOADER_IMAGE_RECIPE is "imx-boot".
https://jira.digi.com/browse/DEL-7024
Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
imx-mkimage is a host recipe to provide the mkimage_imx8 binaries, required
for the trustfence support with platform based on AHAB (ccimx8x). Since
these binaries are required to the sign process we need to export it in the
SDK to allow the standalone sign mode, and with that we can simplify the
mechanism to share these binaries with another recipes (u-boot, linux).
Also the do_deploy() from imx-mkimage recipe was removed to avoid overriding
the implementation from the native class and allow populating the mkimage
binaries.
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This update is a cosmetic one and removes the RAM frequency from the SCFW
filenames. Reflect this change in the RAM_CONFIGS variable and in the uSD/UUU
installation scripts.
As a result, the imx-boot filenames will no longer have the RAM frequency
either.
https://jira.digi.com/browse/DEL-7096
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
The scripts need to know the SOC's revision to be able to select the correct
imx-boot image. Modify the boot-artifacts bbclass so the renamed imx-boot files
are included in the installation .zip.
Also, bypass the SECO fw check in the uSD script so it can install future
versions that aren't recognized by U-Boot's SECO fw checking logic. The UUU
script doesn't require this bypass, since it doesn't use the Digi update
command to flash the bootloader.
https://jira.digi.com/browse/DEL-7069
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
With the device tree overlays mechanism in place, the bootscript
doesn't need to set the fdt_file variable. Instead, it will use
the value it has (which can be changed by the user) and it will
simply update the 'overlays' variable with the device tree
overlays that apply basing on the hardware capabilities found
on the HWID, SOM version, and carrier board version.
This allows a user to override the default fdt_file to point
to his custom device tree, but still make use of the boot script
for hardware-detected overlays.
Without the need to set the base filename, the boot script is the
same for any carrier board of the ccimx8x SOM, so this commit
moves it to a common folder.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Each platform now has only one base device tree, meant for the i.MX8DX variants
of the ccimx8x boards. Apply the QXP overlay in the bootscript if the SOC is
identified as an i.MX8QXP.
Since we want to give this overlay a higher priority than the SOM overlays
(wifi and bluetooth), prepend it to the overlay list after appending the SOM
overlays.
https://jira.digi.com/browse/DEL-7100
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
Remove the old wb device trees from the ccimx8x-sbc-express and ccimx8x-sbc-pro
configuration files and add the ccimx8x wifi and bt overlays. Modify both
platforms' bootscripts to apply the overlays depending on board_id, hardware
capabilities or module variants.
https://jira.digi.com/browse/DEL-7100
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
The function that parsed the output for a U-Boot variable value
was receiving a multi-line output, with blank lines that were
not being properly processed.
Simplify the parsing by using 'sed' command.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
https://jira.digi.com/browse/DUB-951
The if condition expanded to nothing so the install command was
never called. Apart from that the install command was wrong and
missing the '-m' option for modifier.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Platform-based variable STORAGE_MEDIA, allows us to select the
correct configuration file without needing to replicate it per
platform.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Parse the hardware version from the HWID and load the overlay if and only if
the revision is "1". Also, update the board's device tree list accordingly.
https://jira.digi.com/browse/DEL-7070
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
Instead of having two separate device trees for the non-wireless and wireless
variants of the ccimx8mn, use the non-wireless .dtb as a base and apply the
overlays in the bootscript depending on the variant's capabilities.
Also, update the board's device tree list accordingly.
https://jira.digi.com/browse/DEL-2609
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
Update u-boot-fw-utils patches to apply on upstream version 2019.07.
https://jira.digi.com/browse/DEL-7013
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
Do not evaluate TRUSTFENCE_SIGN_MODE on conditions where the sign mode
is not relevant:
1) U-Boot binary file should be signed directly after building it when simple
U-Boot images are used, but it should not be signed when imx-boot bundled
images are used.
For those, the signing process is performed later over the whole imx-boot
bundled binary file on a different recipe.
We use BOOTLOADER_IMAGE_RECIPE variable to evaluate this distinction.
BOOTLOADER_IMAGE_RECIPE is set to "u-boot" by default and is set to "imx-boot"
on ccimx8x and ccimx8mn machine configuration files.
2) For signing imx-boot images we should treat differently those images that
include the RAM configuration in their name and those that don't, as we do
for the rest of the tasks in the same recipe. We can ignore the sign mode
method in this case.
https://jira.digi.com/browse/DEL-7023
Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
This commit adds a installation script that uses fastboot support to
update the target firmware.
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
https://jira.digi.com/browse/DEL-6845
Digi Embedded Yocto 2.6-r3.1
Manually changed recipes to use the master branches instead of the fixed SHA1
from the last release.
Signed-off-by: Mike Engel <mike.engel@digi.com>
This commit adds some dependencies to include the imx-mkimage package
that is needed to use the mkimage_imx8 tool.
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
* prefix TRUSTFENCE_ to variable SIGN_MODE for DEY
* prefix CONFIG_ to variable SIGN_MODE for script
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Commit 31d8ff94 ("meta-digi-arm: u-boot: Update recipes with new u-boot version")
updates the license checksum for the new u-boot_2019.04 recipe, however this
license file is different for the other u-boot versions.
This commit reverts this change and includes the updated checksum only for the
new u-boot_2019.04 recipe.
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
Wrapped lines must have a back-slash symbol so that U-Boot
doesn't interpret them as finished.
The missing symbol resulted in the script not being able to
determine the U-Boot image to program in some cases.
Reported-by: Leonid Makhnovskiy <leonid.makhnovskiy@digi.com>
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
https://jira.digi.com/browse/DEL-6953
Otherwise, users that are behind corporate firewalls might not be able to
obtain the package sources.
https://jira.digi.com/browse/DEL-6663
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
The 'soc_type' variable was already set by fastboot to "imx8qxp"
so the U-Boot board code that was setting this to just "8qxp" has
been changed to set it to "imx8qxp".
Update the scripts accordingly.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
https://jira.digi.com/browse/DUB-901
This commit fixes two issues:
- Comparison clause uses only one equal sign
- Fix soc_type for Dual variants because the supported soc types
for the imx8 processor are: 8qm, 8qxp, and 8dx
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
After the recent changes to generate the bootable artifacts, these are
now formed using the ${MACHINE} variable rather than the string in
${UBOOT_CONFIG} array, so the underscores must be changed with dashes.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Now the U-Boot binaries contain the RAM frequency and bus width, not just
only the RAM size.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
https://jira.digi.com/browse/DEL-6641
With the arrival of DualX variants, the device tree files have been renamed
to contain the SOC type (8qxp, or 8dx). This is determined by a new U-Boot
variable 'soc_type'.
Default to "8qxp" if the variable is not defined (old U-Boots).
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
https://jira.digi.com/browse/DEL-6641
The new HWID fields make U-Boot create new variable 'module_ram'.
If it exists use it to select the U-Boot file to use during
firmware update. If not, fall back to old method of using the
variant code and the hard-coded table of variants.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
https://jira.digi.com/browse/DEL-6598
The new HWID fields make U-Boot create new variable 'module_ram'.
If it exists calculate new HWID fields to check if the SOM has
Wi-Fi, Bluetooth, etc. in order to select the device tree file.
If not, fall back to old method of using the variant code and
the hard-coded table of variants.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
https://jira.digi.com/browse/DEL-6598
Digi Embedded Yocto 2.6-r1.3
Manually changed recipes to use the master branches instead of the fixed SHA1
from the last release.
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This variant is exactly the same as variant 0x02, but with a new revision
of the i.MX6UL silicon.
https://jira.digi.com/browse/DEL-6555
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
Update u-boot-fw-utils patches to apply on current upstream version. Remove
recipe for version 2017.09 since both U-Boot v2017.03 and v2018.03 work fine
with the newer version.
https://jira.digi.com/browse/DUB-881
Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
This adds support for U-Boot v2018.03 for CC8X platforms only.
Create 'digi-u-boot.inc' with the common definitions for both v2017.03
and v2018.03.
https://jira.digi.com/browse/DUB-881
Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
Fix write operation by moving the re-lock of the mmc partition
after performing the system synchronization, if not the mmc
driver throws read-only errors. Also, improved the code
to avoid compilation warnings because the return values were
not managed in write operations.
https://jira.digi.com/browse/DEL-6449
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
Device tree file names won't have the kernel image type like a
prefix anymore, since thud uses the original file names.
https://jira.digi.com/browse/DEL-6443
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
Digi Embedded Yocto 2.4-r2.2
Manually changed recipes to use the master branches instead of the fixed SHA1
from the last release.
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
Without these symlinks, U-Boot images will be left out of the installer .zip
file. Unlike the v2015.04 recipe, the default symlinks aren't removed, because
they're needed in the imx-boot recipe for the ccimx8x.
https://jira.digi.com/browse/DEL-6333
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This way, customers are less likely to flash the plain u-boot by accident
instead of imx-boot. Also, have the imx-boot recipe look for the u-boot files
in the imx-boot-tools directory.
https://jira.digi.com/browse/DEL-6185
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
Digi Embedded Yocto 2.4-r2.4-beta
Manually changed recipes to use the master branches instead of the
fixed SHA1 from the last release.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
We have seen errors when verifying the rootfs update on 2 GiB variants. Forcing
otf-update prevents these errors from happening.
https://jira.digi.com/browse/DUB-855
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
Also, make the script recognize the different SOM variants.
https://jira.digi.com/browse/DEL-6175
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
When grepping for the mtd index "1" the script was also returning
partitions 10, 11, and so on.
Reported-by: Leonid Makhnovskiy <leonid.maknovskiy@digi.com>
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
(cherry picked from commit a2a8491140)
When grepping for the mtd index "1" the script was also returning
partitions 10, 11, and so on.
Reported-by: Leonid Makhnovskiy <leonid.maknovskiy@digi.com>
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
U-Boot's 'dboot' command now supports uncompressing Image.gz.
This will be the default kernel image type for the CC8X.
This also changes the names of the device tree artifacts, that must be
updated on the boot script. While on it, add support for all the SOM
variants (wireless and non-wireless).
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This adds support for U-Boot v2017.03 for all platforms (including CC8X).
For legacy v2015.04:
- Renames u-boot.inc as a versioned file only for v2015.04.
- Moves boot/install scripts from versioned folder into non-versioned
folder (since the scripts remain the same between versions).
For new v2017.03:
- Re-uses poky's u-boot.inc in rocko for v2017.03
- DEY recipe re-writes the do_compile for special U-Boot configuration
required for TrustFence.
- DEY recipe appends the do_deploy, for U-Boot scripts and deploy of
special TrustFence artifacts.
- Adds u-boot-dtb.xxx to UBOOT_CONFIG, required for new U-Boots.
- Adds CC8X scripts.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
https://jira.digi.com/browse/DEL-5936
Under certain circumstances I was able to create a microSD card with
the FAT file system but corrupt partition table like this one:
Device Boot Start End Sectors Size Id Type
/dev/sdf1p1 778135908 1919645538 1141509631 544,3G 72 unknown
/dev/sdf1p2 168689522 2104717761 1936028240 923,2G 65 Novell Netware 386
/dev/sdf1p3 1869881465 3805909656 1936028192 923,2G 79 unknown
/dev/sdf1p4 2885681152 2885736650 55499 27,1M d unknown
Specifying the partition index made the install script to fail, but
not specifying it makes it work, although it also falls back to use
the first partition in the table.
Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
In the old u-boot-fw-utils 2016.x the function 'fw_env_close' wrote
the environment to the media. That is no longer the case, now that
function only frees the memory used, and 'fw_env_flush' is used
to write the environment.
This was causing that userspace application using this library were not
able to write changes to the environment.
https://jira.digi.com/browse/DEL-5644
Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
Support for dynamic location of U-Boot environment was added in
commit 2b5017956b. This forward ports
the patch to Yocto 2.4.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
https://jira.digi.com/browse/DEL-5574
Arturo Buzarra
Hector Palacios
Gabriel Valcazar
Mike Engel
Francisco Gil Martinez
Gonzalo Ruiz
Alex Gonzalez
hbujanda
Jose Diaz de Grenu