Permalink
Browse files

remove useless details from FREETZ_TYPE_*

 * faster find a device
 * intuitive sorting


git-svn-id: file:///var/svn/freetz/trunk@9800 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
1 parent 227d7ef commit e62e89a27c78d6e490d2c726eb6ed53f7ec5b419 cuma committed Dec 31, 2012
View
Oops, something went wrong.
View
Oops, something went wrong.
View
@@ -1020,7 +1020,7 @@ if [ "$DO_MOD" -gt 0 ]; then
NM=$NM ${TOOLS_DIR}/depmod.pl $errsyms -b "$MODULES_DIR" \
-F ${KERNEL_REP_DIR}/System-${FREETZ_KERNEL_LAYOUT}-${FREETZ_KERNEL_REF}-${FREETZ_AVM_VERSION_STRING}.map
# add plugin kernel modules for 7270 if plugins are not enabled
- if [ "$FREETZ_TYPE_FON_WLAN_7270_V1" == "y" -a ! "$FREETZ_AVMPLUGINS_ENABLED" == "y" ]; then
+ if [ "$FREETZ_TYPE_7270_V1" == "y" -a ! "$FREETZ_AVMPLUGINS_ENABLED" == "y" ]; then
echo -e "kernel/drivers/net/rfcntl/rfcntl.ko: kernel/drivers/char/audio/avm_audio.ko\nkernel/drivers/char/audio/avm_audio.ko:\n" >> $MODULES_DIR/modules.dep
fi
fi
@@ -13,30 +13,30 @@ config FREETZ_KERNEL_VERSION_2_6_13
config FREETZ_KERNEL_VERSION_2_6_19
bool
default y if \
- FREETZ_TYPE_FON_WLAN_7270_V1 || \
- FREETZ_TYPE_FON_WLAN_7570
+ FREETZ_TYPE_7270_V1 || \
+ FREETZ_TYPE_7570
default n
config FREETZ_KERNEL_VERSION_2_6_28
bool
default y if \
- FREETZ_TYPE_FON_WLAN_7340 || \
- FREETZ_TYPE_FON_WLAN_7390
+ FREETZ_TYPE_7340 || \
+ FREETZ_TYPE_7390
default n
config FREETZ_KERNEL_VERSION_2_6_32
bool
default y if \
FREETZ_TYPE_6810 || \
FREETZ_TYPE_6840 || \
- FREETZ_TYPE_FON_WLAN_7240 || \
- FREETZ_TYPE_FON_WLAN_7270_16 || \
- FREETZ_TYPE_FON_WLAN_7312 || \
- FREETZ_TYPE_FON_WLAN_7320 || \
- FREETZ_TYPE_FON_WLAN_7330 || \
- FREETZ_TYPE_FON_WLAN_7360 || \
- FREETZ_TYPE_WLAN_3270 || \
- FREETZ_TYPE_WLAN_3370
+ FREETZ_TYPE_7240 || \
+ FREETZ_TYPE_7270_16 || \
+ FREETZ_TYPE_7312 || \
+ FREETZ_TYPE_7320 || \
+ FREETZ_TYPE_7330 || \
+ FREETZ_TYPE_7360 || \
+ FREETZ_TYPE_3270 || \
+ FREETZ_TYPE_3370
default n
config FREETZ_KERNEL_VERSION
@@ -103,60 +103,60 @@ config FREETZ_KERNEL_VERSION_2_6_32_MAX
config FREETZ_KERNEL_LAYOUT_AR7
bool
default y if \
- FREETZ_TYPE_300IP_AS_FON || \
+ FREETZ_TYPE_300IP || \
FREETZ_TYPE_FON || \
- FREETZ_TYPE_FON_5010 || \
- FREETZ_TYPE_FON_5050 || \
- FREETZ_TYPE_FON_WLAN || \
- FREETZ_TYPE_FON_WLAN_7050 || \
- FREETZ_TYPE_WLAN_3020 || \
- FREETZ_TYPE_WLAN_3030
+ FREETZ_TYPE_5010 || \
+ FREETZ_TYPE_5050 || \
+ FREETZ_TYPE_WLAN || \
+ FREETZ_TYPE_7050 || \
+ FREETZ_TYPE_3020 || \
+ FREETZ_TYPE_3030
config FREETZ_KERNEL_LAYOUT_AR9
bool
default y if \
- FREETZ_TYPE_FON_WLAN_7312 || \
- FREETZ_TYPE_FON_WLAN_7320 || \
- FREETZ_TYPE_FON_WLAN_7330
+ FREETZ_TYPE_7312 || \
+ FREETZ_TYPE_7320 || \
+ FREETZ_TYPE_7330
config FREETZ_KERNEL_LAYOUT_IKS
bool
default y if \
- FREETZ_TYPE_FON_WLAN_7340 || \
- FREETZ_TYPE_FON_WLAN_7390
+ FREETZ_TYPE_7340 || \
+ FREETZ_TYPE_7390
config FREETZ_KERNEL_LAYOUT_OHIO
bool
default y if \
FREETZ_TYPE_2170 || \
- FREETZ_TYPE_FON_5124 || \
- FREETZ_TYPE_FON_5140 || \
- FREETZ_TYPE_FON_WLAN_7112 || \
- FREETZ_TYPE_FON_WLAN_7113 || \
- FREETZ_TYPE_FON_WLAN_7140 || \
- FREETZ_TYPE_FON_WLAN_7141 || \
- FREETZ_TYPE_FON_7150 || \
- FREETZ_TYPE_FON_WLAN_7170 || \
- FREETZ_TYPE_WLAN_3130 || \
- FREETZ_TYPE_WLAN_3131 || \
- FREETZ_TYPE_WLAN_3170 || \
- FREETZ_TYPE_SPEEDPORT_W501V
+ FREETZ_TYPE_5124 || \
+ FREETZ_TYPE_5140 || \
+ FREETZ_TYPE_7112 || \
+ FREETZ_TYPE_7113 || \
+ FREETZ_TYPE_7140 || \
+ FREETZ_TYPE_7141 || \
+ FREETZ_TYPE_7150 || \
+ FREETZ_TYPE_7170 || \
+ FREETZ_TYPE_3130 || \
+ FREETZ_TYPE_3131 || \
+ FREETZ_TYPE_3170 || \
+ FREETZ_TYPE_W501V
config FREETZ_KERNEL_LAYOUT_UR8
bool
default y if \
- FREETZ_TYPE_FON_WLAN_7240 || \
- FREETZ_TYPE_FON_WLAN_7270 || \
- FREETZ_TYPE_FON_WLAN_7570 || \
- FREETZ_TYPE_WLAN_3270
+ FREETZ_TYPE_7240 || \
+ FREETZ_TYPE_7270 || \
+ FREETZ_TYPE_7570 || \
+ FREETZ_TYPE_3270
config FREETZ_KERNEL_LAYOUT_VR9
bool
default y if \
FREETZ_TYPE_6810 || \
FREETZ_TYPE_6840 || \
- FREETZ_TYPE_FON_WLAN_7360 || \
- FREETZ_TYPE_WLAN_3370
+ FREETZ_TYPE_7360 || \
+ FREETZ_TYPE_3370
config FREETZ_KERNEL_LAYOUT
string
@@ -57,22 +57,22 @@ config FREETZ_MODULE_crypto_algapi
bool "crypto_algapi.ko"
depends on \
FREETZ_KERNEL_VERSION_2_6_19_MIN && \
- !FREETZ_TYPE_FON_WLAN_7390
+ !FREETZ_TYPE_7390
default n
config FREETZ_MODULE_crypto_blkcipher
bool "crypto_blkcipher.ko"
depends on \
FREETZ_KERNEL_VERSION_2_6_28_MIN && \
- !FREETZ_TYPE_FON_WLAN_7390
+ !FREETZ_TYPE_7390
default n
config FREETZ_MODULE_crypto_hash
bool "crypto_hash.ko"
depends on \
FREETZ_KERNEL_VERSION_2_6_28_MIN && \
- !FREETZ_TYPE_FON_WLAN_7390
- select FREETZ_MODULE_crypto_algapi if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_FON_WLAN_7390
+ !FREETZ_TYPE_7390
+ select FREETZ_MODULE_crypto_algapi if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_7390
default n
config FREETZ_MODULE_aes
@@ -82,7 +82,7 @@ config FREETZ_MODULE_aes
config FREETZ_MODULE_arc4
bool "arc4.ko"
- select FREETZ_MODULE_crypto_algapi if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_FON_WLAN_7390
+ select FREETZ_MODULE_crypto_algapi if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_7390
default n
config FREETZ_MODULE_blkcipher
@@ -94,18 +94,18 @@ config FREETZ_MODULE_cbc
bool "cbc.ko"
depends on \
FREETZ_KERNEL_VERSION_2_6_19_MIN && \
- !FREETZ_TYPE_FON_WLAN_7390
- select FREETZ_MODULE_crypto_algapi if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_FON_WLAN_7390
+ !FREETZ_TYPE_7390
+ select FREETZ_MODULE_crypto_algapi if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_7390
select FREETZ_MODULE_blkcipher if FREETZ_KERNEL_VERSION_2_6_19
- select FREETZ_MODULE_crypto_blkcipher if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_FON_WLAN_7390
+ select FREETZ_MODULE_crypto_blkcipher if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_7390
default n
config FREETZ_MODULE_cryptomgr
bool "cryptomgr.ko"
depends on \
FREETZ_KERNEL_VERSION_2_6_19_MIN && \
- ! FREETZ_TYPE_FON_WLAN_7390
- select FREETZ_MODULE_crypto_algapi if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_FON_WLAN_7390
+ ! FREETZ_TYPE_7390
+ select FREETZ_MODULE_crypto_algapi if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_7390
default n
config FREETZ_MODULE_sha1
@@ -120,15 +120,15 @@ config FREETZ_MODULE_sha256
config FREETZ_MODULE_sha1_generic
bool "sha1_generic.ko"
- depends on FREETZ_KERNEL_VERSION_2_6_28_MIN && ! FREETZ_TYPE_FON_WLAN_7390
+ depends on FREETZ_KERNEL_VERSION_2_6_28_MIN && ! FREETZ_TYPE_7390
select FREETZ_MODULE_crypto_hash
- select FREETZ_MODULE_crypto_algapi if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_FON_WLAN_7390
+ select FREETZ_MODULE_crypto_algapi if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_7390
default n
config FREETZ_MODULE_sha256_generic
bool "sha256_generic.ko"
depends on FREETZ_KERNEL_VERSION_2_6_28_MIN
- select FREETZ_MODULE_crypto_algapi if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_FON_WLAN_7390
+ select FREETZ_MODULE_crypto_algapi if FREETZ_KERNEL_VERSION_2_6_28_MIN && !FREETZ_TYPE_7390
default n
endmenu
@@ -165,39 +165,39 @@ config FREETZ_MODULE_dummy
config FREETZ_MODULE_ppp_async
bool "ppp_async.ko"
- depends on ! FREETZ_TYPE_FON_WLAN_7390
+ depends on ! FREETZ_TYPE_7390
select FREETZ_MODULE_ppp_generic
select FREETZ_MODULE_crc_ccitt
default n
config FREETZ_MODULE_ppp_deflate
bool "ppp_deflate.ko"
- select FREETZ_MODULE_ppp_generic if ! FREETZ_TYPE_FON_WLAN_7390
+ select FREETZ_MODULE_ppp_generic if ! FREETZ_TYPE_7390
default n
config FREETZ_MODULE_ppp_generic
bool "ppp_generic.ko"
- depends on ! FREETZ_TYPE_FON_WLAN_7390
+ depends on ! FREETZ_TYPE_7390
select FREETZ_MODULE_slhc
default n
config FREETZ_MODULE_pppoe
bool "pppoe.ko"
- select FREETZ_MODULE_ppp_generic if ! FREETZ_TYPE_FON_WLAN_7390
+ select FREETZ_MODULE_ppp_generic if ! FREETZ_TYPE_7390
select FREETZ_MODULE_pppox
default n
config FREETZ_MODULE_pppox
bool "pppox.ko"
- select FREETZ_MODULE_ppp_generic if ! FREETZ_TYPE_FON_WLAN_7390
+ select FREETZ_MODULE_ppp_generic if ! FREETZ_TYPE_7390
default n
config FREETZ_MODULE_ppp_mppe_mppc
bool "ppp_mppe_mppc.ko"
- select FREETZ_MODULE_ppp_generic if ! FREETZ_TYPE_FON_WLAN_7390
+ select FREETZ_MODULE_ppp_generic if ! FREETZ_TYPE_7390
select FREETZ_MODULE_arc4
select FREETZ_MODULE_sha1 if FREETZ_KERNEL_VERSION_2_6_19_MAX
- select FREETZ_MODULE_sha1_generic if FREETZ_KERNEL_VERSION_2_6_28_MIN && ! FREETZ_TYPE_FON_WLAN_7390
+ select FREETZ_MODULE_sha1_generic if FREETZ_KERNEL_VERSION_2_6_28_MIN && ! FREETZ_TYPE_7390
default n
config FREETZ_MODULE_scsi_mod
@@ -222,7 +222,7 @@ config FREETZ_MODULE_sr_mod
config FREETZ_MODULE_slhc
bool "slhc.ko"
- depends on ! FREETZ_TYPE_FON_WLAN_7390
+ depends on ! FREETZ_TYPE_7390
default n
config FREETZ_MODULE_musb_hdrc
@@ -23,8 +23,8 @@ config FREETZ_PACKAGE_IPTABLES
config FREETZ_PACKAGE_IPTABLES_IS_SELECTABLE
bool "Is Iptables selectable for your custom configuration?" if FREETZ_TYPE_CUSTOM
default y if \
- !FREETZ_TYPE_SPEEDPORT_W501V && \
- !FREETZ_TYPE_FON_5140
+ !FREETZ_TYPE_W501V && \
+ !FREETZ_TYPE_5140
default n
help
Select this if you are sure that Iptables should work on your box
View
@@ -3,9 +3,9 @@ config FREETZ_PACKAGE_MDEV
depends on \
! FREETZ_HAS_AVM_UDEV && \
( \
- FREETZ_TYPE_FON_WLAN_7170 || \
- FREETZ_TYPE_FON_WLAN_7240 || \
- FREETZ_TYPE_FON_WLAN_7270 \
+ FREETZ_TYPE_7170 || \
+ FREETZ_TYPE_7240 || \
+ FREETZ_TYPE_7270 \
)
select FREETZ_PACKAGE_E2FSPROGS
select FREETZ_PACKAGE_E2FSPROGS_E2FSCK
@@ -8,7 +8,7 @@ config FREETZ_PACKAGE_NFS_UTILS
select FREETZ_OPTIONS_ETCSERVICES
select FREETZ_PACKAGE_TCP_WRAPPERS
select FREETZ_REPLACE_KERNEL if \
- FREETZ_TYPE_FON_WLAN_7270_V1
+ FREETZ_TYPE_7270_V1
select FREETZ_MODULE_nfsd if \
FREETZ_KERNEL_VERSION_2_6_13 || \
FREETZ_KERNEL_VERSION_2_6_28_MIN
View
@@ -5,9 +5,9 @@ config FREETZ_PACKAGE_PPPD
bool "pppd 2.4.5"
select FREETZ_LIB_libcrypt
select FREETZ_LIB_libdl
- select FREETZ_MODULE_ppp_async if ! FREETZ_TYPE_FON_WLAN_7390
+ select FREETZ_MODULE_ppp_async if ! FREETZ_TYPE_7390
select FREETZ_MODULE_ppp_deflate
- select FREETZ_MODULE_ppp_generic if ! FREETZ_TYPE_FON_WLAN_7390
+ select FREETZ_MODULE_ppp_generic if ! FREETZ_TYPE_7390
select FREETZ_MODULE_ppp_mppe_mppc
default n
help
Oops, something went wrong.

0 comments on commit e62e89a

Please sign in to comment.