Changeset 29337


Ignore:
Timestamp:
2011-11-25T21:47:44+01:00 (6 years ago)
Author:
nico
Message:

targets: fix CONFIG_USB_STORAGE_* inconsistency

  • all options were switched from bool to tristate in 2.6.30
  • add/change/move them to generic, disabled by default
  • remove extinct CONFIG_USB_STORAGE_DPCM dropped in 2.6.29, merged with CONFIG_USB_STORAGE_SDDR09
  • remove extinct CONFIG_USB_STORAGE_SIERRA option in 2.6
  • cleanup ordering
Location:
trunk/target/linux
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/at91/flexibity/config-2.6.39

    r27412 r29337  
    691691CONFIG_USB_SL811_HCD=m 
    692692CONFIG_USB_STORAGE=y 
    693 CONFIG_USB_STORAGE_ALAUDA=m 
    694 CONFIG_USB_STORAGE_CYPRESS_ATACB=m 
    695 CONFIG_USB_STORAGE_DATAFAB=m 
    696693CONFIG_USB_STORAGE_DEBUG=y 
    697 CONFIG_USB_STORAGE_FREECOM=m 
    698 CONFIG_USB_STORAGE_ISD200=m 
    699 CONFIG_USB_STORAGE_JUMPSHOT=m 
    700 CONFIG_USB_STORAGE_KARMA=m 
    701 CONFIG_USB_STORAGE_ONETOUCH=m 
    702 CONFIG_USB_STORAGE_SDDR09=m 
    703 CONFIG_USB_STORAGE_SDDR55=m 
    704 CONFIG_USB_STORAGE_USBAT=m 
    705694CONFIG_USB_TMC=m 
    706695CONFIG_USB_TRANCEVIBRATOR=m 
  • trunk/target/linux/generic/config-2.6.30

    r28848 r29337  
    25202520# CONFIG_USB_STKWEBCAM is not set 
    25212521# CONFIG_USB_STORAGE is not set 
     2522# CONFIG_USB_STORAGE_ALAUDA is not set 
     2523# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 
     2524# CONFIG_USB_STORAGE_DATAFAB is not set 
    25222525# CONFIG_USB_STORAGE_DEBUG is not set 
    2523 CONFIG_USB_STORAGE_DPCM=y 
     2526# CONFIG_USB_STORAGE_FREECOM is not set 
     2527# CONFIG_USB_STORAGE_ISD200 is not set 
     2528# CONFIG_USB_STORAGE_JUMPSHOT is not set 
     2529# CONFIG_USB_STORAGE_KARMA is not set 
    25242530# CONFIG_USB_STORAGE_ONETOUCH is not set 
    2525 # CONFIG_USB_STORAGE_SIERRA is not set 
     2531# CONFIG_USB_STORAGE_SDDR09 is not set 
     2532# CONFIG_USB_STORAGE_SDDR55 is not set 
     2533# CONFIG_USB_STORAGE_USBAT is not set 
    25262534# CONFIG_USB_STV06XX is not set 
    25272535# CONFIG_USB_STV680 is not set 
  • trunk/target/linux/generic/config-2.6.31

    r28848 r29337  
    25382538# CONFIG_USB_STKWEBCAM is not set 
    25392539# CONFIG_USB_STORAGE is not set 
     2540# CONFIG_USB_STORAGE_ALAUDA is not set 
     2541# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 
     2542# CONFIG_USB_STORAGE_DATAFAB is not set 
    25402543# CONFIG_USB_STORAGE_DEBUG is not set 
    2541 CONFIG_USB_STORAGE_DPCM=y 
     2544# CONFIG_USB_STORAGE_FREECOM is not set 
     2545# CONFIG_USB_STORAGE_ISD200 is not set 
     2546# CONFIG_USB_STORAGE_JUMPSHOT is not set 
     2547# CONFIG_USB_STORAGE_KARMA is not set 
    25422548# CONFIG_USB_STORAGE_ONETOUCH is not set 
    2543 # CONFIG_USB_STORAGE_SIERRA is not set 
     2549# CONFIG_USB_STORAGE_SDDR09 is not set 
     2550# CONFIG_USB_STORAGE_SDDR55 is not set 
     2551# CONFIG_USB_STORAGE_USBAT is not set 
    25442552# CONFIG_USB_STV06XX is not set 
    25452553# CONFIG_USB_STV680 is not set 
  • trunk/target/linux/generic/config-2.6.32

    r28848 r29337  
    26592659# CONFIG_USB_STKWEBCAM is not set 
    26602660# CONFIG_USB_STORAGE is not set 
     2661# CONFIG_USB_STORAGE_ALAUDA is not set 
     2662# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 
     2663# CONFIG_USB_STORAGE_DATAFAB is not set 
    26612664# CONFIG_USB_STORAGE_DEBUG is not set 
    2662 CONFIG_USB_STORAGE_DPCM=y 
     2665# CONFIG_USB_STORAGE_FREECOM is not set 
     2666# CONFIG_USB_STORAGE_ISD200 is not set 
     2667# CONFIG_USB_STORAGE_JUMPSHOT is not set 
     2668# CONFIG_USB_STORAGE_KARMA is not set 
    26632669# CONFIG_USB_STORAGE_ONETOUCH is not set 
    2664 # CONFIG_USB_STORAGE_SIERRA is not set 
     2670# CONFIG_USB_STORAGE_SDDR09 is not set 
     2671# CONFIG_USB_STORAGE_SDDR55 is not set 
     2672# CONFIG_USB_STORAGE_USBAT is not set 
    26652673# CONFIG_USB_STV06XX is not set 
    26662674# CONFIG_USB_STV680 is not set 
  • trunk/target/linux/generic/config-2.6.36

    r28848 r29337  
    27372737# CONFIG_USB_STKWEBCAM is not set 
    27382738# CONFIG_USB_STORAGE is not set 
    2739 CONFIG_USB_STORAGE_ALAUDA=y 
     2739# CONFIG_USB_STORAGE_ALAUDA is not set 
    27402740# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 
    2741 CONFIG_USB_STORAGE_DATAFAB=y 
     2741# CONFIG_USB_STORAGE_DATAFAB is not set 
    27422742# CONFIG_USB_STORAGE_DEBUG is not set 
    2743 CONFIG_USB_STORAGE_FREECOM=y 
     2743# CONFIG_USB_STORAGE_FREECOM is not set 
    27442744# CONFIG_USB_STORAGE_ISD200 is not set 
    2745 CONFIG_USB_STORAGE_JUMPSHOT=y 
    2746 CONFIG_USB_STORAGE_KARMA=y 
     2745# CONFIG_USB_STORAGE_JUMPSHOT is not set 
     2746# CONFIG_USB_STORAGE_KARMA is not set 
    27472747# CONFIG_USB_STORAGE_ONETOUCH is not set 
    2748 CONFIG_USB_STORAGE_SDDR09=y 
    2749 CONFIG_USB_STORAGE_SDDR55=y 
    2750 CONFIG_USB_STORAGE_USBAT=y 
     2748# CONFIG_USB_STORAGE_SDDR09 is not set 
     2749# CONFIG_USB_STORAGE_SDDR55 is not set 
     2750# CONFIG_USB_STORAGE_USBAT is not set 
    27512751# CONFIG_USB_STV06XX is not set 
    27522752# CONFIG_USB_SUPPORT is not set 
  • trunk/target/linux/generic/config-2.6.37

    r28848 r29337  
    27982798# CONFIG_USB_STKWEBCAM is not set 
    27992799# CONFIG_USB_STORAGE is not set 
    2800 CONFIG_USB_STORAGE_ALAUDA=y 
     2800# CONFIG_USB_STORAGE_ALAUDA is not set 
    28012801# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 
    2802 CONFIG_USB_STORAGE_DATAFAB=y 
     2802# CONFIG_USB_STORAGE_DATAFAB is not set 
    28032803# CONFIG_USB_STORAGE_DEBUG is not set 
    2804 CONFIG_USB_STORAGE_FREECOM=y 
     2804# CONFIG_USB_STORAGE_FREECOM is not set 
    28052805# CONFIG_USB_STORAGE_ISD200 is not set 
    2806 CONFIG_USB_STORAGE_JUMPSHOT=y 
    2807 CONFIG_USB_STORAGE_KARMA=y 
     2806# CONFIG_USB_STORAGE_JUMPSHOT is not set 
     2807# CONFIG_USB_STORAGE_KARMA is not set 
    28082808# CONFIG_USB_STORAGE_ONETOUCH is not set 
    2809 CONFIG_USB_STORAGE_SDDR09=y 
    2810 CONFIG_USB_STORAGE_SDDR55=y 
    2811 CONFIG_USB_STORAGE_USBAT=y 
     2809# CONFIG_USB_STORAGE_SDDR09 is not set 
     2810# CONFIG_USB_STORAGE_SDDR55 is not set 
     2811# CONFIG_USB_STORAGE_USBAT is not set 
    28122812# CONFIG_USB_STV06XX is not set 
    28132813# CONFIG_USB_SUPPORT is not set 
  • trunk/target/linux/generic/config-2.6.38

    r28848 r29337  
    28512851# CONFIG_USB_STKWEBCAM is not set 
    28522852# CONFIG_USB_STORAGE is not set 
    2853 CONFIG_USB_STORAGE_ALAUDA=y 
     2853# CONFIG_USB_STORAGE_ALAUDA is not set 
    28542854# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 
    2855 CONFIG_USB_STORAGE_DATAFAB=y 
     2855# CONFIG_USB_STORAGE_DATAFAB is not set 
    28562856# CONFIG_USB_STORAGE_DEBUG is not set 
    2857 CONFIG_USB_STORAGE_FREECOM=y 
     2857# CONFIG_USB_STORAGE_FREECOM is not set 
    28582858# CONFIG_USB_STORAGE_ISD200 is not set 
    2859 CONFIG_USB_STORAGE_JUMPSHOT=y 
    2860 CONFIG_USB_STORAGE_KARMA=y 
     2859# CONFIG_USB_STORAGE_JUMPSHOT is not set 
     2860# CONFIG_USB_STORAGE_KARMA is not set 
    28612861# CONFIG_USB_STORAGE_ONETOUCH is not set 
    2862 CONFIG_USB_STORAGE_SDDR09=y 
    2863 CONFIG_USB_STORAGE_SDDR55=y 
    2864 CONFIG_USB_STORAGE_USBAT=y 
     2862# CONFIG_USB_STORAGE_SDDR09 is not set 
     2863# CONFIG_USB_STORAGE_SDDR55 is not set 
     2864# CONFIG_USB_STORAGE_USBAT is not set 
    28652865# CONFIG_USB_STV06XX is not set 
    28662866# CONFIG_USB_SUPPORT is not set 
  • trunk/target/linux/generic/config-2.6.39

    r28848 r29337  
    29132913# CONFIG_USB_STKWEBCAM is not set 
    29142914# CONFIG_USB_STORAGE is not set 
    2915 CONFIG_USB_STORAGE_ALAUDA=y 
     2915# CONFIG_USB_STORAGE_ALAUDA is not set 
    29162916# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 
     2917# CONFIG_USB_STORAGE_DATAFAB is not set 
     2918# CONFIG_USB_STORAGE_DEBUG is not set 
    29172919# CONFIG_USB_STORAGE_ENE_UB6250 is not set 
    2918 CONFIG_USB_STORAGE_DATAFAB=y 
    2919 # CONFIG_USB_STORAGE_DEBUG is not set 
     2920# CONFIG_USB_STORAGE_FREECOM is not set 
     2921# CONFIG_USB_STORAGE_ISD200 is not set 
     2922# CONFIG_USB_STORAGE_JUMPSHOT is not set 
     2923# CONFIG_USB_STORAGE_KARMA is not set 
     2924# CONFIG_USB_STORAGE_ONETOUCH is not set 
    29202925# CONFIG_USB_STORAGE_REALTEK is not set 
    2921 CONFIG_USB_STORAGE_FREECOM=y 
    2922 # CONFIG_USB_STORAGE_ISD200 is not set 
    2923 CONFIG_USB_STORAGE_JUMPSHOT=y 
    2924 CONFIG_USB_STORAGE_KARMA=y 
    2925 # CONFIG_USB_STORAGE_ONETOUCH is not set 
    2926 CONFIG_USB_STORAGE_SDDR09=y 
    2927 CONFIG_USB_STORAGE_SDDR55=y 
    2928 CONFIG_USB_STORAGE_USBAT=y 
     2926# CONFIG_USB_STORAGE_SDDR09 is not set 
     2927# CONFIG_USB_STORAGE_SDDR55 is not set 
     2928# CONFIG_USB_STORAGE_USBAT is not set 
    29292929# CONFIG_USB_STV06XX is not set 
    29302930# CONFIG_USB_SUPPORT is not set 
  • trunk/target/linux/generic/config-3.0

    r28848 r29337  
    28952895# CONFIG_USB_STKWEBCAM is not set 
    28962896# CONFIG_USB_STORAGE is not set 
    2897 CONFIG_USB_STORAGE_ALAUDA=y 
     2897# CONFIG_USB_STORAGE_ALAUDA is not set 
    28982898# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 
     2899# CONFIG_USB_STORAGE_DATAFAB is not set 
     2900# CONFIG_USB_STORAGE_DEBUG is not set 
    28992901# CONFIG_USB_STORAGE_ENE_UB6250 is not set 
    2900 CONFIG_USB_STORAGE_DATAFAB=y 
    2901 # CONFIG_USB_STORAGE_DEBUG is not set 
     2902# CONFIG_USB_STORAGE_FREECOM is not set 
     2903# CONFIG_USB_STORAGE_ISD200 is not set 
     2904# CONFIG_USB_STORAGE_JUMPSHOT is not set 
     2905# CONFIG_USB_STORAGE_KARMA is not set 
     2906# CONFIG_USB_STORAGE_ONETOUCH is not set 
    29022907# CONFIG_USB_STORAGE_REALTEK is not set 
    2903 CONFIG_USB_STORAGE_FREECOM=y 
    2904 # CONFIG_USB_STORAGE_ISD200 is not set 
    2905 CONFIG_USB_STORAGE_JUMPSHOT=y 
    2906 CONFIG_USB_STORAGE_KARMA=y 
    2907 # CONFIG_USB_STORAGE_ONETOUCH is not set 
    2908 CONFIG_USB_STORAGE_SDDR09=y 
    2909 CONFIG_USB_STORAGE_SDDR55=y 
    2910 CONFIG_USB_STORAGE_USBAT=y 
     2908# CONFIG_USB_STORAGE_SDDR09 is not set 
     2909# CONFIG_USB_STORAGE_SDDR55 is not set 
     2910# CONFIG_USB_STORAGE_USBAT is not set 
    29112911# CONFIG_USB_STV06XX is not set 
    29122912# CONFIG_USB_SUPPORT is not set 
  • trunk/target/linux/generic/config-3.1

    r28848 r29337  
    29172917# CONFIG_USB_STKWEBCAM is not set 
    29182918# CONFIG_USB_STORAGE is not set 
    2919 CONFIG_USB_STORAGE_ALAUDA=y 
     2919# CONFIG_USB_STORAGE_ALAUDA is not set 
    29202920# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 
     2921# CONFIG_USB_STORAGE_DATAFAB is not set 
     2922# CONFIG_USB_STORAGE_DEBUG is not set 
    29212923# CONFIG_USB_STORAGE_ENE_UB6250 is not set 
    2922 CONFIG_USB_STORAGE_DATAFAB=y 
    2923 # CONFIG_USB_STORAGE_DEBUG is not set 
     2924# CONFIG_USB_STORAGE_FREECOM is not set 
     2925# CONFIG_USB_STORAGE_ISD200 is not set 
     2926# CONFIG_USB_STORAGE_JUMPSHOT is not set 
     2927# CONFIG_USB_STORAGE_KARMA is not set 
     2928# CONFIG_USB_STORAGE_ONETOUCH is not set 
    29242929# CONFIG_USB_STORAGE_REALTEK is not set 
    2925 CONFIG_USB_STORAGE_FREECOM=y 
    2926 # CONFIG_USB_STORAGE_ISD200 is not set 
    2927 CONFIG_USB_STORAGE_JUMPSHOT=y 
    2928 CONFIG_USB_STORAGE_KARMA=y 
    2929 # CONFIG_USB_STORAGE_ONETOUCH is not set 
    2930 CONFIG_USB_STORAGE_SDDR09=y 
    2931 CONFIG_USB_STORAGE_SDDR55=y 
    2932 CONFIG_USB_STORAGE_USBAT=y 
     2930# CONFIG_USB_STORAGE_SDDR09 is not set 
     2931# CONFIG_USB_STORAGE_SDDR55 is not set 
     2932# CONFIG_USB_STORAGE_USBAT is not set 
    29332933# CONFIG_USB_STV06XX is not set 
    29342934# CONFIG_USB_SUPPORT is not set 
  • trunk/target/linux/omap35xx/config-2.6.32

    r28584 r29337  
    14471447# CONFIG_USB_STKWEBCAM is not set 
    14481448CONFIG_USB_STORAGE_ALAUDA=y 
    1449 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 
    14501449CONFIG_USB_STORAGE_DATAFAB=y 
    14511450# CONFIG_USB_STORAGE_DEBUG is not set 
    14521451CONFIG_USB_STORAGE_FREECOM=y 
    1453 # CONFIG_USB_STORAGE_ISD200 is not set 
    14541452CONFIG_USB_STORAGE_JUMPSHOT=y 
    14551453CONFIG_USB_STORAGE_KARMA=y 
    1456 # CONFIG_USB_STORAGE_ONETOUCH is not set 
    14571454CONFIG_USB_STORAGE_SDDR09=y 
    14581455CONFIG_USB_STORAGE_SDDR55=y 
  • trunk/target/linux/orion/config-default

    r25928 r29337  
    219219# CONFIG_USB_R8A66597_HCD is not set 
    220220# CONFIG_USB_SERIAL is not set 
    221 # CONFIG_USB_STORAGE_ALAUDA is not set 
    222 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 
    223 # CONFIG_USB_STORAGE_DATAFAB is not set 
    224 # CONFIG_USB_STORAGE_DPCM is not set 
    225 # CONFIG_USB_STORAGE_FREECOM is not set 
    226 # CONFIG_USB_STORAGE_JUMPSHOT is not set 
    227 # CONFIG_USB_STORAGE_KARMA is not set 
    228 # CONFIG_USB_STORAGE_SDDR09 is not set 
    229 # CONFIG_USB_STORAGE_SDDR55 is not set 
    230 # CONFIG_USB_STORAGE_USBAT is not set 
    231221CONFIG_USB_SUPPORT=y 
    232222CONFIG_USB_UHCI_HCD=m 
  • trunk/target/linux/ps3/config-2.6.30

    r28584 r29337  
    300300# CONFIG_USB_OHCI_HCD_PPC_OF is not set 
    301301CONFIG_USB_OHCI_HCD=y 
    302 # CONFIG_USB_STORAGE_ALAUDA is not set 
    303 # CONFIG_USB_STORAGE_DATAFAB is not set 
    304 # CONFIG_USB_STORAGE_FREECOM is not set 
    305 # CONFIG_USB_STORAGE_JUMPSHOT is not set 
    306 # CONFIG_USB_STORAGE_KARMA is not set 
    307 # CONFIG_USB_STORAGE_SDDR09 is not set 
    308 # CONFIG_USB_STORAGE_SDDR55 is not set 
    309 # CONFIG_USB_STORAGE_USBAT is not set 
    310302CONFIG_USB_STORAGE=y 
    311303CONFIG_USB_SUPPORT=y 
  • trunk/target/linux/pxcab/config-2.6.30

    r28584 r29337  
    403403# CONFIG_USB_OHCI_HCD_PPC_OF is not set 
    404404CONFIG_USB_OHCI_HCD=y 
    405 # CONFIG_USB_STORAGE_ALAUDA is not set 
    406 # CONFIG_USB_STORAGE_DATAFAB is not set 
    407 # CONFIG_USB_STORAGE_FREECOM is not set 
    408 # CONFIG_USB_STORAGE_JUMPSHOT is not set 
    409 # CONFIG_USB_STORAGE_KARMA is not set 
    410 # CONFIG_USB_STORAGE_SDDR09 is not set 
    411 # CONFIG_USB_STORAGE_SDDR55 is not set 
    412 # CONFIG_USB_STORAGE_USBAT is not set 
    413405CONFIG_USB_STORAGE=y 
    414406CONFIG_USB_SUPPORT=y 
  • trunk/target/linux/xburst/id800wt/config-2.6.36

    r23421 r29337  
    3434CONFIG_USB_OHCI_HCD=y 
    3535CONFIG_USB_STORAGE=y 
    36 # CONFIG_USB_STORAGE_ALAUDA is not set 
    37 # CONFIG_USB_STORAGE_DATAFAB is not set 
    38 # CONFIG_USB_STORAGE_FREECOM is not set 
    39 # CONFIG_USB_STORAGE_JUMPSHOT is not set 
    40 # CONFIG_USB_STORAGE_KARMA is not set 
    41 # CONFIG_USB_STORAGE_SDDR09 is not set 
    42 # CONFIG_USB_STORAGE_SDDR55 is not set 
    43 # CONFIG_USB_STORAGE_USBAT is not set 
  • trunk/target/linux/xburst/id800wt/config-2.6.37

    r24914 r29337  
    3434CONFIG_USB_OHCI_HCD=y 
    3535CONFIG_USB_STORAGE=y 
    36 # CONFIG_USB_STORAGE_ALAUDA is not set 
    37 # CONFIG_USB_STORAGE_DATAFAB is not set 
    38 # CONFIG_USB_STORAGE_FREECOM is not set 
    39 # CONFIG_USB_STORAGE_JUMPSHOT is not set 
    40 # CONFIG_USB_STORAGE_KARMA is not set 
    41 # CONFIG_USB_STORAGE_SDDR09 is not set 
    42 # CONFIG_USB_STORAGE_SDDR55 is not set 
    43 # CONFIG_USB_STORAGE_USBAT is not set 
Note: See TracChangeset for help on using the changeset viewer.