summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-04-06 12:04:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-10 13:32:00 +0100
commitc13afae688fa96f03ac2a161e293434ad949374b (patch)
tree2f266477828cd888bee953dc056bdce0fca9b9d7
parentfe0b3333a5000918e06417205584d6efe007e2b5 (diff)
downloadpoky-c13afae688fa96f03ac2a161e293434ad949374b.tar.gz
grub-efi: Include GPT partition EXT FS support
Fixes [YOCTO 2257] GPT partitions are common for EFI systems. Add support for them by including the part_gpt partition module in the grub-efi image. In order to allow for loading a Linux kernel from an EXT* filesystem, include the ext2 module as well. With this fix applied, I was able to boot from a USB key using a GPT partition table with the following layout: $ sudo gdisk -l /dev/sdc GPT fdisk (gdisk) version 0.8.2 Partition table scan: MBR: protective BSD: not present APM: not present GPT: present Found valid GPT with protective MBR; using GPT. Disk /dev/sdc: 7669824 sectors, 3.7 GiB Logical sector size: 512 bytes Disk identifier (GUID): 68FA7CD4-E0C3-4A8E-82B5-1331C9B17A3C Partition table holds up to 128 entries First usable sector is 34, last usable sector is 7669790 Partitions will be aligned on 2-sector boundaries Total free space is 7428816 sectors (3.5 GiB) Number Start (sector) End (sector) Size Code Name 1 34 32801 16.0 MiB 0700 # FAT16 2 32802 240974 101.6 MiB 0700 # EXT3 From within GRUB, booted as bootia32.efi from the BOOT partition, I booted the OS with the following commands: grub> linux (hd0,gpt2)/vmlinuz rootwait root=/dev/sda2 console=ttyS0,115200 grub> boot This change will enable BSP developers to use the grub-efi image in their own images as well as enable upcoming changes to the installer to support EFI. (From OE-Core rev: a2c6687410f00623efe8dfcb22385cbbc7f2e1a9) Signed-off-by: Darren Hart <dvhart@linux.intel.com> CC: Kishore Bodke <kishore.k.bodke@intel.com> CC: Rahul Saxena <rahul.saxena@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/grub/grub-efi-native_1.99.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-bsp/grub/grub-efi-native_1.99.bb b/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
index c951152df8..93e9290848 100644
--- a/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
+++ b/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
16# FIXME: We should be able to optionally drop freetype as a dependency 16# FIXME: We should be able to optionally drop freetype as a dependency
17DEPENDS = "help2man-native autogen-native" 17DEPENDS = "help2man-native autogen-native"
18RDEPENDS_${PN} = "diffutils freetype" 18RDEPENDS_${PN} = "diffutils freetype"
19PR = "r5" 19PR = "r6"
20 20
21# Native packages do not normally rebuild when the target changes. 21# Native packages do not normally rebuild when the target changes.
22# Ensure this is built once per HOST-TARGET pair. 22# Ensure this is built once per HOST-TARGET pair.
@@ -61,7 +61,7 @@ EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \
61do_mkimage() { 61do_mkimage() {
62 ./grub-mkimage -p /EFI/BOOT -d ./grub-core/ \ 62 ./grub-mkimage -p /EFI/BOOT -d ./grub-core/ \
63 -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ 63 -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \
64 boot linux fat serial part_msdos normal efi_gop 64 boot linux ext2 fat serial part_msdos part_gpt normal efi_gop
65} 65}
66addtask mkimage after do_compile before do_install 66addtask mkimage after do_compile before do_install
67 67