diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-23 20:15:10 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-23 20:15:10 +0100 |
| commit | 0221cc4264b0516f055efcdd2455ba880b53aa8c (patch) | |
| tree | c3cfc3286d6cc34d4ed2fb00abbc0ca2f9383022 /target | |
| parent | 9c9d5cb90a86edf1e9dc240bf0f38572f2ab26d6 (diff) | |
| parent | 937473821b259ed94969e62daa2ec60f5f2a9ffc (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/Config.in.x86 | 1 | ||||
| -rw-r--r-- | target/Config.in.x86_64 | 11 | ||||
| -rw-r--r-- | target/linux/Config.in | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.cpu | 5 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 3 |
6 files changed, 20 insertions, 4 deletions
diff --git a/target/Config.in.x86 b/target/Config.in.x86 index 8230e68c4..fd461cb7d 100644 --- a/target/Config.in.x86 +++ b/target/Config.in.x86 @@ -14,6 +14,7 @@ config ADK_HARDWARE_IBMX40 bool "IBM X40 laptop" select ADK_ibmx40 select ADK_CPU_PENTIUM_M + select ADK_KERNEL_MPENTIUMM 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 d88ebe785..1a7dac302 100644 --- a/target/Config.in.x86_64 +++ b/target/Config.in.x86_64 @@ -9,6 +9,14 @@ config ADK_HARDWARE_GENERIC_X86_64 help Generic x86_64/amd64 system. +config ADK_HARDWARE_OVH_RPS + bool "RPS iSCSI server from OVH" + select ADK_ovh_rps + select ADK_KERNEL_MATOM + select ADK_TARGET_WITH_PCI + select ADK_KERNEL_SCSI + select ADK_KERNEL_ISCSI_TCP + config ADK_HARDWARE_SHUTTLE bool "Shuttle PC" select ADK_shuttle @@ -21,9 +29,6 @@ config ADK_HARDWARE_SHUTTLE select ADK_TARGET_WITH_PP select ADK_KERNEL_INPUT_KEYBOARD select ADK_KERNEL_SCSI - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_PCI - select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_SATA_AHCI select ADK_KERNEL_BLK_DEV_SD select ADK_KERNEL_BLK_DEV_MD diff --git a/target/linux/Config.in b/target/linux/Config.in index 2d7157885..65fc7fbbb 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -1,3 +1,4 @@ +source target/linux/config/Config.in.cpu source target/linux/config/Config.in.block source target/linux/config/Config.in.fs source target/linux/config/Config.in.netdevice diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index ac8267663..766684f16 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -30,6 +30,9 @@ config ADK_KERNEL_SCSI config ADK_KERNEL_BLK_DEV_SD boolean +config ADK_KERNEL_ISCSI_TCP + boolean + config ADK_KERNEL_DM_CRYPT boolean diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu new file mode 100644 index 000000000..f34cb5238 --- /dev/null +++ b/target/linux/config/Config.in.cpu @@ -0,0 +1,5 @@ +config ADK_KERNEL_MATOM + boolean + +config ADK_KERNEL_MPENTIUMM + boolean diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 1492ebd5b..0836e224d 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -100,11 +100,12 @@ config ADK_KPACKAGE_KMOD_SKY2 help config ADK_KPACKAGE_KMOD_R8169 - prompt "kmod-net-r8169................. RTL8169 driver" + prompt "kmod-net-r8169................ RTL8169 driver" tristate select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 + default y if ADK_HARDWARE_OVH_RPS default n help |