Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bsp: lmp-machine-custom: move back generic-arm64 to grub
Browse files Browse the repository at this point in the history
This is needed on arm64 as the current sd-boot version does not support
loading initrds via LINUX_INITRD_MEDIA_GUID (only via sd-stub, which
requires UKI).

Signed-off-by: Ricardo Salveti <[email protected]>
ricardosalveti committed Mar 31, 2023
1 parent 956d8ef commit 2de7d6c
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
Original file line number Diff line number Diff line change
@@ -118,20 +118,13 @@ QB_DRIVE_TYPE:qemuarm = "/dev/vdb"
QB_OPT_APPEND:qemuarm = "-no-acpi -bios ${DEPLOY_DIR_IMAGE}/u-boot.bin -d unimp"

# ARM64 Generic (SystemReady)
OSTREE_BOOTLOADER:generic-arm64 ?= "none"
OSTREE_BOOTLOADER:generic-arm64 ?= "grub"
MACHINE_FEATURES:append:generic-arm64 = " acpi pci usbhost"
EFI_PROVIDER:generic-arm64 ?= "systemd-boot"
OSTREE_SPLIT_BOOT:generic-arm64 = "1"
OSTREE_LOADER_LINK:generic-arm64 = "0"
WKS_FILE:generic-arm64:sota ?= "image-efi-installer.wks.in"
EFI_PROVIDER:generic-arm64 ?= "grub-efi"
WKS_FILE:generic-arm64:sota ?= "image-efi-installer-grub.wks.in"
WKS_FILE_DEPENDS:append:generic-arm64 = " ${INITRD_IMAGE_LIVE}"
## wic-based installer requires image to be available via IMAGE_BOOT_FILES
IMAGE_BOOT_FILES:generic-arm64 = "${@bb.utils.contains('WKS_FILE', 'image-efi-installer.wks.in', 'systemd-bootaa64.efi;EFI/BOOT/bootaa64.efi systemd-bootaa64.efi;EFI/systemd/systemd-bootaa64.efi ${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.ota-ext4;rootfs.img', '', d)}"
# ARM64 Generic with Qemu support
OSTREE_BOOTLOADER:qemu-generic-arm64 ?= "grub"
EFI_PROVIDER:qemu-generic-arm64 ?= "grub-efi"
OSTREE_SPLIT_BOOT:qemu-generic-arm64 = "0"
OSTREE_LOADER_LINK:qemu-generic-arm64 = "1"
IMAGE_BOOT_FILES:generic-arm64 = "${@bb.utils.contains('WKS_FILE', 'image-efi-installer-grub.wks.in', 'grub-efi-bootaa64.efi;EFI/BOOT/bootaa64.efi ${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.ota-ext4;rootfs.img', '', d)}"

# Intel
MACHINE_FEATURES:append:intel-corei7-64 = " tpm2"

0 comments on commit 2de7d6c

Please sign in to comment.