powerpc/85xx: move SRIO configuration out of corenet_ds.h

[platform/kernel/u-boot.git] / include / part.h

diff --git a/include/part.h b/include/part.h
index a6d06f3..27ea283 100644 (file)
--- a/include/part.h
+++ b/include/part.h
@@ -94,6 +94,9 @@ typedef struct disk_partition {
        uchar   name[32];       /* partition name                       */
        uchar   type[32];       /* string type description              */
        int     bootable;       /* Active/Bootable flag is set          */
+#ifdef CONFIG_PARTITION_UUIDS
+       char    uuid[37];       /* filesystem UUID as string, if exists */
+#endif
 } disk_partition_t;
 
 /* Misc _get_dev functions */
@@ -112,9 +115,11 @@ int get_partition_info (block_dev_desc_t * dev_desc, int part, disk_partition_t
 void print_part (block_dev_desc_t *dev_desc);
 void  init_part (block_dev_desc_t *dev_desc);
 void dev_print(block_dev_desc_t *dev_desc);
-int get_device_and_partition(const char *ifname, const char *dev_str,
+int get_device(const char *ifname, const char *dev_str,
+              block_dev_desc_t **dev_desc);
+int get_device_and_partition(const char *ifname, const char *dev_part_str,
                             block_dev_desc_t **dev_desc,
-                            disk_partition_t *info);
+                            disk_partition_t *info, int allow_whole_dev);
 #else
 static inline block_dev_desc_t *get_dev(const char *ifname, int dev)
 { return NULL; }
@@ -131,10 +136,14 @@ static inline int get_partition_info (block_dev_desc_t * dev_desc, int part,
 static inline void print_part (block_dev_desc_t *dev_desc) {}
 static inline void  init_part (block_dev_desc_t *dev_desc) {}
 static inline void dev_print(block_dev_desc_t *dev_desc) {}
+static inline int get_device(const char *ifname, const char *dev_str,
+              block_dev_desc_t **dev_desc)
+{ return -1; }
 static inline int get_device_and_partition(const char *ifname,
-                                          const char *dev_str,
+                                          const char *dev_part_str,
                                           block_dev_desc_t **dev_desc,
-                                          disk_partition_t *info)
+                                          disk_partition_t *info,
+                                          int allow_whole_dev)
 { *dev_desc = NULL; return -1; }
 #endif