diff options
Diffstat (limited to 'block')
-rw-r--r-- | block/Kconfig | 9 | ||||
-rw-r--r-- | block/Makefile | 2 | ||||
-rw-r--r-- | block/partitions/Kconfig | 4 | ||||
-rw-r--r-- | block/partitions/cmdline.c | 8 |
4 files changed, 14 insertions, 9 deletions
diff --git a/block/Kconfig b/block/Kconfig index 7f38e40fee08..2429515c05c2 100644 --- a/block/Kconfig +++ b/block/Kconfig | |||
@@ -99,11 +99,16 @@ config BLK_DEV_THROTTLING | |||
99 | 99 | ||
100 | See Documentation/cgroups/blkio-controller.txt for more information. | 100 | See Documentation/cgroups/blkio-controller.txt for more information. |
101 | 101 | ||
102 | config CMDLINE_PARSER | 102 | config BLK_CMDLINE_PARSER |
103 | bool "Block device command line partition parser" | 103 | bool "Block device command line partition parser" |
104 | default n | 104 | default n |
105 | ---help--- | 105 | ---help--- |
106 | Parsing command line, get the partitions information. | 106 | Enabling this option allows you to specify the partition layout from |
107 | the kernel boot args. This is typically of use for embedded devices | ||
108 | which don't otherwise have any standardized method for listing the | ||
109 | partitions on a block device. | ||
110 | |||
111 | See Documentation/block/cmdline-partition.txt for more information. | ||
107 | 112 | ||
108 | menu "Partition Types" | 113 | menu "Partition Types" |
109 | 114 | ||
diff --git a/block/Makefile b/block/Makefile index 4fa4be544ece..671a83d063a5 100644 --- a/block/Makefile +++ b/block/Makefile | |||
@@ -18,4 +18,4 @@ obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o | |||
18 | 18 | ||
19 | obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o | 19 | obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o |
20 | obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o | 20 | obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o |
21 | obj-$(CONFIG_CMDLINE_PARSER) += cmdline-parser.o | 21 | obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o |
diff --git a/block/partitions/Kconfig b/block/partitions/Kconfig index 87a32086535d..9b29a996c311 100644 --- a/block/partitions/Kconfig +++ b/block/partitions/Kconfig | |||
@@ -263,7 +263,7 @@ config SYSV68_PARTITION | |||
263 | 263 | ||
264 | config CMDLINE_PARTITION | 264 | config CMDLINE_PARTITION |
265 | bool "Command line partition support" if PARTITION_ADVANCED | 265 | bool "Command line partition support" if PARTITION_ADVANCED |
266 | select CMDLINE_PARSER | 266 | select BLK_CMDLINE_PARSER |
267 | help | 267 | help |
268 | Say Y here if you would read the partitions table from bootargs. | 268 | Say Y here if you want to read the partition table from bootargs. |
269 | The format for the command line is just like mtdparts. | 269 | The format for the command line is just like mtdparts. |
diff --git a/block/partitions/cmdline.c b/block/partitions/cmdline.c index 56cf4ffad51e..5141b563adf1 100644 --- a/block/partitions/cmdline.c +++ b/block/partitions/cmdline.c | |||
@@ -2,15 +2,15 @@ | |||
2 | * Copyright (C) 2013 HUAWEI | 2 | * Copyright (C) 2013 HUAWEI |
3 | * Author: Cai Zhiyong <caizhiyong@huawei.com> | 3 | * Author: Cai Zhiyong <caizhiyong@huawei.com> |
4 | * | 4 | * |
5 | * Read block device partition table from command line. | 5 | * Read block device partition table from the command line. |
6 | * The partition used for fixed block device (eMMC) embedded device. | 6 | * Typically used for fixed block (eMMC) embedded devices. |
7 | * It is no MBR, save storage space. Bootloader can be easily accessed | 7 | * It has no MBR, so saves storage space. Bootloader can be easily accessed |
8 | * by absolute address of data on the block device. | 8 | * by absolute address of data on the block device. |
9 | * Users can easily change the partition. | 9 | * Users can easily change the partition. |
10 | * | 10 | * |
11 | * The format for the command line is just like mtdparts. | 11 | * The format for the command line is just like mtdparts. |
12 | * | 12 | * |
13 | * Verbose config please reference "Documentation/block/cmdline-partition.txt" | 13 | * For further information, see "Documentation/block/cmdline-partition.txt" |
14 | * | 14 | * |
15 | */ | 15 | */ |
16 | 16 | ||