diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 18:25:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 18:25:39 +0200 |
| commit | a1a6f77690852de409a364b66504f85264a6d1e7 (patch) | |
| tree | 58a68456fd1748cf043a29ff044fc135546ed8b7 /target/linux/config | |
| parent | a0e2c5dc26f0126d8462e15e3bdf9a92bbbbee34 (diff) | |
| parent | 7380941d507ee1d245b3ce20d93e32aa83f8ea9c (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.block | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 10 | ||||
| -rw-r--r-- | target/linux/config/Config.in.serial | 11 | ||||
| -rw-r--r-- | target/linux/config/Config.in.systems | 3 |
5 files changed, 28 insertions, 2 deletions
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index fdafb06b0..fe4c0a9c8 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -62,6 +62,9 @@ config ADK_KERNEL_MMC config ADK_KERNEL_MMC_BLOCK boolean +config ADK_KERNEL_SCSI_SYM53C8XX_2 + boolean + config ADK_KERNEL_MMC_AT91 boolean select ADK_KERNEL_BLOCK diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 696f7afc9..1791a624a 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -85,3 +85,6 @@ config ADK_KERNEL_NFS_COMMON config ADK_KERNEL_SUNRPC boolean + +config ADK_KERNEL_PCI + boolean diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 2f9b87200..b615156f9 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -22,6 +22,16 @@ config ADK_KERNEL_NETDEV_1000 config ADK_KERNEL_VIA_RHINE_MMIO boolean +config ADK_KERNEL_SMC91X + boolean + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_MII + default y if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE + default n + help + config ADK_KERNEL_CPMAC boolean select ADK_KERNEL_NETDEVICES diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index 3451046de..adc25312d 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -1,8 +1,15 @@ config ADK_KERNEL_SERIAL_PXA boolean - default y if ADK_TARGET_SYSTEM_QEMU_ARM + default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ config ADK_KERNEL_SERIAL_PXA_CONSOLE boolean - default y if ADK_TARGET_SYSTEM_QEMU_ARM + default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ +config ADK_KERNEL_SERIAL_AMBA_PL011 + boolean + default y if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE + +config ADK_KERNEL_SERIAL_AMBA_PL011_CONSOLE + boolean + default y if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems index 24baa864e..3e64caddc 100644 --- a/target/linux/config/Config.in.systems +++ b/target/linux/config/Config.in.systems @@ -35,6 +35,9 @@ config ADK_KERNEL_LEMOTE_MACH2F boolean # arm systems +config ADK_KERNEL_ARCH_VERSATILE + boolean + config ADK_KERNEL_ARCH_PXA boolean |