summaryrefslogtreecommitdiff
path: root/target/x86_64
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-09-12 23:22:14 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-09-12 23:22:29 +0200
commitd284ab4d037ed69c0368ab45f79917465187dfc8 (patch)
tree4ad8608b4af65507a4f252b282334d98387bb637 /target/x86_64
parent284b7b24de6d8f957c6aba9d2010bed9eda98efe (diff)
qemu: efi boot works, need to add a package for EFI bios file
Diffstat (limited to 'target/x86_64')
-rw-r--r--target/x86_64/Makefile11
-rw-r--r--target/x86_64/qemu-x86_64/genimage.cfg15
2 files changed, 25 insertions, 1 deletions
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile
index cd6530c91..dfaaa1e43 100644
--- a/target/x86_64/Makefile
+++ b/target/x86_64/Makefile
@@ -9,6 +9,7 @@ KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
QEMU_ARCH:=x86_64
QEMU_ARGS:=-M pc
+QEMU_ARGS+=-L . -bios bios.bin
QEMU_ARGS+=${ADK_QEMU_ARGS}
QEMU_ARGS+=-net user -net nic,model=e1000
@@ -84,6 +85,16 @@ ifeq ($(ADK_TARGET_FS),iso)
targethelp:
@echo 'ISO image is at $<'
endif
+ifeq ($(ADK_TARGET_FS),genimage)
+targethelp:
+ @echo "The disk image is: $(FW_DIR)/disk.img"
+ @echo "Use following command to install it on SD card:"
+ifeq ($(ADK_TARGET_QEMU),y)
+ @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} $(FW_DIR)/disk.img'
+else
+ @echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k'
+endif
+endif
# image creation and kernel install
kernel-strip:
diff --git a/target/x86_64/qemu-x86_64/genimage.cfg b/target/x86_64/qemu-x86_64/genimage.cfg
index 9f2d3ec72..5a5479fbd 100644
--- a/target/x86_64/qemu-x86_64/genimage.cfg
+++ b/target/x86_64/qemu-x86_64/genimage.cfg
@@ -1,12 +1,25 @@
+image efi-part.vfat {
+ vfat {
+ file EFI {
+ image = "efi-part/EFI"
+ }
+ }
+ size = 32M
+}
+
image disk.img {
hdimage {
}
+ partition boot {
+ partition-type = 0xEF
+ image = "efi-part.vfat"
+ }
+
partition root {
partition-type = 0x83
image = "rootfs.ext"
}
}
-