| Message ID | 20170505185732.4191-1-xypron.glpk@gmx.de |
|---|---|
| State | Accepted |
| Commit | 169b50efe2635952d9679268860a3e37aa13adf6 |
| Delegated to: | Tom Rini |
| Headers | show |
> The logical expression to check the dtb is incorrect in > load_devicetree. > > The problem was indicated by cppcheck. > > The inconsistent variable name dtppart is changed to dtbpart. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > v2: > fix syntax error due to incorrect spelling of variable > > Building was checked with buildman > > $ buildman -k brxre1 > boards.cfg is up to date. Nothing to do. > Building current source for 1 boards (1 thread, 4 jobs per thread) > 1 0 0 /1 brxre1 > $ buildman -k brppt1 > boards.cfg is up to date. Nothing to do. > Building current source for 3 boards (3 threads, 2 jobs per thread) > 3 0 0 /3 0:00:45 : brppt1_nand > > I do not have a BuR board available for actual testing. > > v1: > Original patch > https://patchwork.ozlabs.org/patch/758237/ > --- > board/BuR/common/common.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c > index 876150402c..5cc82c9473 100644 > --- a/board/BuR/common/common.c > +++ b/board/BuR/common/common.c > @@ -264,13 +264,13 @@ static int load_devicetree(void) > #else > char *dtbname = getenv("dtb"); > char *dtbdev = getenv("dtbdev"); > - char *dtppart = getenv("dtbpart"); > - if (!dtbdev || !dtbdev || !dtbname) { > + char *dtbpart = getenv("dtbpart"); > + if (!dtbdev || !dtbpart || !dtbname) { > printf("%s: <dtbdev>/<dtbpart>/<dtb> missing.\n", __func__); > return -1; > } > > - if (fs_set_blk_dev(dtbdev, dtppart, FS_TYPE_EXT)) { > + if (fs_set_blk_dev(dtbdev, dtbpart, FS_TYPE_EXT)) { > puts("load_devicetree: set_blk_dev failed.\n"); > return -1; > } Reviewed-by: Hannes Schmelzer <oe5hpm@oevsv.at> Acked-by: Hannes Schmelzer <oe5hpm@oevsv.at>
On Fri, May 05, 2017 at 08:57:32PM +0200, xypron.glpk@gmx.de wrote: > The logical expression to check the dtb is incorrect in > load_devicetree. > > The problem was indicated by cppcheck. > > The inconsistent variable name dtppart is changed to dtbpart. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > Reviewed-by: Hannes Schmelzer <oe5hpm@oevsv.at> > Acked-by: Hannes Schmelzer <oe5hpm@oevsv.at> Applied to u-boot/master, thanks!
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c index 876150402c..5cc82c9473 100644 --- a/board/BuR/common/common.c +++ b/board/BuR/common/common.c @@ -264,13 +264,13 @@ static int load_devicetree(void) #else char *dtbname = getenv("dtb"); char *dtbdev = getenv("dtbdev"); - char *dtppart = getenv("dtbpart"); - if (!dtbdev || !dtbdev || !dtbname) { + char *dtbpart = getenv("dtbpart"); + if (!dtbdev || !dtbpart || !dtbname) { printf("%s: <dtbdev>/<dtbpart>/<dtb> missing.\n", __func__); return -1; } - if (fs_set_blk_dev(dtbdev, dtppart, FS_TYPE_EXT)) { + if (fs_set_blk_dev(dtbdev, dtbpart, FS_TYPE_EXT)) { puts("load_devicetree: set_blk_dev failed.\n"); return -1; }
The logical expression to check the dtb is incorrect in load_devicetree. The problem was indicated by cppcheck. The inconsistent variable name dtppart is changed to dtbpart. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- v2: fix syntax error due to incorrect spelling of variable Building was checked with buildman $ buildman -k brxre1 boards.cfg is up to date. Nothing to do. Building current source for 1 boards (1 thread, 4 jobs per thread) 1 0 0 /1 brxre1 $ buildman -k brppt1 boards.cfg is up to date. Nothing to do. Building current source for 3 boards (3 threads, 2 jobs per thread) 3 0 0 /3 0:00:45 : brppt1_nand I do not have a BuR board available for actual testing. v1: Original patch https://patchwork.ozlabs.org/patch/758237/ --- board/BuR/common/common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)