diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:06 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-11 13:11:06 +0100 |
| commit | b9a2512aaa22086dc84db3f55a0d912b206c11e3 (patch) | |
| tree | 38cfaccf38003f10032808354fce63d1b369c9e2 /lib/bootstrap | |
| parent | b1ebbe76eb48b56ccd804636edcb5fb0b49da98a (diff) | |
| parent | 0295088d53cd605aaf2a2accfd65c19c0f8a0cf0 (diff) | |
| download | barebox-b9a2512aaa22086dc84db3f55a0d912b206c11e3.tar.gz barebox-b9a2512aaa22086dc84db3f55a0d912b206c11e3.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'lib/bootstrap')
| -rw-r--r-- | lib/bootstrap/devfs.c | 2 | ||||
| -rw-r--r-- | lib/bootstrap/disk.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/bootstrap/devfs.c b/lib/bootstrap/devfs.c index 5a64477eed..6a3dd76cdd 100644 --- a/lib/bootstrap/devfs.c +++ b/lib/bootstrap/devfs.c @@ -80,7 +80,7 @@ static unsigned int get_image_size(void *head) } #endif -void* bootstrap_read_devfs(char *devname, bool use_bb, int offset, +void* bootstrap_read_devfs(const char *devname, bool use_bb, int offset, int default_size, int max_size) { int ret; diff --git a/lib/bootstrap/disk.c b/lib/bootstrap/disk.c index ebf9ee5a98..a55d5d77f4 100644 --- a/lib/bootstrap/disk.c +++ b/lib/bootstrap/disk.c @@ -14,12 +14,12 @@ #include <libfile.h> #include <bootstrap.h> -void* bootstrap_read_disk(char *dev, char *fstype) +void* bootstrap_read_disk(const char *dev, const char *fstype) { int ret; void *buf; int len; - char *path = "/"; + const char *path = "/"; ret = mount(dev, fstype, path, NULL); if (ret) { |