Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a63d216 in mainline


Ignore:
Timestamp:
2014-03-16T21:39:14Z (7 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
master
Children:
e1fc679
Parents:
2e231aba
Message:

Remove support for CONFIG_START_BD and CONFIG_MOUNT_DATA.

  • CONFIG_START_BD is obsoleted by by DDFied ata_bd driver.
  • CONFIG_MOUNT_DATA depended on CONFIG_START_BD.
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • HelenOS.config

    r2e231aba ra63d216  
    609609! [CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (n/y)
    610610
    611 % Load disk drivers on startup
    612 ! CONFIG_START_BD (n/y)
    613 
    614 % Mount /data on startup
    615 ! [CONFIG_START_BD=y] CONFIG_MOUNT_DATA (n/y)
    616 
    617611% Write core files
    618612! CONFIG_WRITE_CORE_FILES (n/y)
  • defaults/amd64/Makefile.config

    r2e231aba ra63d216  
    5959CONFIG_BFB_BPP = 16
    6060
    61 # Load disk drivers on startup
    62 CONFIG_START_BD = n
    63 
    64 # Mount /data on startup
    65 CONFIG_MOUNT_DATA = n
    66 
    6761# OHCI root hub power switch, ganged is enough
    6862OHCI_POWER_SWITCH = ganged
  • defaults/arm32/Makefile.config

    r2e231aba ra63d216  
    3434# What is your output device?
    3535CONFIG_HID_OUT = generic
    36 
    37 # Load disk drivers on startup
    38 CONFIG_START_BD = n
    39 
    40 # Mount /data on startup
    41 CONFIG_MOUNT_DATA = n
    42 
  • defaults/ia32/Makefile.config

    r2e231aba ra63d216  
    6565CONFIG_BFB_BPP = 16
    6666
    67 # Load disk drivers on startup
    68 CONFIG_START_BD = n
    69 
    70 # Mount /data on startup
    71 CONFIG_MOUNT_DATA = n
    72 
    7367# OHCI root hub power switch, ganged is enough
    7468OHCI_POWER_SWITCH = ganged
  • defaults/ia64/Makefile.config

    r2e231aba ra63d216  
    4646# Output device class
    4747CONFIG_HID_OUT = generic
    48 
    49 # Load disk drivers on startup
    50 CONFIG_START_BD = n
    51 
    52 # Mount /data on startup
    53 CONFIG_MOUNT_DATA = n
    54 
  • defaults/mips32/Makefile.config

    r2e231aba ra63d216  
    4141CONFIG_HID_OUT = generic
    4242
    43 # Load disk drivers on startup
    44 CONFIG_START_BD = n
    45 
    46 # Mount /data on startup
    47 CONFIG_MOUNT_DATA = n
    48 
    4943# Barebone build with essential binaries only
    5044CONFIG_BAREBONE = y
  • defaults/mips64/Makefile.config

    r2e231aba ra63d216  
    4040# Output device class
    4141CONFIG_HID_OUT = generic
    42 
    43 # Load disk drivers on startup
    44 CONFIG_START_BD = n
    45 
    46 # Mount /data on startup
    47 CONFIG_MOUNT_DATA = n
    48 
  • defaults/ppc32/Makefile.config

    r2e231aba ra63d216  
    3838CONFIG_FB = y
    3939
    40 # Load disk drivers on startup
    41 CONFIG_START_BD = n
    42 
    43 # Mount /data on startup
    44 CONFIG_MOUNT_DATA = n
    45 
    4640# OHCI root hub power switch, ganged is enough
    4741OHCI_POWER_SWITCH = ganged
  • defaults/sparc32/Makefile.config

    r2e231aba ra63d216  
    5252# Start AP processors by the loader
    5353CONFIG_AP = y
    54 
    55 # Load disk drivers on startup
    56 CONFIG_START_BD = n
    57 
    58 # Mount /data on startup
    59 CONFIG_MOUNT_DATA = n
    60 
  • defaults/sparc64/Makefile.config

    r2e231aba ra63d216  
    5252# Start AP processors by the loader
    5353CONFIG_AP = y
    54 
    55 # Load disk drivers on startup
    56 CONFIG_START_BD = n
    57 
    58 # Mount /data on startup
    59 CONFIG_MOUNT_DATA = n
    60 
  • defaults/special/Makefile.config

    r2e231aba ra63d216  
    2828# Compile kernel tests
    2929CONFIG_TEST = y
    30 
    31 # Load disk drivers on startup
    32 CONFIG_START_BD = n
    33 
  • uspace/app/init/init.c

    r2e231aba ra63d216  
    5959#define TMPFS_FS_TYPE      "tmpfs"
    6060#define TMPFS_MOUNT_POINT  "/tmp"
    61 
    62 #define DATA_FS_TYPE      "fat"
    63 #define DATA_DEVICE       "bd/ata1disk0"
    64 #define DATA_MOUNT_POINT  "/data"
    6561
    6662#define SRV_CONSOLE  "/srv/console"
     
    316312}
    317313
    318 static bool mount_data(void)
    319 {
    320         int rc = mount(DATA_FS_TYPE, DATA_MOUNT_POINT, DATA_DEVICE, "wtcache", 0, 0);
    321         return mount_report("Data filesystem", DATA_MOUNT_POINT, DATA_FS_TYPE,
    322             DATA_DEVICE, rc);
    323 }
    324 
    325314int main(int argc, char *argv[])
    326315{
     
    366355        srv_start("/srv/clipboard");
    367356        srv_start("/srv/remcons");
    368        
    369         /*
    370          * Start these synchronously so that mount_data() can be
    371          * non-blocking.
    372          */
    373 #ifdef CONFIG_START_BD
    374         srv_start("/srv/ata_bd");
    375 #endif
    376        
    377 #ifdef CONFIG_MOUNT_DATA
    378         /* Make sure fat is running. */
    379         if (str_cmp(STRING(RDFMT), "fat") != 0)
    380                 srv_start("/srv/fat");
    381        
    382         mount_data();
    383 #else
    384         (void) mount_data;
    385 #endif
    386357       
    387358        srv_start("/srv/input", HID_INPUT);
Note: See TracChangeset for help on using the changeset viewer.