| Message ID | BLU436-SMTP46BCB8C63151CD3166FBD1B9360@phx.gbl |
|---|---|
| State | Superseded |
| Headers | show |
Hi Adam, On Mon, Jul 18, 2016 at 10:45 AM, Adam Duskett <adamduskett@outlook.com> wrote: > With the release of kernel 4.1.15 for the imx6 line of processors, > wandboard now uses imx6q-wandboard-revc1.dtb and > imx6dl-wandboard-revc1.dtb. > This patch fixes the naming convention to work with kernel 4.1.15 > > Signed-off-by: Adam Duskett <adamduskett@outlook.com> > --- > include/configs/wandboard.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h > index 99f5c0c..d41b600 100644 > --- a/include/configs/wandboard.h > +++ b/include/configs/wandboard.h > @@ -135,9 +135,9 @@ > "setenv bootargs ${bootargs} ${fbmem}\0" \ > "findfdt="\ > "if test $board_name = C1 && test $board_rev = MX6Q ; then > " \ > - "setenv fdtfile imx6q-wandboard.dtb; fi; " \ > + "setenv fdtfile imx6q-wandboard-revc1.dtb; fi; " \ > "if test $board_name = C1 && test $board_rev = MX6DL ; > then " \ > - "setenv fdtfile imx6dl-wandboard.dtb; fi; " \ > + "setenv fdtfile imx6dl-wandboard-revc1.dtb; fi; " \ > "if test $board_name = B1 && test $board_rev = MX6Q ; then > " \ > "setenv fdtfile imx6q-wandboard-revb1.dtb; fi; " \ > "if test $board_name = B1 && test $board_rev = MX6DL ; > then " \ > NAK, This breaks mainline: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/Makefile?id=refs/tags/v4.7-rc7#n338 imx6dl-wandboard.dtb \ imx6dl-wandboard-revb1.dtb \ imx6q-wandboard.dtb \ imx6q-wandboard-revb1.dtb \ Regards,
On Mon, Jul 18, 2016 at 4:30 PM, Robert Nelson <robertcnelson@gmail.com> wrote: > NAK, This breaks mainline: > > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/Makefile?id=refs/tags/v4.7-rc7#n338 > > imx6dl-wandboard.dtb \ > imx6dl-wandboard-revb1.dtb \ > > > imx6q-wandboard.dtb \ > imx6q-wandboard-revb1.dtb \ Yes, we should not break mainline. It would be better if the 4.1.15 vendor dts just maps the revC1 dts to imx6q-wandboard.dtb.
Dear Adam Duskett, In message <BLU436-SMTP46BCB8C63151CD3166FBD1B9360@phx.gbl> you wrote: > With the release of kernel 4.1.15 for the imx6 line of processors, > wandboard now uses imx6q-wandboard-revc1.dtb and imx6dl-wandboard-revc1.dtb. > This patch fixes the naming convention to work with kernel 4.1.15 > > Signed-off-by: Adam Duskett <adamduskett@outlook.com> > --- > include/configs/wandboard.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h > index 99f5c0c..d41b600 100644 > --- a/include/configs/wandboard.h > +++ b/include/configs/wandboard.h > @@ -135,9 +135,9 @@ > "setenv bootargs ${bootargs} ${fbmem}\0" \ > "findfdt="\ > "if test $board_name = C1 && test $board_rev = MX6Q ; then " \ > - "setenv fdtfile imx6q-wandboard.dtb; fi; " \ > + "setenv fdtfile imx6q-wandboard-revc1.dtb; fi; " \ > "if test $board_name = C1 && test $board_rev = MX6DL ; then " \ > - "setenv fdtfile imx6dl-wandboard.dtb; fi; " \ > + "setenv fdtfile imx6dl-wandboard-revc1.dtb; fi; " \ > "if test $board_name = B1 && test $board_rev = MX6Q ; then " \ > "setenv fdtfile imx6q-wandboard-revb1.dtb; fi; " \ > "if test $board_name = B1 && test $board_rev = MX6DL ; then " \ Instead of adding to an ever growing list of names, would it not make sense to solve this programmatically, like by concatenating "i" + tolower($board_rev) + "-wandboard-rev" + tolower($board_name) + ".dtb"? I guess this would also result in shorter / faster script code? Best regards, Wolfgang Denk
Dear Wolfgang Denk > To: adamduskett@outlook.com > CC: u-boot@lists.denx.de > From: wd@denx.de > Subject: Re: [U-Boot] [PATCH 1/1] configs/wandboard.h: fix dtb file name for findfdt. > Date: Mon, 18 Jul 2016 21:47:05 +0200 > > Dear Adam Duskett, > > In message <BLU436-SMTP46BCB8C63151CD3166FBD1B9360@phx.gbl> you wrote: > > With the release of kernel 4.1.15 for the imx6 line of processors, > > wandboard now uses imx6q-wandboard-revc1.dtb and imx6dl-wandboard-revc1.dtb. > > This patch fixes the naming convention to work with kernel 4.1.15 > > > > Signed-off-by: Adam Duskett <adamduskett@outlook.com> > > --- > > include/configs/wandboard.h | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h > > index 99f5c0c..d41b600 100644 > > --- a/include/configs/wandboard.h > > +++ b/include/configs/wandboard.h > > @@ -135,9 +135,9 @@ > > "setenv bootargs ${bootargs} ${fbmem}\0" \ > > "findfdt="\ > > "if test $board_name = C1 && test $board_rev = MX6Q ; then " \ > > - "setenv fdtfile imx6q-wandboard.dtb; fi; " \ > > + "setenv fdtfile imx6q-wandboard-revc1.dtb; fi; " \ > > "if test $board_name = C1 && test $board_rev = MX6DL ; then " \ > > - "setenv fdtfile imx6dl-wandboard.dtb; fi; " \ > > + "setenv fdtfile imx6dl-wandboard-revc1.dtb; fi; " \ > > "if test $board_name = B1 && test $board_rev = MX6Q ; then " \ > > "setenv fdtfile imx6q-wandboard-revb1.dtb; fi; " \ > > "if test $board_name = B1 && test $board_rev = MX6DL ; then " \ > > Instead of adding to an ever growing list of names, would it not make > sense to solve this programmatically, like by concatenating "i" + > tolower($board_rev) + "-wandboard-rev" + tolower($board_name) + ".dtb"? > > I guess this would also result in shorter / faster script code? > > Best regards, > > Wolfgang Denk That's a far better way to do it. I will send a patch tomorrow! > > -- > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de > Boykottiert Microsoft - Kauft Eure Fenster bei OBI! Adam Duskett
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 99f5c0c..d41b600 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -135,9 +135,9 @@ "setenv bootargs ${bootargs} ${fbmem}\0" \ "findfdt="\ "if test $board_name = C1 && test $board_rev = MX6Q ; then " \ - "setenv fdtfile imx6q-wandboard.dtb; fi; " \ + "setenv fdtfile imx6q-wandboard-revc1.dtb; fi; " \ "if test $board_name = C1 && test $board_rev = MX6DL ; then " \ - "setenv fdtfile imx6dl-wandboard.dtb; fi; " \ + "setenv fdtfile imx6dl-wandboard-revc1.dtb; fi; " \ "if test $board_name = B1 && test $board_rev = MX6Q ; then " \ "setenv fdtfile imx6q-wandboard-revb1.dtb; fi; " \ "if test $board_name = B1 && test $board_rev = MX6DL ; then " \
With the release of kernel 4.1.15 for the imx6 line of processors, wandboard now uses imx6q-wandboard-revc1.dtb and imx6dl-wandboard-revc1.dtb. This patch fixes the naming convention to work with kernel 4.1.15 Signed-off-by: Adam Duskett <adamduskett@outlook.com> --- include/configs/wandboard.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)