mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-02 01:08:05 +00:00
97 lines
3.2 KiB
Diff
97 lines
3.2 KiB
Diff
|
--- a/block/blk.h
|
||
|
|
+++ b/block/blk.h
|
||
|
|
@@ -357,6 +357,7 @@ char *disk_name(struct gendisk *hd, int
|
||
|
|
#define ADDPART_FLAG_NONE 0
|
||
|
|
#define ADDPART_FLAG_RAID 1
|
||
|
|
#define ADDPART_FLAG_WHOLEDISK 2
|
||
|
|
+#define ADDPART_FLAG_ROOTDEV 4
|
||
|
|
void delete_partition(struct hd_struct *part);
|
||
|
|
int bdev_add_partition(struct block_device *bdev, int partno,
|
||
|
|
sector_t start, sector_t length);
|
||
|
|
--- a/block/partitions/Kconfig
|
||
|
|
+++ b/block/partitions/Kconfig
|
||
|
|
@@ -101,6 +101,13 @@ config ATARI_PARTITION
|
||
|
|
Say Y here if you would like to use hard disks under Linux which
|
||
|
|
were partitioned under the Atari OS.
|
||
|
|
|
||
|
|
+config FIT_PARTITION
|
||
|
|
+ bool "Flattened-Image-Tree (FIT) partition support" if PARTITION_ADVANCED
|
||
|
|
+ default n
|
||
|
|
+ help
|
||
|
|
+ Say Y here if your system needs to mount the filesystem part of
|
||
|
|
+ a Flattened-Image-Tree (FIT) image commonly used with Das U-Boot.
|
||
|
|
+
|
||
|
|
config IBM_PARTITION
|
||
|
|
bool "IBM disk label and partition support"
|
||
|
|
depends on PARTITION_ADVANCED && S390
|
||
|
|
--- a/block/partitions/Makefile
|
||
|
|
+++ b/block/partitions/Makefile
|
||
|
|
@@ -8,6 +8,7 @@ obj-$(CONFIG_ACORN_PARTITION) += acorn.o
|
||
|
|
obj-$(CONFIG_AMIGA_PARTITION) += amiga.o
|
||
|
|
obj-$(CONFIG_ATARI_PARTITION) += atari.o
|
||
|
|
obj-$(CONFIG_AIX_PARTITION) += aix.o
|
||
|
|
+obj-$(CONFIG_FIT_PARTITION) += fit.o
|
||
|
|
obj-$(CONFIG_CMDLINE_PARTITION) += cmdline.o
|
||
|
|
obj-$(CONFIG_MAC_PARTITION) += mac.o
|
||
|
|
obj-$(CONFIG_LDM_PARTITION) += ldm.o
|
||
|
|
--- a/block/partitions/check.h
|
||
|
|
+++ b/block/partitions/check.h
|
||
|
|
@@ -58,6 +58,7 @@ int amiga_partition(struct parsed_partit
|
||
|
|
int atari_partition(struct parsed_partitions *state);
|
||
|
|
int cmdline_partition(struct parsed_partitions *state);
|
||
|
|
int efi_partition(struct parsed_partitions *state);
|
||
|
|
+int fit_partition(struct parsed_partitions *state);
|
||
|
|
int ibm_partition(struct parsed_partitions *);
|
||
|
|
int karma_partition(struct parsed_partitions *state);
|
||
|
|
int ldm_partition(struct parsed_partitions *state);
|
||
|
|
--- a/block/partitions/core.c
|
||
|
|
+++ b/block/partitions/core.c
|
||
|
|
@@ -10,6 +10,8 @@
|
||
|
|
#include <linux/vmalloc.h>
|
||
|
|
#include <linux/blktrace_api.h>
|
||
|
|
#include <linux/raid/detect.h>
|
||
|
|
+#include <linux/root_dev.h>
|
||
|
|
+
|
||
|
|
#include "check.h"
|
||
|
|
|
||
|
|
static int (*check_part[])(struct parsed_partitions *) = {
|
||
|
|
@@ -46,6 +48,9 @@ static int (*check_part[])(struct parsed
|
||
|
|
#ifdef CONFIG_EFI_PARTITION
|
||
|
|
efi_partition, /* this must come before msdos */
|
||
|
|
#endif
|
||
|
|
+#ifdef CONFIG_FIT_PARTITION
|
||
|
|
+ fit_partition,
|
||
|
|
+#endif
|
||
|
|
#ifdef CONFIG_SGI_PARTITION
|
||
|
|
sgi_partition,
|
||
|
|
#endif
|
||
|
|
@@ -694,6 +699,9 @@ static bool blk_add_partition(struct gen
|
||
|
|
(state->parts[p].flags & ADDPART_FLAG_RAID))
|
||
|
|
md_autodetect_dev(part_to_dev(part)->devt);
|
||
|
|
|
||
|
|
+ if ((state->parts[p].flags & ADDPART_FLAG_ROOTDEV) && ROOT_DEV == 0)
|
||
|
|
+ ROOT_DEV = part_to_dev(part)->devt;
|
||
|
|
+
|
||
|
|
return true;
|
||
|
|
}
|
||
|
|
|
||
|
|
--- a/drivers/mtd/ubi/block.c
|
||
|
|
+++ b/drivers/mtd/ubi/block.c
|
||
|
|
@@ -396,7 +396,7 @@ int ubiblock_create(struct ubi_volume_in
|
||
|
|
dev->leb_size = vi->usable_leb_size;
|
||
|
|
|
||
|
|
/* Initialize the gendisk of this ubiblock device */
|
||
|
|
- gd = alloc_disk(1);
|
||
|
|
+ gd = alloc_disk(0);
|
||
|
|
if (!gd) {
|
||
|
|
pr_err("UBI: block: alloc_disk failed\n");
|
||
|
|
ret = -ENODEV;
|
||
|
|
@@ -413,6 +413,7 @@ int ubiblock_create(struct ubi_volume_in
|
||
|
|
goto out_put_disk;
|
||
|
|
}
|
||
|
|
gd->private_data = dev;
|
||
|
|
+ gd->flags |= GENHD_FL_EXT_DEVT;
|
||
|
|
sprintf(gd->disk_name, "ubiblock%d_%d", dev->ubi_num, dev->vol_id);
|
||
|
|
set_capacity(gd, disk_capacity);
|
||
|
|
dev->gd = gd;
|