Commit Graph

384 Commits

Author SHA1 Message Date
Hector Palacios fddaee85b9 update-fw scripts: fix error path after sucessful update
On commit 1e5cafeb79 a fall-back
update command was introduced in case the newest command fails.
If the newest command succeeds, however, the 'test' command for
error doesn't match (there is no error) and the return code of
such test is "1". On the next check for errors, this results on
an error, when we really mean to continue because the first
command was successful.

Move the second error check inside the error path of the first
attempt.

Reported-by: Francisco Gil <francisco.gilmartinez@digi.com>
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2021-01-18 17:36:38 +01:00
Hector Palacios 1e5cafeb79 uboot: update fw install scripts to remove source fs from commands
The 'source file system' was removed as an argument from the
'update' command in U-Boot v2020.04.
For platforms using such version, remove it from the update fw
scripts.

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

https://jira.digi.com/browse/DUB-983
2021-01-07 19:29:06 +01:00
Gabriel Valcazar ae012f7069 ccimx8x: update USB install script with selected U-Boot for variants
A similar change was done in the dey-3.0/maint branch for the uSD installation
scripts, but since USB scripts were added in dey-3.0/master, apply the same
to them as well.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2020-12-28 14:54:38 +01:00
Gabriel Valcazar e0055ce0cb Merge branch 'dey-3.0/master' into dey-3.0/maint
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2020-12-28 12:28:39 +01:00
Hector Palacios 2caec3176a ccimx8x: update install script with selected U-Boot for variants
CC8X SOMs code the RAM size on the OTP bits so this fall-back table
shouldn't be necessary, but update it with latest variants just
in case.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-12-21 14:06:28 +01:00
Arturo Buzarra 8b3b8b5516 uboot: add script to update firmware from a USB stick
Create scripts to install DEY firmware using a USB stick.

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

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2020-12-03 15:46:22 +01:00
Hector Palacios dc663aa743 uboot: v2020.04 is now supported for ccimx8m and ccimx6ul
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-11-16 13:26:53 +01:00
Hector Palacios c92392ffdf uboot: add script to update firmware through uuu
U-Boot v2020.04 for the CC6UL supports the fastboot protocol.
Create scripts to install DEY firmware via USB using uuu
tool.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-11-16 13:26:53 +01:00
Mike Engel 18198b5c12 u-boot-dey: ccimx6ulstarter: fix typo in installer script
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
(cherry picked from commit 3041f3a2f7)
2020-11-16 12:09:39 +01:00
Mike Engel 3041f3a2f7 u-boot-dey: ccimx6ulstarter: fix typo in installer script
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2020-11-16 12:02:42 +01:00
Hector Palacios 4685664d07 u-boot: boot script: allow to disable Wi-Fi/BT overlays
Check a U-Boot env variable (disable_wifi/disable_bt) for easily
disabling Wi-Fi and/or Bluetooth overlays.

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

https://jira.digi.com/browse/DEL-7297
(cherry picked from commit b74a8cee54)
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-11-04 16:10:20 +01:00
Hector Palacios 7eaa7670a7 change recipes to build from 'master' branches
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-10-29 12:29:48 +01:00
Hector Palacios b74a8cee54 u-boot: boot script: allow to disable Wi-Fi/BT overlays
Check a U-Boot env variable (disable_wifi/disable_bt) for easily
disabling Wi-Fi and/or Bluetooth overlays.

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

https://jira.digi.com/browse/DEL-7297
2020-10-29 09:56:55 +01:00
Hector Palacios 51319426f8 meta-digi: revert revisions to AUTOREV
This reverts commit 4dfdf2d435.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-10-23 13:09:52 +02:00
Hector Palacios 4dfdf2d435 meta-digi: update revisions for dey-3.0-r2.4
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-10-23 13:09:44 +02:00
Hector Palacios a64005482b meta-digi: revert revisions to AUTOREV
This reverts commit 3a299682aa.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-10-22 16:14:30 +02:00
Hector Palacios 3a299682aa meta-digi: update revisions for dey-3.0-r2.3
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-10-22 16:14:30 +02:00
Gabriel Valcazar d7d8c7aa56 ccimx6qpsbc: add support for variants 0x02 and 0x03
Build the U-Boot for variants with 1GB of memory and make the installation and
boot scripts recognize all of the current variants.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2020-10-21 14:56:15 +02:00
Hector Palacios 5a8b929694 meta-digi: revert revisions to AUTOREV
This reverts commit e1129bc8e4.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-10-20 17:15:59 +02:00
Hector Palacios e1129bc8e4 meta-digi: update revisions for dey-3.0-r2.2
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-10-20 17:15:59 +02:00
Arturo Buzarra 3a5d193b09 u-boot: ccimx8x-sbc-express: sync installation sd card script
This commit added support to C0/B0 variants.

https://jira.digi.com/browse/DUB-974

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2020-10-19 17:12:51 +02:00
Arturo Buzarra 6e00349b0d u-boot: ccimx8x: fix default uboot name for 512MB variants with old-style HWID
https://jira.digi.com/browse/DUB-974

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2020-10-19 12:26:07 +02:00
Hector Palacios 0a0f376ea6 ARM64: dts: ccimx8mn: add overlay for DVK version < 3
Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://jira.digi.com/browse/DEL-7279
2020-10-19 10:53:53 +02:00
Gabriel Valcazar 666c361df2 ccimx8x-sbc-pro: add overlay for SBC versions 3 and lower
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>
2020-10-13 16:19:34 +02:00
Hector Palacios fb3c7d5e3f meta-digi: revert revisions to AUTOREV
This reverts commit 76ec96632760fd3ee6113a74b8363a688edf99c3.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-10-08 16:37:51 +02:00
Hector Palacios 519b924f12 meta-digi: update revisions for dey-3.0-r2.1
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-10-08 16:37:51 +02:00
Hector Palacios d34d9de25a u-boot: remove 2019.04 recipe, superseeded by v2020.04
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2020-10-08 13:46:04 +02:00
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
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 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
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
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
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
Arturo Buzarra d36bce0ee4 meta-digi: revert revisions to AUTOREV 2020-06-22 17:37:52 +02:00