Commit Graph

220 Commits

Author SHA1 Message Date
Hector Palacios fb765741a5 ccimx8x: change kernel to Image.gz and support all SOM variants in DT
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>
2018-07-06 16:20:47 +02:00
Hector Palacios 9b4884166c u-boot-fw-utils: add support for ccimx8x platform
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
2018-06-19 11:02:08 +02:00
Hector Palacios 8af8817796 u-boot: add support for U-Boot v2017.03
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
2018-05-31 12:06:37 +02:00
hbujanda 58bbd78efe ccimx6ulstarter/sbc: add support for variant 0x05
Variant 0x05 is a non-wireless with 1 GiB DDR3

boot.txt: Select zImage-imx6ul-ccimx6ulsbc.dtb fdt_file.
install_linux_fw_sd: Use u-boot-ccimx6ulsbc1GB.imx bootloader.

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

https://jira.digi.com/browse/DEL-5684
2018-04-12 12:13:50 +02:00
Gonzalo Ruiz 8b610ea212 install_linux_fw_sd: Removed hard-coded SD partition index
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>
2018-02-20 17:01:50 +01:00
Jose Diaz de Grenu 4895148009 u-boot-fw-utils: fix environment access functions
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>
2018-01-31 13:57:09 +01:00
Hector Palacios 5eb436f152 u-boot-fw-utils: forward port support for dynamic environment
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
2018-01-22 12:18:48 +01:00
Hector Palacios 02504c6730 ccimx6: default kernel image to zImage
As a side effect, remove U-Boot entry point variable and LOADADDR
extra parameter from the kernel recipe.

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

https://jira.digi.com/browse/DEL-5554
2018-01-18 18:50:18 +01:00
Jose Diaz de Grenu 0307d0c975 rocko migration: u-boot-fw-utils: update patches
Pending to update the patch for dynamic environment location in NAND.

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

Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
2018-01-12 15:59:13 +01:00
Jose Diaz de Grenu 8a81b2cb25 rocko migration: trustfence: fix dependencies
https://jira.digi.com/browse/DEL-5518

Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
2018-01-12 15:59:04 +01:00
Hector Palacios 5d18ee6731 ccimx6/ccimx6ul: default kernel image to zImage, except for CC6
U-Boot has been able to boot kernel zImage for a long time so make this
the default kernel image.
For the CC6 we still want to use uImage for compatibility reasons.

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

https://jira.digi.com/browse/DEL-5237
2017-11-21 10:14:39 +01:00
Arturo Buzarra 8c14ae877f meta-digi recipes: adjust machine overrides for new platform
This commit modifies different recipes to support the new platform
ccimx6qpsbc and adapt it to maintain the support to ccimx6sbc.

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

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2017-10-18 09:20:11 +02:00
Arturo Buzarra 1a3f22c9e4 u-boot-dey: add support for ccimx6qpsbc platform
This commit includes ccimx6qpsbc platform in the recipe and adds
U-Boot scripts for deploying and booting the system.

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

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2017-10-18 09:20:11 +02:00
Javier Viguera 6a2699967c ccardimx28js removal: delete recipes not used by other platforms
https://jira.digi.com/browse/DEL-4771

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-08-04 17:38:30 +02:00
Hector Palacios 5126a6049b u-boot-fw-utils: dynamically create fw_env.config for NAND-based platforms
A mechanism was introduced in U-Boot to dynamically locate the environment
copies within a NAND partition, skipping bad blocks and making full use of
the partition blocks.
To trigger this mechanism in Linux tools (fw_printenv/fw_setenv) the
configuration file /etc/fw_env.config must have both copies entries
pointing to the same offset.

This commit substitutes the hardcoded configuration file for CC6UL with a
stub and generates one on an RPM post-script basing on:

- Supplied DEY variables (with default values per platform):
  - UBOOT_ENV_OFFSET: starting offset of the environment within the
    partition.
  - UBOOT_ENV_SIZE: size of each copy of the environment.
  - UBOOT_ENV_RANGE: size in the partition that the environment copies may
    occupy, starting from UBOOT_ENV_OFFSET. If undefined, the whole
    partition is used.

- Calculated values:
  - NAND Erase block size
  - Number of blocks available for the environment copies

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

https://jira.digi.com/browse/DEL-4256
2017-06-16 11:59:30 +02:00
Hector Palacios 2b5017956b u-boot-fw-utils: added support for dynamic env location
Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://jira.digi.com/browse/DUB-741
2017-06-02 17:22:56 +02:00
Arturo Buzarra a1e84ca437 meta-digi-arm: add support for CC6 variant 0x14
This is a Consumer dual-core 1GHz, 4GB eMMC, 1GB DDR3, 0/+70C variant
without bluetooth, no wireless, no kinetis.

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

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2017-05-30 13:27:24 +02:00
Javier Viguera 3fa939fdc3 Merge tag 'dey-2.2-r1.4' into dey-2.2/master
Tweaked to maintain some recipes' revisions to AUTOREV instead of the
fixed SHA1s from the tag.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-05-04 13:58:33 +02:00
Mike Engel 29e3d0de40 meta-digi: update revisions for dey-2.2-r1.4
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2017-04-28 17:10:48 +02:00
Mike Engel d3bb596732 meta-digi: revert revisions to AUTOREV
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2017-04-26 13:51:58 +02:00
Mike Engel 9fed79fd45 meta-digi: update revisions for dey-2.2-r1.3
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2017-04-26 13:48:57 +02:00
Mike Engel 247df66459 meta-digi: revert revisions to AUTOREV
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2017-04-12 11:45:47 +02:00
Mike Engel 4ba24391c2 meta-digi: update revisions for dey-2.2-r1.2
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
2017-04-12 11:45:47 +02:00
Hector Palacios 68a1940d7f ccimx6ulstarter/sbc: select correct fdt_file for variant 0x04
Variant 0x04 has wireless and must select the '-wb' device tree.

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

https://jira.digi.com/browse/DEL-4100
2017-04-10 11:27:22 +02:00
Hector Palacios 80e5756770 ccimx6ulstarter/sbc: add support for CC6UL 1GB DDR3 variants
Add support to build U-Boot for variants with 1GB DDR3.
Add support in U-Boot install firmware script to select the
U-Boot artifact to use basing on variant.

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

https://jira.digi.com/browse/DEL-3970
2017-04-06 10:32:39 +02:00
Tatiana Leon c1709e4fd3 meta-digi: revert revisions to AUTOREV
Signed-off-by: Tatiana Leon <tatiana.leon@digi.com>
2017-03-28 18:54:25 +02:00
Tatiana Leon 28bc61a089 meta-digi: update revisions for dey-2.2-r1.1
Signed-off-by: Tatiana Leon <tatiana.leon@digi.com>
2017-03-28 18:20:52 +02:00
Tatiana Leon 432844a3a8 meta-digi: configure recipes to use maintenance branches
Updated recipes for linux, u-boot, trustfence-sign-tools, and
kernel-module-qualcomm.

Signed-off-by: Tatiana Leon <tatiana.leon@digi.com>
2017-03-28 11:30:06 +02:00
David Escalona 42856f87aa boot-script: merge 'recovery' and 'boot' scripts into 'boot'
- Instead of using a different boot script when booting from linux
  and from recovery, merge them into one script that checks the
  boot source.

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

Signed-off-by: David Escalona <david.escalona@digi.com>
2017-03-14 18:45:53 +01:00
Javier Viguera 01ee764fcf u-boot-fw-utils: rework patches to fix broken build
Patches added in 'meta-swupdate' (backported from U-Boot) broke our
layer. We also had those patches, so remove them and make sure the
rest or our patches are applied after the ones from 'meta-swupdate'
by using an anonymous python function instead of appending to the
SRC_URI variable.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-03-06 12:18:37 +01:00
Javier Viguera 989e9585f9 morty migration: u-boot-fw-utils: update package
https://jira.digi.com/browse/DEL-3451

Also backport patch to fix:

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2017-02-28 11:46:57 +01:00
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