From bc31d85c6e23d724664e76bcfc3b2eda778012a3 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 17 Jun 2015 12:40:04 +0200 Subject: cdev: Add partuuid string to struct cdev This adds the partuuid string to struct cdev in order to have this available for constructing a suitable Linux root=PARTUUID= option for booting Linux. Signed-off-by: Sascha Hauer --- common/partitions.c | 1 + common/partitions/dos.c | 4 ++++ common/partitions/parser.h | 1 + include/driver.h | 3 +++ 4 files changed, 9 insertions(+) diff --git a/common/partitions.c b/common/partitions.c index 37d9cb7edc..4f50bfeff1 100644 --- a/common/partitions.c +++ b/common/partitions.c @@ -64,6 +64,7 @@ static int register_one_partition(struct block_device *blk, } cdev->dos_partition_type = part->dos_partition_type; + strcpy(cdev->partuuid, part->partuuid); free(partition_name); diff --git a/common/partitions/dos.c b/common/partitions/dos.c index 37addfd2ef..e0cb35627d 100644 --- a/common/partitions/dos.c +++ b/common/partitions/dos.c @@ -185,6 +185,7 @@ static void dos_partition(void *buf, struct block_device *blk, uint8_t *buffer = buf; int i; struct disk_signature_priv *dsp; + uint32_t signature = get_unaligned_le32(buf + 0x1b8); table = (struct partition_entry *)&buffer[446]; @@ -202,6 +203,9 @@ static void dos_partition(void *buf, struct block_device *blk, pd->parts[n].first_sec = pentry.first_sec; pd->parts[n].size = pentry.size; pd->parts[n].dos_partition_type = pentry.dos_partition_type; + if (signature) + sprintf(pd->parts[n].partuuid, "%08x-%02d", + signature, i + 1); pd->used_entries++; /* * Partitions of type 0x05 and 0x0f (and some more) diff --git a/common/partitions/parser.h b/common/partitions/parser.h index 8d39452378..8ad134a9aa 100644 --- a/common/partitions/parser.h +++ b/common/partitions/parser.h @@ -17,6 +17,7 @@ struct partition { char name[MAX_PARTITION_NAME]; u8 dos_partition_type; + char partuuid[MAX_PARTUUID_STR]; uint64_t first_sec; uint64_t size; }; diff --git a/include/driver.h b/include/driver.h index d0cdcc9715..9c6005454c 100644 --- a/include/driver.h +++ b/include/driver.h @@ -435,6 +435,8 @@ struct file_operations { int (*memmap)(struct cdev*, void **map, int flags); }; +#define MAX_PARTUUID_STR sizeof("00112233-4455-6677-8899-AABBCCDDEEFF") + struct cdev { struct file_operations *ops; void *priv; @@ -445,6 +447,7 @@ struct cdev { char *partname; /* the partition name, usually the above without the * device part, i.e. name = "nand0.barebox" -> partname = "barebox" */ + char partuuid[MAX_PARTUUID_STR]; loff_t offset; loff_t size; unsigned int flags; -- cgit v1.2.3