summaryrefslogtreecommitdiffstats
path: root/include/ubi_uboot.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-04-12 22:07:57 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-04-12 22:07:57 +0200
commit18122019972ca639ee3b581257e3a63ff7c8efeb (patch)
tree52f7223e7c63f43322f3eee4722743e12190a19f /include/ubi_uboot.h
parent90639feaa0d66a204f9d03a325ab14e2f97f6cbb (diff)
parent785881f775252940185e10fbb2d5299c9ffa6bce (diff)
downloadtalos-obmc-uboot-18122019972ca639ee3b581257e3a63ff7c8efeb.tar.gz
talos-obmc-uboot-18122019972ca639ee3b581257e3a63ff7c8efeb.zip
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts: drivers/video/exynos_fb.c
Diffstat (limited to 'include/ubi_uboot.h')
-rw-r--r--include/ubi_uboot.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h
index 69006e250a..7f720229a6 100644
--- a/include/ubi_uboot.h
+++ b/include/ubi_uboot.h
@@ -214,6 +214,9 @@ static inline long IS_ERR(const void *ptr)
extern int ubi_mtd_param_parse(const char *val, struct kernel_param *kp);
extern int ubi_init(void);
extern void ubi_exit(void);
+extern int ubi_part(char *part_name, const char *vid_header_offset);
+extern int ubi_volume_write(char *volume, void *buf, size_t size);
+extern int ubi_volume_read(char *volume, char *buf, size_t size);
extern struct ubi_device *ubi_devices[];
OpenPOWER on IntegriCloud