Changeset 11979


Ignorieren:
Zeitstempel:
02.05.2014 14:37:08 (vor 4 Jahren)
Autor:
er13
Nachricht:
  • implement FREETZ_AVM_VERSION_FOR_KERNEL_LAYOUT_VR9 (follow-up of r11975)
  • refs #2418
Datei:
1 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/config/gui/firmware.in

    r11978 r11979  
    7272 
    7373    config FREETZ_TYPE_3370 
    74         select FREETZ_AVM_VERSION_3370_05_21 if FREETZ_AVM_VERSION_05_2X 
    75         select FREETZ_AVM_VERSION_7360_05_51 if FREETZ_AVM_VERSION_05_5X 
    76         select FREETZ_AVM_VERSION_7490_06_01 if FREETZ_AVM_VERSION_06_XX 
     74        select FREETZ_AVM_VERSION_FOR_KERNEL_LAYOUT_VR9 
    7775        bool "3370" 
    7876 
    7977    config FREETZ_TYPE_3390 
    80         select FREETZ_AVM_VERSION_3370_05_21 if FREETZ_AVM_VERSION_05_2X 
    81         select FREETZ_AVM_VERSION_7360_05_51 if FREETZ_AVM_VERSION_05_5X 
    82         select FREETZ_AVM_VERSION_7490_06_01 if FREETZ_AVM_VERSION_06_XX 
     78        select FREETZ_AVM_VERSION_FOR_KERNEL_LAYOUT_VR9 
    8379        bool "3390" 
    8480 
     
    106102 
    107103    config FREETZ_TYPE_6810 
    108         select FREETZ_AVM_VERSION_3370_05_21 if FREETZ_AVM_VERSION_05_2X 
    109         select FREETZ_AVM_VERSION_7360_05_51 if FREETZ_AVM_VERSION_05_5X 
    110         select FREETZ_AVM_VERSION_7490_06_01 if FREETZ_AVM_VERSION_06_XX 
     104        depends on FREETZ_REAL_DEVELOPER_ONLY 
     105        select FREETZ_AVM_VERSION_FOR_KERNEL_LAYOUT_VR9 
    111106        bool "6810 - EXPERIMENTAL" 
     107 
     108    config FREETZ_TYPE_6840 
     109        select FREETZ_AVM_VERSION_FOR_KERNEL_LAYOUT_VR9 
     110        bool "6840" 
     111 
     112    config FREETZ_TYPE_6842 
    112113        depends on FREETZ_REAL_DEVELOPER_ONLY 
    113  
    114     config FREETZ_TYPE_6840 
    115         select FREETZ_AVM_VERSION_3370_05_21 if FREETZ_AVM_VERSION_05_2X 
    116         select FREETZ_AVM_VERSION_7360_05_51 if FREETZ_AVM_VERSION_05_5X 
    117         select FREETZ_AVM_VERSION_7490_06_01 if FREETZ_AVM_VERSION_06_XX 
    118         bool "6840" 
    119  
    120     config FREETZ_TYPE_6842 
    121         select FREETZ_AVM_VERSION_3370_05_21 if FREETZ_AVM_VERSION_05_2X 
    122         select FREETZ_AVM_VERSION_7360_05_51 if FREETZ_AVM_VERSION_05_5X 
    123         select FREETZ_AVM_VERSION_7490_06_01 if FREETZ_AVM_VERSION_06_XX 
     114        select FREETZ_AVM_VERSION_FOR_KERNEL_LAYOUT_VR9 
    124115        bool "6842 - EXPERIMENTAL" 
    125         depends on FREETZ_REAL_DEVELOPER_ONLY 
    126116 
    127117 
     
    212202        bool "7360 v1" 
    213203        select FREETZ_TYPE_7360 
     204        select FREETZ_AVM_VERSION_FOR_KERNEL_LAYOUT_VR9 
    214205 
    215206    config FREETZ_TYPE_7360_V2 
    216207        bool "7360 v2" 
    217208        select FREETZ_TYPE_7360 
     209        select FREETZ_AVM_VERSION_FOR_KERNEL_LAYOUT_VR9 
    218210 
    219211    config FREETZ_TYPE_7360_SL 
    220212        bool "7360 SL" 
    221213        select FREETZ_TYPE_7360 
     214        select FREETZ_AVM_VERSION_FOR_KERNEL_LAYOUT_VR9 
    222215 
    223216    config FREETZ_TYPE_7362 
    224         select FREETZ_AVM_VERSION_7360_05_51 if FREETZ_AVM_VERSION_05_5X 
    225         select FREETZ_AVM_VERSION_7490_06_01 if FREETZ_AVM_VERSION_06_XX 
     217        select FREETZ_AVM_VERSION_FOR_KERNEL_LAYOUT_VR9 
    226218        bool "7362 SL" 
    227219 
     
    231223 
    232224    config FREETZ_TYPE_7490 
    233         select FREETZ_AVM_VERSION_7490_05_59 if FREETZ_AVM_VERSION_05_5X 
    234         select FREETZ_AVM_VERSION_7490_06_05 if FREETZ_AVM_VERSION_06_XX 
     225        select FREETZ_AVM_VERSION_FOR_KERNEL_LAYOUT_VR9 
    235226        bool "7490" 
    236227 
     
    568559#alias for (7360v1 or 7360v2 or 7360 SL) 
    569560config FREETZ_TYPE_7360 
    570     select FREETZ_AVM_VERSION_7360_05_20 if FREETZ_AVM_VERSION_05_2X 
    571     select FREETZ_AVM_VERSION_7360_05_51 if FREETZ_AVM_VERSION_05_5X 
    572     select FREETZ_AVM_VERSION_7490_06_01 if FREETZ_AVM_VERSION_06_XX 
    573561    bool 
    574562 
     
    623611    bool 
    624612 
    625 # TODO: config FREETZ_AVM_VERSION_FOR_KERNEL_LAYOUT_VR9 
     613config FREETZ_AVM_VERSION_FOR_KERNEL_LAYOUT_VR9 
     614    depends on FREETZ_KERNEL_LAYOUT_VR9 
     615    # 05.2X 
     616    select FREETZ_AVM_VERSION_3370_05_21 if FREETZ_AVM_VERSION_05_2X && !FREETZ_TYPE_7360 
     617    select FREETZ_AVM_VERSION_7360_05_20 if FREETZ_AVM_VERSION_05_2X &&  FREETZ_TYPE_7360 
     618    # 05.5X 
     619    select FREETZ_AVM_VERSION_7360_05_51 if FREETZ_AVM_VERSION_05_5X && !FREETZ_TYPE_7490 
     620    select FREETZ_AVM_VERSION_7490_05_59 if FREETZ_AVM_VERSION_05_5X &&  FREETZ_TYPE_7490 
     621    # 06.XX 
     622    select FREETZ_AVM_VERSION_7490_06_01 if FREETZ_AVM_VERSION_06_XX && !FREETZ_TYPE_7490 
     623    select FREETZ_AVM_VERSION_7490_06_05 if FREETZ_AVM_VERSION_06_XX &&  FREETZ_TYPE_7490 
     624    bool 
    626625 
    627626 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.