diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2016-09-13 12:14:28 +0800 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-09-14 11:14:20 +1000 |
| commit | 3d4a9fcf16cd9f4ec187edf0ea74d0770a905de0 (patch) | |
| tree | ec592ae1a6668775b0e36b7fd9c7ecff7093f83c /external/opal-prd/pnor.h | |
| parent | 81154ba9b2d418cd5f9eda3a6f89ca6631556510 (diff) | |
| download | talos-skiboot-3d4a9fcf16cd9f4ec187edf0ea74d0770a905de0.tar.gz talos-skiboot-3d4a9fcf16cd9f4ec187edf0ea74d0770a905de0.zip | |
opal-prd: fix for 64-bit pnor sizes
Current builds of opal-prd are failing with:
pnor.c: In function ‘pnor_init’:
pnor.c:48:43: error: passing argument 3 of ‘blocklevel_get_info’ from incompatible pointer type [-Werror=incompatible-pointer-types]
rc = blocklevel_get_info(pnor->bl, NULL, &(pnor->size), &(pnor->erasesize));
^
In file included from ./libflash/libflash.h:21:0,
from ./libflash/libffs.h:19,
from pnor.c:17:
./libflash/blocklevel.h:64:5: note: expected ‘uint64_t * {aka long unsigned int *}’ but argument is of type ‘uint32_t * {aka unsigned int *}’
int blocklevel_get_info(struct blocklevel_device *bl, const char **name, uint64
^
Commit c043065cf changed the type of PNOR sizes to a uint64_t, so we
need to update our pnor code to match.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Cc: Michael Neuling <mikey@neuling.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'external/opal-prd/pnor.h')
| -rw-r--r-- | external/opal-prd/pnor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/opal-prd/pnor.h b/external/opal-prd/pnor.h index 729a969e..4ff449c8 100644 --- a/external/opal-prd/pnor.h +++ b/external/opal-prd/pnor.h @@ -7,7 +7,7 @@ struct pnor { char *path; struct ffs_handle *ffsh; - uint32_t size; + uint64_t size; uint32_t erasesize; struct blocklevel_device *bl; }; |
