Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ci/u-boot-qcom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ header:
local_conf_header:
bootloaderprovider: |
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-qcom"
libubootenv: |
IMAGE_INSTALL:append = " u-boot-fw-utils u-boot-qcom-env"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be in a separated commit.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ricardo Salveti (@ricardosalveti) , made as a separate commit.


2 changes: 1 addition & 1 deletion conf/machine/include/qcom-u-boot-common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
UBOOT_CONFIG ?= ""
UBOOT_CONFIG_DEFAULT ?= "${UBOOT_CONFIG}"

UBOOT_INITIAL_ENV = ""
UBOOT_INITIAL_ENV = "u-boot-initial-env"

# Don't forget to add config to qcom-armv8a.conf when adding it here
UBOOT_CONFIG[iq-615-evk] = "qcom_qcs615_defconfig"
Expand Down
4 changes: 4 additions & 0 deletions recipes-bsp/u-boot/files/fw_env.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Configuration file for fw_(printenv/setenv) utility (libubootenv).
# Device path Offset Size
/dev/disk/by-partlabel/logfs -0x4000 0x4000

1 change: 1 addition & 0 deletions recipes-bsp/u-boot/u-boot-qcom_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/qualcomm-linux/u-boot.git;${SRCBRANCH};protocol=http
SRC_URI += " \
file://disable-eficapsule-tool.cfg \
file://efi-rt-volatile-store.cfg \
file://fw_env.config \
${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'file://tfa-optee.cfg', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'kvm', 'file://gunyah-exit.cfg', '', d)} \
"
Expand Down
Loading