diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2023-02-09 11:34:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2023-02-09 11:34:07 +0100 |
| commit | a255f372e4f04283bd7dd9b12582ee4b4a268f84 (patch) | |
| tree | 20a4b9e16efff8a2ec546a7681c1f3b627719a17 /target | |
| parent | 9bed88c31fb09489ef8b0728208ed3b4e17fc5cc (diff) | |
qemu-x86_64: use gpt for efi boot, cfgfs needs to be fixed
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.rootfs | 3 | ||||
| -rw-r--r-- | target/x86_64/qemu-x86_64/genimage-efi.cfg | 15 |
2 files changed, 10 insertions, 8 deletions
diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs index f77bcd931..5c658fd02 100644 --- a/target/config/Config.in.rootfs +++ b/target/config/Config.in.rootfs @@ -163,6 +163,7 @@ config ADK_TARGET_ROOTFS_GENIMAGE bool "Create a disk image for the target" select ADK_LINUX_KERNEL_EXT4_FS if ADK_TARGET_OS_LINUX select ADK_LINUX_KERNEL_VFAT_FS if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_EFI_PARTITION if ADK_TARGET_OS_LINUX select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU select ADK_TARGET_QEMU_WITH_BOOTLOADER if ADK_TARGET_QEMU select ADK_HOST_BUILD_GENIMAGE @@ -194,7 +195,7 @@ config ADK_TARGET_DUAL_BOOT config ADK_TARGET_GENIMAGE_FILENAME string - default "genimage-efi-dual.cfg" if ADK_PACKAGE_GRUB_EFI_X86_64 || ADK_PACKAGE_GRUB_EFI_X86 && ADK_TARGET_DUAL_BOOT + default "genimage-efi-dual.cfg" if (ADK_PACKAGE_GRUB_EFI_X86_64 || ADK_PACKAGE_GRUB_EFI_X86) && ADK_TARGET_DUAL_BOOT default "genimage-efi.cfg" if ADK_PACKAGE_GRUB_EFI_X86_64 || ADK_PACKAGE_GRUB_EFI_X86 default "genimage-dual.cfg" if ADK_TARGET_DUAL_BOOT default "genimage.cfg" diff --git a/target/x86_64/qemu-x86_64/genimage-efi.cfg b/target/x86_64/qemu-x86_64/genimage-efi.cfg index a59d75e47..a2bfd0b7a 100644 --- a/target/x86_64/qemu-x86_64/genimage-efi.cfg +++ b/target/x86_64/qemu-x86_64/genimage-efi.cfg @@ -3,6 +3,9 @@ image efi-part.vfat { file EFI { image = "efi-part/EFI" } + file kernel { + image = "kernel" + } } size = 32M } @@ -10,21 +13,19 @@ image efi-part.vfat { image disk.img { hdimage { + partition-table-type = "gpt" } partition boot { - partition-type = 0xEF image = "efi-part.vfat" + partition-type-uuid = U + offset = 32K + bootable = true } partition root { - partition-type = 0x83 + partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a image = "rootfs.ext" } - partition cfgfs { - partition-type = 0x88 - image = "cfgfs.img" - } - } |