summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-12-13 19:38:38 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-12-13 19:38:38 +0100
commit3d5476d44fccb4494012990c0f01b3d7d0b3ae96 (patch)
tree67c00f07d622c7e21901a6c0383c49c827182041 /target
parent208ac48fbc74fdc67bac5e39531710be516ce50e (diff)
parent1ca706f0559b7a13f4f541aeaae71f824d837416 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r--target/Config.in7
-rw-r--r--target/Config.in.runtime2
-rw-r--r--target/Config.in.x861
-rw-r--r--target/Config.in.x86_641
-rw-r--r--target/linux/config/Config.in.block5
-rw-r--r--target/linux/config/Config.in.graphics1
-rw-r--r--target/linux/config/Config.in.kvm2
-rw-r--r--target/linux/config/Config.in.misc18
8 files changed, 25 insertions, 12 deletions
diff --git a/target/Config.in b/target/Config.in
index 4a439031b..c8701859a 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -23,6 +23,9 @@ config ADK_TARGET_WITH_VGA
config ADK_TARGET_WITH_HDD
bool
+config ADK_TARGET_WITH_SATA
+ bool
+
config ADK_TARGET_WITH_INPUT
bool
@@ -44,6 +47,9 @@ config ADK_TARGET_WITH_WATCHDOG
config ADK_TARGET_WITH_DSL
bool
+config ADK_TARGET_CPU_WITH_VT
+ bool
+
config ADK_TOOLCHAIN_ONLY
bool
@@ -177,6 +183,7 @@ config ADK_CPU_PENTIUM_M
boolean
config ADK_CPU_AMDFAM10
+ select ADK_TARGET_CPU_WITH_VT
boolean
config ADK_CPU_LOONGSON2F
diff --git a/target/Config.in.runtime b/target/Config.in.runtime
index 51f1d5653..b36880a3a 100644
--- a/target/Config.in.runtime
+++ b/target/Config.in.runtime
@@ -3,7 +3,7 @@
config ADK_RUNTIME_HOSTNAME
string "hostname for the embedded system"
- default "linux"
+ default "localhost"
help
Set your target hostname.
diff --git a/target/Config.in.x86 b/target/Config.in.x86
index e7e98c65a..18dd6027a 100644
--- a/target/Config.in.x86
+++ b/target/Config.in.x86
@@ -15,6 +15,7 @@ config ADK_HARDWARE_IBM_X40
select ADK_ibm_x40
select ADK_CPU_PENTIUM_M
select ADK_KERNEL_MPENTIUMM
+ select ADK_TARGET_WITH_CARDBUS
select ADK_TARGET_WITH_USB
select ADK_TARGET_WITH_PCI
select ADK_TARGET_WITH_VGA
diff --git a/target/Config.in.x86_64 b/target/Config.in.x86_64
index 053d05829..f3f6c6a77 100644
--- a/target/Config.in.x86_64
+++ b/target/Config.in.x86_64
@@ -21,6 +21,7 @@ config ADK_HARDWARE_SHUTTLE_SA76G2
bool "Shuttle PC"
select ADK_shuttle_sa76g2
select ADK_CPU_AMDFAM10
+ select ADK_TARGET_WITH_SATA
select ADK_TARGET_WITH_USB
select ADK_TARGET_WITH_VGA
select ADK_TARGET_WITH_PCI
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 4415489c1..1812b5570 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -36,6 +36,9 @@ config ADK_KERNEL_ISCSI_TCP
config ADK_KERNEL_DM_CRYPT
boolean
+config ADK_KERNEL_BLK_DEV
+ boolean
+
config ADK_KERNEL_BLK_DEV_DM
boolean
select ADK_KERNEL_MD
@@ -67,6 +70,7 @@ config ADK_KERNEL_SATA_AHCI
select ADK_KERNEL_BLOCK
select ADK_KERNEL_ATA
select ADK_KERNEL_BLK_DEV_SD
+ depends on ADK_TARGET_WITH_SATA
default y if ADK_HARDWARE_SHUTTLE
default n
@@ -282,6 +286,7 @@ config ADK_KPACKAGE_KMOD_DM_MIRROR
config ADK_KPACKAGE_KMOD_BLK_DEV_DRBD
prompt "kmod-blk-dev-drbd................. DRBD support (Network RAID 1)"
tristate
+ select ADK_KERNEL_BLK_DEV
select ADK_KERNEL_CONNECTOR
help
DRBD - http://www.drbd.org
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index dd4df958c..96814e733 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -38,6 +38,7 @@ config ADK_KERNEL_FB_GEODE_LX
select ADK_KERNEL_FB
select ADK_KERNEL_FRAMEBUFFER_CONSOLE
select ADK_KERNEL_FB_GEODE
+ depends on ADK_LINUX_X86_ALIX
default y if ADK_HARDWARE_ALIX1C
default n
help
diff --git a/target/linux/config/Config.in.kvm b/target/linux/config/Config.in.kvm
index 20aaa4f92..44ed992a4 100644
--- a/target/linux/config/Config.in.kvm
+++ b/target/linux/config/Config.in.kvm
@@ -1,5 +1,5 @@
menu "Virtualization"
-depends on ADK_LINUX_X86_64 || ADK_LINUX_X86
+depends on (ADK_LINUX_X86_64 || ADK_LINUX_X86) && ADK_TARGET_CPU_WITH_VT
config ADK_KERNEL_VIRTUALIZATION
bool
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index a51d48ee3..0cf5819a0 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -23,9 +23,13 @@ config ADK_KERNEL_RFKILL
config ADK_KERNEL_WATCHDOG
boolean
default n
+
+config ADK_KERNEL_I2C
+ boolean
+ default n
config ADK_KERNEL_I2C_CHARDEV
- boolean
+ tristate
default n
config ADK_KERNEL_RTC_CLASS
@@ -49,6 +53,7 @@ config ADK_KERNEL_GEODE_WDT
select ADK_KERNEL_MISC_DEVICES
select ADK_KERNEL_CS5535_MFGPT
select ADK_KERNEL_CS5535_CLOCK_EVENT_SRC
+ depends on ADK_LINUX_X86_ALIX
default y if ADK_HARDWARE_ALIX2D2
default y if ADK_HARDWARE_ALIX2D13
default n
@@ -66,18 +71,11 @@ config ADK_KERNEL_RTC_DRV_CMOS
help
RTC support for ALIX boards.
-config ADK_KPACKAGE_KMOD_I2C
- prompt "kmod-i2c.......................... I2C support"
- tristate
- select ADK_KERNEL_I2C_CHARDEV
- default n
- help
- I2C support
-
config ADK_KPACKAGE_KMOD_SCx200_ACB
prompt "kmod-i2c-geode.................... I2C driver for Geode"
tristate
- depends on ADK_KPACKAGE_KMOD_I2C
+ select ADK_KERNEL_I2C
+ select ADK_KERNEL_I2C_CHARDEV
depends on ADK_LINUX_X86_ALIX
default n
help