The setting of 'bootcmd' in the script was done using single quotes, which
doesn't expand variables. As a consequence the following variables must
be defined again (during the execution of the second part of the script):
- mmcdev
- INSTALL_LINUX_FILENAME
- INSTALL_ROOTFS_FILENAME
This patch changes the single quotes with double quotes, so that these
variables are expanded during the setting of 'bootcmd' with the values
assigned at the begining of the installation script (notice these are
not dynamically generated so there is no risk to expand them).
At the same time we need to escape with a backslash:
- double quotes containing strings
- variables that we don't want to expand (like the return value $?)
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
- Add semi-colons to instructions inside 'setenv' commands
- Remove semi-colons in instructions where they are not needed (for
consistency with the rest of instructions)
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
There are several possible values for TRUSTFENCE_UBOOT_ENV_DEK:
* Not defined: if the trustfence support is not included.
Should not include the feature.
* 32 characters: when defining a valid key.
Should include the feature.
* "0": when explicetily disabling the feature.
Should not include the feature
* <other>: Invalid value, should trigger the error.
This commits fixes the logic so that 'None' (no defined) is taken as a valid
value.
Signed-off-by: Jose Diaz de Grenu de Pedro <Jose.DiazdeGrenudePedro@digi.com>
https://jira.digi.com/browse/DEL-2603
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Signed-off-by: Jose Diaz de Grenu de Pedro <Jose.DiazdeGrenudePedro@digi.com>
Implement the set of TRUSTFENCE_ macros to configure each secure boot feature
available in U-Boot.
https://jira.digi.com/browse/DUB-570
Signed-off-by: Jose Diaz de Grenu de Pedro <Jose.DiazdeGrenudePedro@digi.com>
COMPATIBLE_MACHINE is a regular expression, so we need to update the current
pattern for ccimx6 due to it will also match with ccimx6ul.
Signed-off-by: Isaac Hermida <isaac.hermida@digi.com>
Old versions of u-boot 'v2013.0x' have a bug in the shell's test command
that makes structures like:
if test "${not-existing}" = "0x01"; then ...
if test -z "${not-existing}"; then ...
to fail when the checked variable does not exist.
So implement workarounds in the updater script to overcome this problem.
This is needed because the script may be used in modules with an old
pre-installed u-boot.
https://jira.digi.com/browse/DEL-2231
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
The install script allows for an easy deployment of the DEY firmware
artifacts into the eMMC of the ConnectCore 6 by using a micro SD card.
The install script:
- updates U-Boot
- resets the U-Boot environmnet to default values
- formats the User Data partition of the eMMC
- installs the firmware images (linux and rootfs partitions)
- resets/starts the system
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
https://jira.digi.com/browse/DEL-2192
The canonical symlinks created by poky's U-Boot class in u-boot.inc for
the different U-Boot configs are in the form:
u-boot.imx-<config>
u-boot-<machine>.imx-<config>
These symlinks have the .imx file extension hidden in the middle of the
file name, which looks ugly.
For DEY, remove these unused symlinks and generate new ones in the form:
u-boot-<config>.imx
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
https://jira.digi.com/browse/DEL-2192
As the plan is to use the same git objects (SHA1) in the internal and
github repos, also remove that internal/external SRCREV infrastructure.
https://jira.digi.com/browse/DEL-2205
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Carrier board version is determined by U-Boot variable $board_id
which will be defined if a board ID has been burned on certain
OTP bits.
Use the value in this variable to create the $fdt_file variable
using the suffix "-id${board_id}" to point to the device tree
file that matches that board ID.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
https://jira.digi.com/browse/DEL-2160
ERROR: u-boot-dey: md5 data is not matching for file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95
ERROR: u-boot-dey: The new md5 checksum is c7383a594871c03da76b3707929d2919
https://jira.digi.com/browse/DEL-1890
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
ccimx51js and ccimx53js are not supported in this version of DEY.
Support for those platforms is in previous versions of DEY.
https://jira.digi.com/browse/DEL-1890
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Instead of creating a new recipe for u-boot fw-utils (fw_printenv) just
bbappend the recipe in Poky.
https://jira.digi.com/browse/DEL-1829
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
* Merge u-boot-dey-rev_2015.04.inc into the recipe. There is no need to
split the recipe, as there is no other recipe using this u-boot code.
* Update uboot configurations to the new format '_defconfig'. Also add
the new 2GB variant.
* Remove PREFERRED_VERSION_u-boot-dey for CC6, as there is only one
version available for this platform.
https://jira.digi.com/browse/DEL-1829
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This is a Consumer quad-core 1.2GHz, 4GB eMMC, 2GB DDR3, -20/+85C variant
with bluetooth and wireless, no kinetis.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Adapt u-boot bootscript after latest changes in 'mmcdev' variable
semantics. Now the boot media device is stored in 'mmcbootdev' variable.
Also set the device tree filename depending on the hardware variant.
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Add post-installation script that runs on first boot to reconfigure the
u-boot environment depending on the media (EMMC,SD) the target is
booting from.
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
(cherry picked from commit 8486d120355d80ea8ad5864596c8486a1d3c0db2)
This is needed in the context of CC6 variants 0x7 and 0x9 (EMMC-less).
Changes:
* Do not use 'meta-fsl-arm' image generation class: removed include and
override SDCARD generation function
* Use same VFAT boot image for EMMC and SD card. The u-boot bootscript
has been adapted to be able to boot Linux from both SD and EMMC.
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
(cherry picked from commit 8b8456b8fd90facd92dfc87632effa582ca60475)
Remove the current DEY variants support and framework for CC6 because in
following commits we will add support for all *hardware* variants in
just one set of DEY images for CC6.
https://jira.digi.com/browse/DEL-1569
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
The SD card images support added a dependence to mkimage native tool.
Otherwise the build may fail with:
mkimage: not found
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This completes the support for ccimx6sbc variants:
* support device tree variants
* split variants '0x01,0x02,0x04' group in two different groups (with or
without kinetis)
https://jira.digi.com/browse/DEL-1359
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
(cherry picked from commit 3f20015411f4e270b2e2c8faf292678c75ff2aff)
Notes:
* This version of u-boot does not support comments in scripts
* Enabled EXT4 in kernel config (for the SDCARD rootfs)
https://jira.digi.com/browse/DEL-197
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Needing to set the branch where a specific SHA1 revision is contained is
a unnecessary constraint that can be bypassed setting 'nobranch=1' in
the SRC_URI.
We do that for all the external repos (GitHub) plus the internal ones
for the im-xbootlets and the atheros kernel module (as those two repos
are stable enough and we are not developing actively on them).
For U-Boot and Linux we keep the SRCBRANCH framework for internal repos
as this is needed for the AUTOREV yocto feature.
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Starting with Yocto 1.6 there is a need to configure in which branch a
specific SHA1 revision is included. We need a framework to set such
branches both for internal git repos and for external ones (Github).
If the branch is not specified in the SRC_URI, the do_fetch task may
fail even though the SHA1 revision exists in the repository.
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
By default EMMC boot partition is locked. This prevents fw_setenv
utility to configure the u-boot environment from Linux.
This commit adds a patch that unlocks the EMMC boot partition just
before writing into it and then locks it again once the environment is
written.
https://jira.digi.com/browse/DEL-1021
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
The setlocalversion script in u-boot 2009.08 did not have the
'--save-scmversion' parameter so the build was failing.
But for that version the whole do_compile_prepend can be removed because
it's not needed at all.
While on it, update the revisions for versions 2009.08 and 2013.01 to
include a fix done in 'setlocalversion' script.
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This fix an error building 'nvram' for ccardimx28js:
ERROR: Fetcher failure: Unable to find revision ... in branch master even from
upstream
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Building u-boot with Yocto does not show the version string in the
u-boot header. This is due to how Yocto compiles u-boot. It creates a
.scmversion file which may contain LOCALVERSION strings but in our case
it's empty. Later at build time u-boot's setlocalversion script detects
that file exists and exits with no further action (because it assumes
the file contains the version string).
https://jira.digi.com/browse/DEL-1007
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Provides fw_printenv/fw_setenv utilities to read/write the u-boot
environment from Linux.
https://jira.digi.com/browse/DEL-800
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Most SRC_URI defaults to DIGI_LOG_GIT. This patch sets a more generic
name (DIGI_GIT) that defaults to DIGI_LOG_GIT, but is configurable by
someone who might want to tune it (DIGI_MTK_GIT, etc.).
Signed-off-by: Seth Bollinger <sethb@digi.com>
If people are creating derivative machines in their layer, make
COMPATIBLE_MACHINE more flexible. Use SOC_FAMILY instead of specific
machine types. This allows users to more easily share these recipes.
https://jira.digi.com/browse/DEL-676
Signed-off-by: Seth Bollinger <sethb@digi.com>
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
The build was failing for any IMX platform because it was trying to
build a bootstream u-boot.
The u-boot variables (UBOOT_*) used by yocto were incorrectly set,
so I reworked and simplified them to fix the bug and ease maintenance.
https://jira.digi.com/browse/DEL-562
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
The external repositories have been cleaned up and commits have been
squashed so the sha1s need to be updated.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
The final product will be called "Digi Embedded for Yocto" or DEY for
short.
This commit renames all relevant files.
https://jira.digi.com/browse/DEL-474
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
- Merge SRCREVS
- Remove UBOOT_MAKE_TARGET_paltform as they already are in machine
configuration files.
- Merge DEPENDS_mxs_platform as they are equal.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
All bbappend files will start as follows:
# Copyright (C) 2013 Digi International.
PRINC := "${@int(PRINC) + 1}"
PR_append = "+${DISTRO}"
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Just a cosmetic name change for the merged wired and wireless platforms.
This and related commits fixes https://jira.digi.com/browse/DEL-188.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
The ConnectCard needs a bootstreamed (.sb) u-boot to boot from flash. This
is flashed using u-boot.
This changes compiles a bootstream u-boot image. The bootlets are compiled
separately and it's U-Boot's Makefile that calls elftosb to generate the
final bootstream.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Hector Palacios
Diaz de Grenu, Jose
Jose Diaz de Grenu de Pedro
Alex Gonzalez
Javier Viguera
Isaac Hermida
Seth Bollinger
Francis Sreeves