diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-02 19:50:47 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-02 19:50:47 +0200 |
| commit | 6f96b57ffa30d8e1bf6af9d1e9fae1902cb419e1 (patch) | |
| tree | 4ae705ebc844f4fc08e34e92af689cdb76475423 /target/linux | |
| parent | b7bbd7b3cf2d9f774464953fd2c42be9cabe790c (diff) | |
| parent | 64d1148c48e3cd428da42a5eb9bcda50f08171fb (diff) | |
resolve conflict
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/Config.in | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.serial | 8 | ||||
| -rw-r--r-- | target/linux/config/Config.in.spi | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.systems | 9 |
4 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/Config.in b/target/linux/Config.in index 7b52a3003..1b78cecb5 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -20,6 +20,7 @@ source target/linux/config/Config.in.misc source target/linux/config/Config.in.mips source target/linux/config/Config.in.lib source target/linux/config/Config.in.pm +source target/linux/config/Config.in.serial source target/linux/config/Config.in.spi source target/linux/config/Config.in.kvm source target/linux/config/Config.in.debug diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial new file mode 100644 index 000000000..3451046de --- /dev/null +++ b/target/linux/config/Config.in.serial @@ -0,0 +1,8 @@ +config ADK_KERNEL_SERIAL_PXA + boolean + default y if ADK_TARGET_SYSTEM_QEMU_ARM + +config ADK_KERNEL_SERIAL_PXA_CONSOLE + boolean + default y if ADK_TARGET_SYSTEM_QEMU_ARM + diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi index a141f8231..73db5e86d 100644 --- a/target/linux/config/Config.in.spi +++ b/target/linux/config/Config.in.spi @@ -12,3 +12,7 @@ config ADK_KERNEL_SPI_RB4XX config ADK_KERNEL_SPI_RB4XX_CPLD select ADK_KERNEL_SPI boolean + +config ADK_KERNEL_SPI_PXA2XX + select ADK_KERNEL_SPI + boolean diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems index 5c420eb2b..24baa864e 100644 --- a/target/linux/config/Config.in.systems +++ b/target/linux/config/Config.in.systems @@ -35,6 +35,15 @@ config ADK_KERNEL_LEMOTE_MACH2F boolean # arm systems +config ADK_KERNEL_ARCH_PXA + boolean + +config ADK_KERNEL_PXA_SHARPSL + boolean + +config ADK_KERNEL_MACH_SPITZ + boolean + config ADK_KERNEL_ARCH_AT91 boolean |