| Message ID | 20170210202304.20652-17-grygorii.strashko@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
On Fri, 2017-02-10 at 14:23 -0600, Grygorii Strashko wrote: > As part of preparation for nand DM conversion the new API has been > introduced to remove direct access to nand_info array. So, use it > here > instead of accessing to nand_info array directly. > > Cc: Lucas Stach <dev@lynxeye.de> > Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> Looks reasonable to me. Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > --- > board/toradex/colibri_t20/colibri_t20.c | 2 +- > board/toradex/common/tdx-cfg-block.c | 12 ++++++++---- > 2 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/board/toradex/colibri_t20/colibri_t20.c > b/board/toradex/colibri_t20/colibri_t20.c > index 7d574fb..71b8fd3 100644 > --- a/board/toradex/colibri_t20/colibri_t20.c > +++ b/board/toradex/colibri_t20/colibri_t20.c > @@ -69,7 +69,7 @@ int checkboard(void) > { > printf("Model: Toradex Colibri T20 %dMB V%s\n", > (gd->ram_size == 0x10000000) ? 256 : 512, > - (nand_info[0]->erasesize >> 10 == 512) ? > + (get_nand_dev_by_index(0)->erasesize >> 10 == 512) ? > ((gd->ram_size == 0x10000000) ? "1.1B" : "1.1C") : > "1.2A"); > > return 0; > diff --git a/board/toradex/common/tdx-cfg-block.c > b/board/toradex/common/tdx-cfg-block.c > index 0014ce8..7722b92 100644 > --- a/board/toradex/common/tdx-cfg-block.c > +++ b/board/toradex/common/tdx-cfg-block.c > @@ -153,8 +153,10 @@ static int read_tdx_cfg_block_from_nand(unsigned > char *config_block) > size_t size = TDX_CFG_BLOCK_MAX_SIZE; > > /* Read production parameter config block from NAND page */ > - return nand_read_skip_bad(nand_info[0], > CONFIG_TDX_CFG_BLOCK_OFFSET, > - &size, NULL, TDX_CFG_BLOCK_MAX_SIZE, > config_block); > + return nand_read_skip_bad(get_nand_dev_by_index(0), > + CONFIG_TDX_CFG_BLOCK_OFFSET, > + &size, NULL, > TDX_CFG_BLOCK_MAX_SIZE, > + config_block); > } > > static int write_tdx_cfg_block_to_nand(unsigned char *config_block) > @@ -162,7 +164,8 @@ static int write_tdx_cfg_block_to_nand(unsigned > char *config_block) > size_t size = TDX_CFG_BLOCK_MAX_SIZE; > > /* Write production parameter config block to NAND page */ > - return nand_write_skip_bad(nand_info[0], > CONFIG_TDX_CFG_BLOCK_OFFSET, > + return nand_write_skip_bad(get_nand_dev_by_index(0), > + CONFIG_TDX_CFG_BLOCK_OFFSET, > &size, NULL, > TDX_CFG_BLOCK_MAX_SIZE, > config_block, WITH_WR_VERIFY); > } > @@ -425,7 +428,8 @@ static int do_cfgblock_create(cmd_tbl_t *cmdtp, > int flag, int argc, > * empty (config block invalid...) > */ > printf("NAND erase block %d need to be erased before > creating a Toradex config block\n", > - CONFIG_TDX_CFG_BLOCK_OFFSET / nand_info[0]- > >erasesize); > + CONFIG_TDX_CFG_BLOCK_OFFSET / > + get_nand_dev_by_index(0)->erasesize); > goto out; > #elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NOR) > /*
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c index 7d574fb..71b8fd3 100644 --- a/board/toradex/colibri_t20/colibri_t20.c +++ b/board/toradex/colibri_t20/colibri_t20.c @@ -69,7 +69,7 @@ int checkboard(void) { printf("Model: Toradex Colibri T20 %dMB V%s\n", (gd->ram_size == 0x10000000) ? 256 : 512, - (nand_info[0]->erasesize >> 10 == 512) ? + (get_nand_dev_by_index(0)->erasesize >> 10 == 512) ? ((gd->ram_size == 0x10000000) ? "1.1B" : "1.1C") : "1.2A"); return 0; diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 0014ce8..7722b92 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -153,8 +153,10 @@ static int read_tdx_cfg_block_from_nand(unsigned char *config_block) size_t size = TDX_CFG_BLOCK_MAX_SIZE; /* Read production parameter config block from NAND page */ - return nand_read_skip_bad(nand_info[0], CONFIG_TDX_CFG_BLOCK_OFFSET, - &size, NULL, TDX_CFG_BLOCK_MAX_SIZE, config_block); + return nand_read_skip_bad(get_nand_dev_by_index(0), + CONFIG_TDX_CFG_BLOCK_OFFSET, + &size, NULL, TDX_CFG_BLOCK_MAX_SIZE, + config_block); } static int write_tdx_cfg_block_to_nand(unsigned char *config_block) @@ -162,7 +164,8 @@ static int write_tdx_cfg_block_to_nand(unsigned char *config_block) size_t size = TDX_CFG_BLOCK_MAX_SIZE; /* Write production parameter config block to NAND page */ - return nand_write_skip_bad(nand_info[0], CONFIG_TDX_CFG_BLOCK_OFFSET, + return nand_write_skip_bad(get_nand_dev_by_index(0), + CONFIG_TDX_CFG_BLOCK_OFFSET, &size, NULL, TDX_CFG_BLOCK_MAX_SIZE, config_block, WITH_WR_VERIFY); } @@ -425,7 +428,8 @@ static int do_cfgblock_create(cmd_tbl_t *cmdtp, int flag, int argc, * empty (config block invalid...) */ printf("NAND erase block %d need to be erased before creating a Toradex config block\n", - CONFIG_TDX_CFG_BLOCK_OFFSET / nand_info[0]->erasesize); + CONFIG_TDX_CFG_BLOCK_OFFSET / + get_nand_dev_by_index(0)->erasesize); goto out; #elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NOR) /*
As part of preparation for nand DM conversion the new API has been introduced to remove direct access to nand_info array. So, use it here instead of accessing to nand_info array directly. Cc: Lucas Stach <dev@lynxeye.de> Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> --- board/toradex/colibri_t20/colibri_t20.c | 2 +- board/toradex/common/tdx-cfg-block.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-)