summaryrefslogtreecommitdiff
path: root/target/x86
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-11 11:10:55 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-11 11:11:55 +0200
commit00a496345910208c9b1cd1ef922a4481960517a4 (patch)
tree2044a4b79285c9092bb4449094197ea0d9f93916 /target/x86
parent9c4ae62a55ebc763ac72e4b1513f305cdc1abe55 (diff)
make vbox target usable again
Diffstat (limited to 'target/x86')
-rw-r--r--target/x86/Makefile4
-rw-r--r--target/x86/systems/vbox-i68615
-rw-r--r--target/x86/systems/vbox-x8610
3 files changed, 12 insertions, 17 deletions
diff --git a/target/x86/Makefile b/target/x86/Makefile
index 374186b0d..b6e9c2bcc 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -43,10 +43,10 @@ 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)
+ifeq ($(ADK_TARGET_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)"
+ @echo "./scripts/create.sh -g -T vdi vbox-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
endif
endif
ifeq ($(ADK_TARGET_FS),initramfs)
diff --git a/target/x86/systems/vbox-i686 b/target/x86/systems/vbox-i686
deleted file mode 100644
index 97be46ec5..000000000
--- a/target/x86/systems/vbox-i686
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_TARGET_SYSTEM_VBOX_I686
- bool "VirtualBox Emulator"
- select ADK_x86
- select ADK_vbox_i686
- select ADK_CPU_I686
- select ADK_HARDWARE_VBOX
- select ADK_TARGET_WITH_VGA
- select ADK_TARGET_WITH_INPUT
- select ADK_TARGET_WITH_PCI
- select ADK_TARGET_WITH_HDD
- select ADK_TARGET_WITH_SATA
- select ADK_TARGET_KERNEL_BZIMAGE
- help
- Support for VirtualBox Emulator (i686).
-
diff --git a/target/x86/systems/vbox-x86 b/target/x86/systems/vbox-x86
new file mode 100644
index 000000000..56bdfcefd
--- /dev/null
+++ b/target/x86/systems/vbox-x86
@@ -0,0 +1,10 @@
+config ADK_TARGET_SYSTEM_VBOX_X86
+ bool "VirtualBox Emulator"
+ select ADK_x86
+ select ADK_vbox_x86
+ select ADK_TARGET_VBOX
+ select ADK_TARGET_KERNEL_BZIMAGE
+ select ADK_PACKAGE_GRUB
+ help
+ Support for VirtualBox Emulator.
+