Merge branch 'master' of git://www.openadk.org/git/openadk

6 files changed, 34 insertions, 0 deletions

diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 17b1453df..e3df1396f 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -128,6 +128,19 @@ config ADK_KERNEL_PATA_SC1200
 	default y if ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	default n
 
+config ADK_KERNEL_PATA_JMICRON
+	boolean
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_ATA_SFF
+	select ADK_KERNEL_ATA_BMDMA
+	select ADK_KERNEL_BLK_DEV
+	select ADK_KERNEL_BLK_DEV_SD
+	default y if ADK_TARGET_SYSTEM_TAROX_PC
+	default y if ADK_NATIVE_SYSTEM_TAROX_PC
+	default n
+
 config ADK_KERNEL_ATA_PIIX
 	boolean
 	select ADK_KERNEL_BLOCK
@@ -149,6 +162,8 @@ config ADK_KERNEL_ATA_PIIX
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
+	default y if ADK_TARGET_SYSTEM_TAROX_PC
+	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default n
 
 config ADK_KERNEL_SATA_AHCI
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 632bcf3e5..4a6cb4dec 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -19,6 +19,7 @@ config ADK_KERNEL_VT_CONSOLE
 config ADK_KERNEL_VGA_CONSOLE
 	boolean
 	default y if ADK_HARDWARE_VBOX
+	default y if ADK_TARGET_WITH_VGA
 	default n
 
 config ADK_KERNEL_FONTS
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 4f29471da..477cd46e8 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -8,6 +8,8 @@ config ADK_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_TAROX_PC
+	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
@@ -47,6 +49,8 @@ config ADK_KERNEL_INPUT_KEYBOARD
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_TAROX_PC
+	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
@@ -61,6 +65,8 @@ config ADK_KERNEL_KEYBOARD_ATKBD
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_TAROX_PC
+	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
@@ -74,6 +80,8 @@ config ADK_KERNEL_INPUT_MOUSE
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_TAROX_PC
+	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
@@ -88,6 +96,8 @@ config ADK_KERNEL_INPUT_MOUSEDEV
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_TAROX_PC
+	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 9aade47ab..48788ca4f 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -158,6 +158,8 @@ config ADK_KERNEL_E1000
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_TAROX_PC
+	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default n
diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm
index 7d7dc1f8f..d93c820cc 100644
--- a/target/linux/config/Config.in.pm
+++ b/target/linux/config/Config.in.pm
@@ -40,6 +40,8 @@ config ADK_HARDWARE_ACPI
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_TAROX_PC
+	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default n
 	help
 	 Enable ACPI support.
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 057fa1ffc..296986968 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -33,6 +33,8 @@ config ADK_KPACKAGE_KMOD_USB
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
+	default y if ADK_TARGET_SYSTEM_TAROX_PC
+	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
@@ -162,6 +164,8 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_TAROX_PC
+	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 	help