Changeset 865


Ignore:
Timestamp:
Dec 4, 2016, 7:46:30 PM (3 years ago)
Author:
amain
Message:

Kernel config changes: enable kexec by default, add kernel config to kernel, set bootdelay from 15 to 5 and disable IDE

Location:
trunk/config/kernel/config
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/config/kernel/config/boot.in

    r688 r865  
    4646          only way to avoid big patches.
    4747
     48config BOOT_METHOD_DEVICE
     49        bool "Directly boot from device /dev/sda1"
     50
    4851config BOOT_METHOD_SCRIPT
    49         bool "Use DebWrt boot script"
     52        bool "Use DebWrt boot script (obsolete)"
    5053        help
    5154          Auto discover root device, optionally kexec to a alternate kernel and boot from this device.
     
    5861          .
    5962          After mounting ( or kexec ), a pivot_root to the DEBWRT_ROOT device is done and /sbin/init is executed.
    60 
    61 config BOOT_METHOD_DEVICE
    62         bool "Directly boot from device /dev/sda1"
    6363
    6464endchoice
     
    7676config CMDLINE
    7777        string "Default kernel command line"
    78         default "root=/dev/sda1 init=/sbin/init rootdelay=15 noinitrd console=ttyS0,115200 netconsole=6665@192.168.1.1/eth0,6666@192.168.1.2/"
     78        default "root=/dev/sda1 init=/sbin/init rootdelay=5 noinitrd console=ttyS0,115200 netconsole=6665@192.168.1.1/eth0,6666@192.168.1.2/"
    7979        depends BOOT_METHOD_DEVICE
    8080        help
  • trunk/config/kernel/config/kexec.in

    r676 r865  
    11config KEXEC
    22    bool "Enalable kexec function call"
    3     depends BOOT_METHOD_SCRIPT
    43    default y
    54config PACKAGE_block-mount
  • trunk/config/kernel/config/options.in

    r724 r865  
    248248config IDEPCI_PCIBUS_ORDER
    249249    bool
    250     default y
     250    default n
    251251
    252252#CONFIG_IDE_XFER_MODE=y
    253253config IDE_XFER_MODE
    254254    bool
    255     default y
     255    default n
    256256
    257257#CONFIG_BLK_DEV_IDEDMA_SFF=y
    258258config BLK_DEV_IDEDMA_SFF
    259259    bool
    260     default y
     260    default n
    261261
    262262#CONFIG_BLK_DEV_IDEPCI=y
    263263config BLK_DEV_IDEPCI
    264264    bool
    265     default y
     265    default n
    266266
    267267#CONFIG_BLK_DEV_IDEDMA_PCI=y
    268268config BLK_DEV_IDEDMA_PCI
    269269    bool
    270     default y
     270    default n
    271271
    272272#CONFIG_BLK_DEV_IDEDMA=y
    273273config BLK_DEV_IDEDMA
    274274    bool
    275     default y
     275    default n
    276276
    277277# make kernel compile not stop:
     
    304304config IDE_GD
    305305    tristate "generic ATA/ATAPI disk support"
    306     default y
     306    default n
    307307    help
    308308      Support for ATA/ATAPI disks (including ATAPI floppy drives).
     
    317317    bool "ATA disk support"
    318318    depends on IDE_GD
    319     default y
     319    default n
    320320    help
    321321      This will include support for ATA hard disks.
     
    327327    bool "legacy /proc/ide/ support"
    328328    depends on IDE
    329     default y
     329    default n
    330330    help
    331331      This option enables support for the various files in
     
    339339    tristate "PROMISE PDC202{46|62|65|67} support"
    340340    select BLK_DEV_IDEDMA_PCI
    341     default y
     341    default n
    342342    help
    343343      Promise Ultra33 or PDC20246
     
    831831        default n
    832832
     833config PROC_FS
     834        bool
     835        default n
     836
     837config BUILD_BIN2C
     838        bool
     839        default n
     840
     841config IKCONFIG
     842        tristate "Kernel .config support"
     843        select BUILD_BIN2C
     844        default y
     845        ---help---
     846          This option enables the complete Linux kernel ".config" file
     847          contents to be saved in the kernel. It provides documentation
     848          of which kernel options are used in a running kernel or in an
     849          on-disk kernel.  This information can be extracted from the kernel
     850          image file with the script scripts/extract-ikconfig and used as
     851          input to rebuild the current kernel or to build another kernel.
     852          It can also be extracted from a running kernel by reading
     853          /proc/config.gz if enabled (below).
     854
     855config IKCONFIG_PROC
     856        bool "Enable access to .config through /proc/config.gz"
     857        depends on IKCONFIG
     858        select PROC_FS
     859        default y
     860        ---help---
     861          This option enables access to the kernel configuration file
     862          through /proc/config.gz.
     863
    833864
    834865endmenu
Note: See TracChangeset for help on using the changeset viewer.