From 310ff9be0f040e8102f9b8af5ac269ecc6de0897 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Thu, 20 Feb 2025 17:21:07 +0000 Subject: [PATCH] Reapply "bsp: tegra: enable systemd-boot support" This reverts commit b0df4eccfa527cb1b8afd6bfd16d4a8e78efff1e. Signed-off-by: Jose Quaresma --- meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc index 259157dc0..8bc310378 100644 --- a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc +++ b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc @@ -518,7 +518,9 @@ DISTRO_FEATURES:append:tegra = " opengl" DISTRO_FEATURES_DEFAULT:remove:tegra = "modsign" PREFERRED_PROVIDER_virtual/kernel:tegra ?= "linux-tegra" IMAGE_TEGRAFLASH_FS_TYPE:sota:tegra = "${@bb.utils.contains('TEGRA_EXTERNAL_ROOTFS_WIC', '1', 'wic.gz', 'ota-ext4', d)}" +IMAGE_TEGRAFLASH_ESPIMG:sota:tegra = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ota-esp" IMAGE_FSTYPES:remove:tegra = "${@bb.utils.contains('TEGRA_EXTERNAL_ROOTFS_WIC', '1', '', 'wic wic.gz wic.bmap', d)}" +TEGRA_ESP_IMAGE:sota:tegra = "" TEGRA_INITRAMFS_FSTYPES:tegra = "" INITRD_IMAGE:tegra = "" IMAGE_TEGRAFLASH_KERNEL:tegra = "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}" @@ -526,14 +528,17 @@ WKS_FILE:tegra:sota ?= "efidisk-sota.wks.in" IMAGE_ROOTFS_SIZE:tegra = "65536" PREFERRED_PROVIDER_virtual/bootloader:tegra ?= "edk2-firmware-tegra" TEGRA_UEFI_CAPSULE_INSTALL_DIR:tegra = "" +EFI_PROVIDER:sota:tegra = "systemd-boot" OSTREE_LOADER_LINK:tegra = "0" -OSTREE_BOOTLOADER:tegra ?= "syslinux" +OSTREE_BOOTLOADER:tegra = "none" OSTREE_DEPLOY_DEVICETREE:tegra = "1" +OSTREE_SPLIT_BOOT:sota:tegra = "1" PREFERRED_PROVIDER_virtual/optee-os:tegra = "optee-os" MACHINE_FEATURES:append:tegra = " optee" SOTA_CLIENT_FEATURES:remove:sota:tegra = "ubootenv" MACHINE_FEATURES:append:sota:tegra = " fioefi" LMP_BOOT_FIRMWARE_FILES:append:sota:tegra = " tegra-bl.cap" +IMAGE_BOOT_FILES:sota:tegra = "systemd-bootaa64.efi;EFI/BOOT/bootaa64.efi" ## jetson-agx-xavier-devkit (tegra194) OSTREE_KERNEL_ARGS:tegra194 ?= "\${cbootargs} ${OSTREE_KERNEL_ARGS_COMMON} rootwait mminit_loglevel=4 console=tty0 console=ttyTCU0,115200 fbcon=map:0 video=efifb:off sdhci_tegra.en_boot_part_access=1" ## jetson-agx-orin-devkit (tegra234)