diff options
| author | Scott Wood <oss@buserror.net> | 2016-05-30 13:57:54 -0500 |
|---|---|---|
| committer | Scott Wood <oss@buserror.net> | 2016-06-03 20:27:48 -0500 |
| commit | 151c06ec61d74b77cf27d6d622bab6370c949c66 (patch) | |
| tree | fc50effb6cd876bf28ba3e6f3f143f0f51fd6db1 /common/env_nand.c | |
| parent | ea7d1eec66898b233ac49f8a60391b96afa25477 (diff) | |
| download | blackbird-obmc-uboot-151c06ec61d74b77cf27d6d622bab6370c949c66.tar.gz blackbird-obmc-uboot-151c06ec61d74b77cf27d6d622bab6370c949c66.zip | |
mtd: nand: Remove nand_info_t typedef
This typedef serves no purpose other than causing confusion with
struct nand_chip.
Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'common/env_nand.c')
| -rw-r--r-- | common/env_nand.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/env_nand.c b/common/env_nand.c index b32eeac9d7..0debc2c192 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -276,7 +276,7 @@ static int readenv(size_t offset, u_char *buf) #endif /* #if defined(CONFIG_SPL_BUILD) */ #ifdef CONFIG_ENV_OFFSET_OOB -int get_nand_env_oob(nand_info_t *nand, unsigned long *result) +int get_nand_env_oob(struct mtd_info *mtd, unsigned long *result) { struct mtd_oob_ops ops; uint32_t oob_buf[ENV_OFFSET_SIZE / sizeof(uint32_t)]; @@ -288,14 +288,14 @@ int get_nand_env_oob(nand_info_t *nand, unsigned long *result) ops.ooblen = ENV_OFFSET_SIZE; ops.oobbuf = (void *)oob_buf; - ret = nand->read_oob(nand, ENV_OFFSET_SIZE, &ops); + ret = mtd->read_oob(mtd, ENV_OFFSET_SIZE, &ops); if (ret) { printf("error reading OOB block 0\n"); return ret; } if (oob_buf[0] == ENV_OOB_MARKER) { - *result = oob_buf[1] * nand->erasesize; + *result = oob_buf[1] * mtd->erasesize; } else if (oob_buf[0] == ENV_OOB_MARKER_OLD) { *result = oob_buf[1]; } else { |
