make vbox target usable again

4 files changed, 19 insertions, 14 deletions

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