make vbox target usable again

5 files changed, 16 insertions, 9 deletions

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