diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-05-27 17:19:33 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-05-27 17:19:33 +0200 |
commit | 9a841e2aed7b7e52958e5703215643dd3cf45ad0 (patch) | |
tree | 58b5a13611e2450d6f88eae256b43e3d6cbd5356 /target/Config.in | |
parent | c12b595892e3231182239998f6561bd6556a9947 (diff) | |
parent | 23eff1d5d3d4f22fc3d2fe9de026e3df3edf426d (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/Config.in')
-rw-r--r-- | target/Config.in | 85 |
1 files changed, 39 insertions, 46 deletions
diff --git a/target/Config.in b/target/Config.in index 488c8230d..c5927e1a7 100644 --- a/target/Config.in +++ b/target/Config.in @@ -116,10 +116,7 @@ config ADK_x86_64_qemu config ADK_rb532 tristate -config ADK_rb411 - tristate - -config ADK_rb433 +config ADK_rb4xx tristate config ADK_zaurus @@ -182,8 +179,7 @@ config ADK_TARGET default "foxg20" if ADK_foxg20 default "native" if ADK_NATIVE default "rb532" if ADK_rb532 - default "rb411" if ADK_rb411 - default "rb433" if ADK_rb433 + default "rb4xx" if ADK_rb4xx default "zaurus" if ADK_arm default "lemote" if ADK_lemote default "ibmx40" if ADK_ibmx40 @@ -238,6 +234,7 @@ config ADK_LINUX_ARM_FOXG20 select ADK_EABI select ADK_KERNEL_NLS select ADK_KERNEL_EXT2_FS + select ADK_KERNEL_USB select ADK_KPACKAGE_KMOD_VFAT_FS select ADK_PACKAGE_KMOD_USB_CONTROLLER select ADK_KERNEL_NETDEVICES @@ -254,6 +251,7 @@ config ADK_LINUX_CRIS_FOXBOARD bool "Foxboard (ETRAX LX100)" select ADK_foxboard select ADK_PACKAGE_KMOD_USB_CONTROLLER + select ADK_KERNEL_USB select ADK_KERNEL_NLS select ADK_TARGET_WITH_USB help @@ -362,6 +360,7 @@ config ADK_LINUX_X86_IBMX40 select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_CARDBUS select ADK_KERNEL_INPUT_KEYBOARD select ADK_KERNEL_SCSI select ADK_KERNEL_NETDEVICES @@ -589,6 +588,7 @@ config ADK_LINUX_X86_QEMU config ADK_LINUX_X86_64_QEMU bool "x86_64" select ADK_x86_64_qemu + select ADK_LINUX_64 select ADK_KERNEL_NETDEV_1000 select ADK_KPACKAGE_KMOD_E1000 select ADK_KERNEL_INPUT_KEYBOARD @@ -696,35 +696,30 @@ prompt "Routerboard model" default ADK_LINUX_MIPS_RB532 depends on ADK_LINUX_MIKROTIK -config ADK_LINUX_MIPS_RB411 - bool "Mikrotik Routerboard 411" - select ADK_rb411 - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_PCI - select ADK_KERNEL_NETDEV_1000 - select ADK_KERNEL_NET_ETHERNET - select ADK_TARGET_WITH_MINIPCI - depends on ADK_BROKEN - help - Support for Mikrotik RB411. - Status: development - -config ADK_LINUX_MIPS_RB433 - bool "Mikrotik Routerboard 433" - select ADK_rb433 +config ADK_LINUX_MIPS_RB4XX + bool "Mikrotik Routerboard 411/433" + select ADK_rb4xx + select ADK_KERNEL_MISC_FILESYSTEMS + select ADK_KERNEL_YAFFS_FS + select ADK_KERNEL_YAFFS_YAFFS2 + select ADK_KERNEL_YAFFS_AUTO_YAFFS2 select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_PCI select ADK_KERNEL_NETDEV_1000 select ADK_KERNEL_NET_ETHERNET select ADK_TARGET_WITH_MINIPCI - depends on ADK_BROKEN + select ADK_TARGET_WITH_WATCHDOG help - Support for Mikrotik RB433. - Status: development + Support for Mikrotik RB411/RB433. + Status: stable config ADK_LINUX_MIPS_RB532 bool "Mikrotik Routerboard 532" select ADK_rb532 + select ADK_KERNEL_MISC_FILESYSTEMS + select ADK_KERNEL_YAFFS_FS + select ADK_KERNEL_YAFFS_YAFFS2 + select ADK_KERNEL_YAFFS_AUTO_YAFFS2 select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_PCI select ADK_KERNEL_NET_ETHERNET @@ -782,8 +777,7 @@ config ADK_TARGET_LIB_EGLIBC ADK_LINUX_X86_ALIX2D || \ ADK_LINUX_X86_ALIX2D13 || \ ADK_LINUX_X86_WRAP || \ - ADK_LINUX_MIPS_RB411 || \ - ADK_LINUX_MIPS_RB433 || \ + ADK_LINUX_MIPS_RB4XX || \ ADK_LINUX_MIPS_RB532 || \ ADK_LINUX_X86_64_SHUTTLE || \ ADK_LINUX_MIPS64_LEMOTE || \ @@ -802,6 +796,7 @@ config ADK_TARGET_LIB_GLIBC ADK_LINUX_X86_ALIX2D13 || \ ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB532 || \ + ADK_LINUX_MIPS_RB4XX || \ ADK_LINUX_X86_64_SHUTTLE || \ ADK_LINUX_RESCUE || \ ADK_LINUX_MIPS64_LEMOTE || \ @@ -865,8 +860,7 @@ config ADK_TARGET_ROOTFS_YAFFS select ADK_KERNEL_YAFFS_YAFFS2 depends on \ ADK_LINUX_MIPS_RB532 || \ - ADK_LINUX_MIPS_RB433 || \ - ADK_LINUX_MIPS_RB411 + ADK_LINUX_MIPS_RB4XX help Root filesystem on NAND. @@ -880,8 +874,7 @@ config ADK_TARGET_ROOTFS_NFSROOT ADK_LINUX_X86_ALIX2D13 || \ ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB532 || \ - ADK_LINUX_MIPS_RB433 || \ - ADK_LINUX_MIPS_RB411 || \ + ADK_LINUX_MIPS_RB4XX || \ ADK_LINUX_MIPS_WAG54G || \ ADK_LINUX_MIPS_AG241 || \ ADK_LINUX_MIPS64_LEMOTE @@ -977,6 +970,14 @@ choice prompt "Compression method for initramfs and kernel" depends on ADK_TARGET_ROOTFS_INITRAMFS || ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK +config ADK_TARGET_INITRAMFS_COMPRESSION_LZMA + boolean + prompt "lzma" + select ADK_KERNEL_RD_LZMA + select ADK_KERNEL_KERNEL_LZMA + help + Select LZMA compression. + config ADK_TARGET_INITRAMFS_COMPRESSION_GZIP boolean prompt "gzip" @@ -993,14 +994,6 @@ config ADK_TARGET_INITRAMFS_COMPRESSION_BZIP2 help Select BZIP2 compression. -config ADK_TARGET_INITRAMFS_COMPRESSION_LZMA - boolean - prompt "lzma" - select ADK_KERNEL_RD_LZMA - select ADK_KERNEL_KERNEL_LZMA - help - Select LZMA compression. - config ADK_TARGET_INITRAMFS_COMPRESSION_LZO boolean prompt "lzo" @@ -1015,6 +1008,13 @@ choice prompt "Compression method for Kernel" depends on !(ADK_TARGET_ROOTFS_INITRAMFS || ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK || ADK_TOOLCHAIN_ONLY) +config ADK_TARGET_KERNEL_COMPRESSION_LZMA + boolean + prompt "lzma" + select ADK_KERNEL_KERNEL_LZMA + help + Select LZMA compression for Kernel. + config ADK_TARGET_KERNEL_COMPRESSION_GZIP boolean prompt "gzip" @@ -1029,13 +1029,6 @@ config ADK_TARGET_KERNEL_COMPRESSION_BZIP2 help Select BZIP2 compression for Kernel. -config ADK_TARGET_KERNEL_COMPRESSION_LZMA - boolean - prompt "lzma" - select ADK_KERNEL_KERNEL_LZMA - help - Select LZMA compression for Kernel. - config ADK_TARGET_KERNEL_COMPRESSION_LZO boolean prompt "lzo" |