make vbox target usable again

13 files changed, 48 insertions, 41 deletions

diff --git a/scripts/create.sh b/scripts/create.sh
index e280e7cea..f15fdc1bc 100755
--- a/scripts/create.sh
+++ b/scripts/create.sh
@@ -319,7 +319,7 @@ case $tgttype {
 	print "Converting raw image to VDI..."
 	VBoxManage convertdd dst.ima dst.vdi
 	rm dst.ima
-	print "Moving VDI image to $tgt..."
+	print "Moving VDI image to $tgt.vdi..."
 	mv -f dst.vdi "$tgt".vdi
 	;;
 }
diff --git a/target/config/Config.in b/target/config/Config.in
index 48f7c129c..5187c9bac 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -17,6 +17,9 @@ config ADK_TARGET_TOOLCHAIN
 config ADK_TARGET_QEMU
 	boolean
 
+config ADK_TARGET_VBOX
+	boolean
+
 # the inverse of ADK_TARGET_KERNEL_CUSTOMISING,
 # allows for selecting it off (i.e., to disable it)
 config ADK_TARGET_FIXED_KERNEL
diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel
index 0d1d06d16..e767ba2c5 100644
--- a/target/config/Config.in.kernel
+++ b/target/config/Config.in.kernel
@@ -48,6 +48,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-x86" if ADK_TARGET_SYSTEM_QEMU_X86
 	default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default "vbox-x86" if ADK_TARGET_SYSTEM_VBOX_X86
 	default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40
 	default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I
 	default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 348372785..bd720f177 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -32,6 +32,7 @@ source "target/config/Config.in.scripts"
 config ADK_RUNTIME_TMPFS_SIZE
 	string "size of /tmp in memory (kB)"
 	default "16384" if ADK_TARGET_QEMU
+	default "16384" if ADK_TARGET_VBOX
 	default "16384" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default "32768" if ADK_TARGET_SYSTEM_IBM_X40
 	default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI
@@ -56,11 +57,11 @@ config ADK_QUIET_KERNEL
 
 choice
 prompt "bootup messages from initscripts"
-default ADK_RUNTIME_VERBOSE_INIT_VGA if ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC || ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
+default ADK_RUNTIME_VERBOSE_INIT_VGA if ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC || ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY || ADK_TARGET_VBOX
 default ADK_RUNTIME_VERBOSE_INIT_SERIAL
 
 config ADK_RUNTIME_VERBOSE_INIT_VGA
-	depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC || ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
+	depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC || ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY || ADK_TARGET_VBOX
 	boolean "output via VGA"
 
 config ADK_RUNTIME_VERBOSE_INIT_SERIAL
@@ -98,6 +99,7 @@ config ADK_RUNTIME_GETTY_VGA
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default y if ADK_TARGET_VBOX
 	default n
 	help
           Start getty on VGA console. (tty1-tty6)
@@ -111,6 +113,7 @@ config ADK_RUNTIME_GETTY_SERIAL
 	default n if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n if ADK_TARGET_SYSTEM_IBM_X40
 	default n if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default n if ADK_TARGET_VBOX
 	default y
 	help
 	  Start getty on serial console.
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index 4f6874562..6994dc3cc 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -47,7 +47,7 @@ config ADK_TARGET_CMDLINE
 	default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100
 	default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	default "console=ttyS0,115200 console=tty0 geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
-	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_VBOX_I686
+	default "console=tty0" if ADK_TARGET_VBOX
 	default "console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER
 	default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
 	default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
@@ -78,7 +78,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64 || \
 		ADK_LINUX_NATIVE
-	depends on !ADK_HARDWARE_VBOX
+	depends on !ADK_TARGET_VBOX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	select ADK_KERNEL_BLK_DEV_INITRD
@@ -99,7 +99,7 @@ config ADK_TARGET_ROOTFS_INITRAMFSPIGGYBACK
 		ADK_LINUX_SPARC || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64
-	depends on !ADK_HARDWARE_VBOX
+	depends on !ADK_TARGET_VBOX
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	help
 	  create an read-only initramfs system.
@@ -145,7 +145,7 @@ config ADK_TARGET_ROOTFS_NFSROOT
 	select ADK_KERNEL_IP_PNP
 	select ADK_KERNEL_IP_PNP_DHCP
 	select ADK_PACKAGE_ADKINSTALL
-	depends on !ADK_TARGET_QEMU && !ADK_HARDWARE_VBOX && !ADK_TARGET_SYSTEM_ARANYM_M68K
+	depends on !ADK_TARGET_QEMU && !ADK_TARGET_VBOX && !ADK_TARGET_SYSTEM_ARANYM_M68K
 	depends on !ADK_TARGET_SYSTEM_ARM_FM
 	help
 	  Root filesystem mounted via NFS. (DHCP)
@@ -189,8 +189,8 @@ config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE
 
 config ADK_TARGET_ROOTFS_ARCHIVE
 	boolean "Archive usable for different filesystems"
-	select ADK_HOST_NEED_GENEXT2FS if ADK_TARGET_QEMU
-	select ADK_KERNEL_EXT2_FS if ADK_TARGET_QEMU
+	select ADK_HOST_NEED_GENEXT2FS if ADK_TARGET_QEMU || ADK_TARGET_VBOX
+	select ADK_KERNEL_EXT2_FS if ADK_TARGET_QEMU || ADK_TARGET_VBOX
 	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU
 	help
 	  Use this option if your root filesystem is ext2/ext3/ext4/xfs.
diff --git a/target/config/Config.in.x86.choice b/target/config/Config.in.x86.choice
index e99a584b3..e49d27686 100644
--- a/target/config/Config.in.x86.choice
+++ b/target/config/Config.in.x86.choice
@@ -3,7 +3,7 @@
 
 choice ADK_TARGET_X86_CPU_MODEL
 prompt "CPU model"
-depends on ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_GENERIC_PC
+depends on ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_GENERIC_PC || ADK_TARGET_SYSTEM_VBOX_X86
 default ADK_CPU_I686
 
 config ADK_CPU_I486
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 60c665f1a..c67e756f4 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -91,7 +91,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA
 	boolean
 
 menu "SATA/PATA devices support"
-depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_TARGET_QEMU
+depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_TARGET_QEMU || ADK_TARGET_VBOX
 
 config ADK_KERNEL_PATA_RB532
 	prompt "CF disk driver for Mikrotik RB532"
@@ -141,8 +141,8 @@ config ADK_KERNEL_SATA_AHCI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
-	depends on ADK_TARGET_SYSTEM_VBOX_I686
-	default y if ADK_TARGET_SYSTEM_VBOX_I686
+	depends on ADK_TARGET_VBOX
+	default y if ADK_TARGET_VBOX
 	default n
 	help
 	  Enables support for AHCI Serial ATA.
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index e0445bb73..92894357d 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -201,13 +201,15 @@ config ADK_KERNEL_E1000
 		ADK_TARGET_SYSTEM_QEMU_X86_64 || \
 		ADK_TARGET_SYSTEM_QEMU_MIPS || \
 		ADK_TARGET_SYSTEM_QEMU_MIPS64 || \
-		ADK_TARGET_SYSTEM_QEMU_PPC
+		ADK_TARGET_SYSTEM_QEMU_PPC || \
+		ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_QEMU_X86
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
 	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64
 	default y if ADK_TARGET_SYSTEM_QEMU_PPC
+	default y if ADK_TARGET_VBOX
 	default n
 	help
 	  Intel(R) PRO/1000 gigabit ethernet driver
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 2e7569ae1..51b8dac41 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -1,22 +1,22 @@
 menu "Graphic devices support"
-depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU
+depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU || ADK_TARGET_VBOX
 
 config ADK_KERNEL_VT
 	boolean
-	default y if ADK_HARDWARE_VBOX
 	default y if ADK_TARGET_WITH_VGA
+	default y if ADK_TARGET_VBOX
 	default n
 
 config ADK_KERNEL_VT_CONSOLE
 	boolean
-	default y if ADK_HARDWARE_VBOX
 	default y if ADK_TARGET_WITH_VGA
+	default y if ADK_TARGET_VBOX
 	default n
 
 config ADK_KERNEL_VGA_CONSOLE
 	boolean
-	default y if ADK_HARDWARE_VBOX
 	default y if ADK_TARGET_SYSTEM_IBM_X40
+	default y if ADK_TARGET_VBOX
 	default n
 
 config ADK_KERNEL_FONTS
@@ -144,9 +144,9 @@ config ADK_KERNEL_FB_VESA
 	boolean
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
-	default y if ADK_TARGET_SYSTEM_VBOX_I686
+	default y if ADK_TARGET_VBOX
  	default n
-	depends on ADK_TARGET_SYSTEM_VBOX_I686
+	depends on ADK_TARGET_VBOX
  	help
 	 Framebuffer support for VirtualBox Emulator.
 
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 50ee8eb6d..9c1513e10 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -1,10 +1,10 @@
 menu "Input devices"
-depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCHSCREEN || ADK_TARGET_QEMU
+depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCHSCREEN || ADK_TARGET_QEMU || ADK_TARGET_VBOX
 
 config ADK_KERNEL_INPUT
 	boolean
+	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
-	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
@@ -29,6 +29,7 @@ config ADK_KERNEL_KEYBOARD_ATARI
 
 config ADK_KERNEL_MOUSE_PS2
 	boolean
+	default y if ADK_TARGET_VBOX
 	default n
 
 config ADK_KERNEL_MOUSE_ATARI
@@ -62,8 +63,8 @@ config ADK_KERNEL_TOUCHSCREEN_ADS7846
 
 config ADK_KERNEL_INPUT_KEYBOARD
 	boolean
+	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
-	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
@@ -75,8 +76,8 @@ config ADK_KERNEL_INPUT_KEYBOARD
 
 config ADK_KERNEL_INPUT_MOUSE
 	boolean
+	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
-	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
@@ -129,12 +130,14 @@ config ADK_KERNEL_KEYBOARD_ATKBD
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT_KEYBOARD
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default y if ADK_TARGET_VBOX
 	default n
 
 config ADK_KERNEL_INPUT_MOUSEDEV
 	prompt "Mouse support"
 	tristate
 	select ADK_KERNEL_INPUT
+	default y if ADK_TARGET_VBOX
 	default n
 
 config ADK_KERNEL_INPUT_EVDEV
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.
+