wic: revert grub-efi patch

Revert "conf/machine: k3: Enable grub-efi by default in wic images"

This reverts commit d0b09833b44fa23cce86fd99dd8ca6631c61c476.

2 files changed, 1 insertions, 12 deletions

diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
index 166c0923..e0970698 100644
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -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"
diff --git a/wic/sdimage-2part-efi.wks b/wic/sdimage-2part-efi.wks
deleted file mode 100644
index ffb8d24b..00000000
--- a/wic/sdimage-2part-efi.wks
+++ /dev/null
@@ -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