diff options
Diffstat (limited to 'target/x86_64')
-rw-r--r-- | target/x86_64/Makefile | 9 | ||||
-rw-r--r-- | target/x86_64/generic-x86_64/genimage-dual.cfg | 36 | ||||
-rw-r--r-- | target/x86_64/generic-x86_64/genimage-efi-dual.cfg | 37 | ||||
-rw-r--r-- | target/x86_64/generic-x86_64/genimage-efi.cfg | 30 | ||||
-rw-r--r-- | target/x86_64/generic-x86_64/genimage.cfg | 30 | ||||
-rw-r--r-- | target/x86_64/kernel/asus-p5bvm | 7 | ||||
-rw-r--r-- | target/x86_64/kernel/lenovo-x200 | 6 | ||||
-rw-r--r-- | target/x86_64/qemu-x86_64/genimage-efi-dual.cfg | 11 | ||||
-rw-r--r-- | target/x86_64/qemu-x86_64/genimage-efi.cfg | 9 |
9 files changed, 148 insertions, 27 deletions
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 654ab0247..2c5bcd253 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -9,14 +9,14 @@ KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage QEMU_ARCH:=x86_64 -QEMU_ARGS:=-M pc +QEMU_ARGS:=-M pc -m 256 ifeq ($(ADK_PACKAGE_GRUB_EFI_X86_64),y) QEMU_ARGS+=-L . -bios bios-x86_64.bin endif QEMU_ARGS+=${ADK_QEMU_ARGS} QEMU_ARGS+=-net user -net nic,model=e1000 ifeq ($(ADK_TARGET_QEMU_WITH_AUDIO),y) -QEMU_ARGS+=-soundhw ac97 +QEMU_ARGS+=-device AC97 endif ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) @@ -44,11 +44,6 @@ else @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif endif -ifeq ($(ADK_HARDWARE_VBOX),y) - @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) - @echo "Use following command to create a VirtualBox Image:" - @echo "./scripts/create.sh -T vdi vbox-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" -endif endif ifeq ($(ADK_TARGET_FS),initramfs) targethelp: diff --git a/target/x86_64/generic-x86_64/genimage-dual.cfg b/target/x86_64/generic-x86_64/genimage-dual.cfg new file mode 100644 index 000000000..647a2bcb5 --- /dev/null +++ b/target/x86_64/generic-x86_64/genimage-dual.cfg @@ -0,0 +1,36 @@ +image disk.img { + + hdimage { + } + + partition boot { + in-partition-table = "no" + image = "boot.img" + offset = 0 + size = 512 + } + + partition grub { + in-partition-table = "no" + image = "grub.img" + offset = 512 + } + + partition root1 { + partition-type = 0x83 + image = "rootfs.ext" + size = 64M + } + + partition root2 { + partition-type = 0x83 + image = "rootfs.ext" + size = 64M + } + + partition cfgfs { + partition-type = 0x88 + image = "cfgfs.img" + } + +} diff --git a/target/x86_64/generic-x86_64/genimage-efi-dual.cfg b/target/x86_64/generic-x86_64/genimage-efi-dual.cfg new file mode 100644 index 000000000..7c82a0bcb --- /dev/null +++ b/target/x86_64/generic-x86_64/genimage-efi-dual.cfg @@ -0,0 +1,37 @@ +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 root1 { + partition-type = 0x83 + image = "rootfs.ext" + size = 128M + } + + partition root2 { + partition-type = 0x83 + image = "rootfs.ext" + size = 128M + } + + partition cfgfs { + partition-type = 0x88 + image = "cfgfs.img" + } + +} diff --git a/target/x86_64/generic-x86_64/genimage-efi.cfg b/target/x86_64/generic-x86_64/genimage-efi.cfg new file mode 100644 index 000000000..a59d75e47 --- /dev/null +++ b/target/x86_64/generic-x86_64/genimage-efi.cfg @@ -0,0 +1,30 @@ +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" + } + + partition cfgfs { + partition-type = 0x88 + image = "cfgfs.img" + } + +} diff --git a/target/x86_64/generic-x86_64/genimage.cfg b/target/x86_64/generic-x86_64/genimage.cfg new file mode 100644 index 000000000..d86f7ffd7 --- /dev/null +++ b/target/x86_64/generic-x86_64/genimage.cfg @@ -0,0 +1,30 @@ +image disk.img { + + hdimage { + } + + partition boot { + in-partition-table = "no" + image = "boot.img" + offset = 0 + size = 512 + } + + partition grub { + in-partition-table = "no" + image = "grub.img" + offset = 512 + } + + partition root { + partition-type = 0x83 + image = "rootfs.ext" + size = 64M + } + + partition cfgfs { + partition-type = 0x88 + image = "cfgfs.img" + } + +} diff --git a/target/x86_64/kernel/asus-p5bvm b/target/x86_64/kernel/asus-p5bvm deleted file mode 100644 index b17b6e256..000000000 --- a/target/x86_64/kernel/asus-p5bvm +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_X86=y -CONFIG_X86_64=y -CONFIG_X86_X32=y -CONFIG_GENERIC_CPU=y -CONFIG_PROCESSOR_SELECT=y -CONFIG_CPU_SUP_INTEL=y -CONFIG_CPU_SUP_AMD=y diff --git a/target/x86_64/kernel/lenovo-x200 b/target/x86_64/kernel/lenovo-x200 deleted file mode 100644 index ad080ab40..000000000 --- a/target/x86_64/kernel/lenovo-x200 +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_X86=y -CONFIG_X86_64=y -CONFIG_GENERIC_CPU=y -CONFIG_PROCESSOR_SELECT=y -CONFIG_CPU_SUP_INTEL=y -CONFIG_CMDLINE_BOOL=y diff --git a/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg b/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg index 7c82a0bcb..ff3cb08d2 100644 --- a/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg +++ b/target/x86_64/qemu-x86_64/genimage-efi-dual.cfg @@ -10,27 +10,30 @@ 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 root1 { - partition-type = 0x83 + partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a image = "rootfs.ext" size = 128M } partition root2 { - partition-type = 0x83 + partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a image = "rootfs.ext" size = 128M } partition cfgfs { - partition-type = 0x88 + partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a image = "cfgfs.img" } diff --git a/target/x86_64/qemu-x86_64/genimage-efi.cfg b/target/x86_64/qemu-x86_64/genimage-efi.cfg index a59d75e47..c7fa9a2c3 100644 --- a/target/x86_64/qemu-x86_64/genimage-efi.cfg +++ b/target/x86_64/qemu-x86_64/genimage-efi.cfg @@ -10,20 +10,23 @@ 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 + partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a image = "cfgfs.img" } |