summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorYogesh Siraswar <yogeshs@ti.com>2021-11-19 02:27:48 +0000
committerYogesh Siraswar <yogeshs@ti.com>2021-11-19 02:27:48 +0000
commit1eb6e71fe0acf344eca916c703b71e182bcd6438 (patch)
tree3c0f8fd67045a47cee407cfd5f8bc0cfd5b4e277 /conf
parentf438a091c319250eed33fe058706e93c9fbefd1c (diff)
downloadmeta-ti-1eb6e71fe0acf344eca916c703b71e182bcd6438.tar.gz
wic: revert grub-efi patch
Revert "conf/machine: k3: Enable grub-efi by default in wic images" This reverts commit d0b09833b44fa23cce86fd99dd8ca6631c61c476.
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/k3.inc6
1 files changed, 1 insertions, 5 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
44IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin" 44IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
45 45
46IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}" 46IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
47IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
48 47
49EFI_PROVIDER ?= "grub-efi" 48WKS_FILE ?= "sdimage-2part.wks"
50MACHINE_FEATURES += "efi"
51
52WKS_FILE ?= "sdimage-2part-efi.wks"
53do_image_wic[depends] += "virtual/bootloader:do_deploy" 49do_image_wic[depends] += "virtual/bootloader:do_deploy"
54do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy" 50do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
55do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy" 51do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"