mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-01-12 01:20:20 +00:00
wic: revert grub-efi patch
Revert "conf/machine: k3: Enable grub-efi by default in wic images"
This reverts commit d0b09833b4.
This commit is contained in:
@@ -44,12 +44,8 @@ IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysf
|
||||
IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
|
||||
|
||||
IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
|
||||
IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
|
||||
|
||||
EFI_PROVIDER ?= "grub-efi"
|
||||
MACHINE_FEATURES += "efi"
|
||||
|
||||
WKS_FILE ?= "sdimage-2part-efi.wks"
|
||||
WKS_FILE ?= "sdimage-2part.wks"
|
||||
do_image_wic[depends] += "virtual/bootloader:do_deploy"
|
||||
do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
|
||||
do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
# short-description: Create SD card image with 2 partitions and EFI support
|
||||
# long-description: Creates a partitioned SD card image for TI platforms that
|
||||
# supports EFI. Boot files are located in the first vfat partition with extra
|
||||
# reserved space. We cannot use a GPT here.
|
||||
bootloader --append="rootfstype=ext4 ro"
|
||||
part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
|
||||
part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid
|
||||
Reference in New Issue
Block a user