diff options
| author | Kevin Chavez <kechavez@google.com> | 2016-07-27 18:55:46 -0400 |
|---|---|---|
| committer | David Zeuthen <zeuthen@google.com> | 2016-07-28 20:25:57 +0000 |
| commit | a5268da358cf571a53531155b79903ae46f88b80 (patch) | |
| tree | 94522d0befeb1cbc3d0df6a58a95fd47b21cf5fd | |
| parent | 4eb759db83b75631abd34060507029b439339275 (diff) | |
| download | brillo-a5268da358cf571a53531155b79903ae46f88b80.tar.gz | |
brillo: Add EFI_STUB related config and misc.
BUG=29123391
TEST=Manually tested boot image using qemu to ensure kernel booting
using EFI_STUB.
Change-Id: Ie4cec20d9b0d1d87846ab441e78d82e8260b2cc4
| -rw-r--r-- | brillo_uefi_x86_64/BoardConfig.mk | 4 | ||||
| -rw-r--r-- | brillo_uefi_x86_64/bsp/brillo.kconf | 13 | ||||
| -rwxr-xr-x | brillo_uefi_x86_64/provision-device | 5 |
3 files changed, 20 insertions, 2 deletions
diff --git a/brillo_uefi_x86_64/BoardConfig.mk b/brillo_uefi_x86_64/BoardConfig.mk index cb00fb0..eb7704e 100644 --- a/brillo_uefi_x86_64/BoardConfig.mk +++ b/brillo_uefi_x86_64/BoardConfig.mk @@ -14,6 +14,10 @@ # limitations under the License. # +# TODO: Fill with UEFI board-specific kernel command line string and +# programatically substitute with Brillo UEFI bootloader. +BOARD_KERNEL_CMDLINE := root=UUID= rootfstype=ext4 init=/init + # 512 MiB - keep in sync with brillo_partitions.bpt. BOARD_SYSTEMIMAGE_PARTITION_SIZE := 536870912 # No ramdisk. diff --git a/brillo_uefi_x86_64/bsp/brillo.kconf b/brillo_uefi_x86_64/bsp/brillo.kconf index f8cd160..46dde54 100644 --- a/brillo_uefi_x86_64/bsp/brillo.kconf +++ b/brillo_uefi_x86_64/bsp/brillo.kconf @@ -14,4 +14,15 @@ # limitations under the License. # -# Kernel settings that are specific to this target. +# Kernel settings that are specific to this target +# EFI (Extensible Firmware Interface) Support +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_EFI_PARTITION=y +CONFIG_FB_EFI=y +CONFIG_EFI_BOOTLOADER_CONTROL=y + +# EFI variable filesystem support +# CONFIG_EFIVAR_FS=y # For kernels 3.10 and above. +# CONFIG_EFI_VARS=n # Disable for 3.10 and above. +# CONFIG_EFI_VARS_PSTORE=m diff --git a/brillo_uefi_x86_64/provision-device b/brillo_uefi_x86_64/provision-device index e837899..f3434ad 100755 --- a/brillo_uefi_x86_64/provision-device +++ b/brillo_uefi_x86_64/provision-device @@ -41,4 +41,7 @@ then echo "(e.g. '\$ qemu-system-x86_64 -enable-kvm -bios OVMF.fd" \ "${OS}/full-disk-image.img). " echo "To obtain OVMF binary see http://www.tianocore.org/ovmf/" -fi
\ No newline at end of file +else + exit 1 +fi +exit 0 |