| Message ID | 20170710200411.24276-1-otavio@ossystems.com.br |
|---|---|
| State | Changes Requested |
| Delegated to: | Stefano Babic |
| Headers | show |
On Mon, Jul 10, 2017 at 5:04 PM, Otavio Salvador <otavio@ossystems.com.br> wrote: > From: Fabio Berton <fabio.berton@ossystems.com.br> > > New kernel linux-wandboard version 4.1.15_1.1.0_ga changed device tree > name adding board revision on file name. The new names are: > > - imx6dl-wandboard-revb1 > - imx6dl-wandboard-revc1 > - imx6q-wandboard-revb1 > - imx6q-wandboard-revc1 > > This fixes the Wandboard C1 revision device tree files. > > Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > > 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 2a6c6fbb70..4291be4068 100644 > --- a/include/configs/wandboard.h > +++ b/include/configs/wandboard.h > @@ -105,9 +105,9 @@ > "fi\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; " \ This breaks the usage of mainline kernel as there is no -revc1 suffix in the wandboard dtb files there. linux-wandboard needs to rename the dts files like mainline does: imx6q-wandboard.dtb (for rev C1) imx6q-wandboard-revb1.dtb imx6dl-wandboard.dtb (for rev C1) imx6dl-wandboard-revb1.dtb If they can't rename their dts, then they would need to carry this patch on their own U-Boot tree.
On Mon, Jul 10, 2017 at 5:14 PM, Fabio Estevam <festevam@gmail.com> wrote: > On Mon, Jul 10, 2017 at 5:04 PM, Otavio Salvador > <otavio@ossystems.com.br> wrote: >> From: Fabio Berton <fabio.berton@ossystems.com.br> >> >> New kernel linux-wandboard version 4.1.15_1.1.0_ga changed device tree >> name adding board revision on file name. The new names are: >> >> - imx6dl-wandboard-revb1 >> - imx6dl-wandboard-revc1 >> - imx6q-wandboard-revb1 >> - imx6q-wandboard-revc1 >> >> This fixes the Wandboard C1 revision device tree files. >> >> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> >> --- >> >> 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 2a6c6fbb70..4291be4068 100644 >> --- a/include/configs/wandboard.h >> +++ b/include/configs/wandboard.h >> @@ -105,9 +105,9 @@ >> "fi\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; " \ > > This breaks the usage of mainline kernel as there is no -revc1 suffix > in the wandboard dtb files there. > > linux-wandboard needs to rename the dts files like mainline does: > > imx6q-wandboard.dtb (for rev C1) > imx6q-wandboard-revb1.dtb > imx6dl-wandboard.dtb (for rev C1) > imx6dl-wandboard-revb1.dtb > > If they can't rename their dts, then they would need to carry this > patch on their own U-Boot tree. No problem; I am sending it here so people can look and if there is interest possibly help improving Wandboard kernel. We carry this on u-boot-fslc fork so it is fine for me.
On Mon, Jul 10, 2017 at 3:30 PM, Otavio Salvador <otavio.salvador@ossystems.com.br> wrote: > On Mon, Jul 10, 2017 at 5:14 PM, Fabio Estevam <festevam@gmail.com> wrote: >> On Mon, Jul 10, 2017 at 5:04 PM, Otavio Salvador >> <otavio@ossystems.com.br> wrote: >>> From: Fabio Berton <fabio.berton@ossystems.com.br> >>> >>> New kernel linux-wandboard version 4.1.15_1.1.0_ga changed device tree >>> name adding board revision on file name. The new names are: >>> >>> - imx6dl-wandboard-revb1 >>> - imx6dl-wandboard-revc1 >>> - imx6q-wandboard-revb1 >>> - imx6q-wandboard-revc1 >>> >>> This fixes the Wandboard C1 revision device tree files. >>> >>> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> >>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> >>> --- >>> >>> 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 2a6c6fbb70..4291be4068 100644 >>> --- a/include/configs/wandboard.h >>> +++ b/include/configs/wandboard.h >>> @@ -105,9 +105,9 @@ >>> "fi\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; " \ >> >> This breaks the usage of mainline kernel as there is no -revc1 suffix >> in the wandboard dtb files there. >> >> linux-wandboard needs to rename the dts files like mainline does: >> >> imx6q-wandboard.dtb (for rev C1) >> imx6q-wandboard-revb1.dtb >> imx6dl-wandboard.dtb (for rev C1) >> imx6dl-wandboard-revb1.dtb >> >> If they can't rename their dts, then they would need to carry this >> patch on their own U-Boot tree. > > No problem; I am sending it here so people can look and if there is > interest possibly help improving Wandboard kernel. We carry this on > u-boot-fslc fork so it is fine for me. How do you guys want to do the revd1'? imx6<>-wandboard-revd1.dtb ? https://github.com/wandboard-org/linux/commit/e093a1186879eef78d91f22f1e47089565bde8e9 (let's make sure we don't rename the dtb like we did in the revb1 -> revc1 era, that was shortsighted mess) Regards,
On Mon, Jul 10, 2017 at 6:14 PM, Robert Nelson <robertcnelson@gmail.com> wrote: > How do you guys want to do the revd1'? > > imx6<>-wandboard-revd1.dtb ? > > https://github.com/wandboard-org/linux/commit/e093a1186879eef78d91f22f1e47089565bde8e9 Looking at this dts it seems we only need to add a imx6qp variant. The other revd1 changes do not affect mainline as far as I can see. I don't have access to a imx6qp wandboard myself to mainline the dts.
On Mon, Jul 10, 2017 at 4:24 PM, Fabio Estevam <festevam@gmail.com> wrote: > On Mon, Jul 10, 2017 at 6:14 PM, Robert Nelson <robertcnelson@gmail.com> wrote: > >> How do you guys want to do the revd1'? >> >> imx6<>-wandboard-revd1.dtb ? >> >> https://github.com/wandboard-org/linux/commit/e093a1186879eef78d91f22f1e47089565bde8e9 > > Looking at this dts it seems we only need to add a imx6qp variant. > > The other revd1 changes do not affect mainline as far as I can see. > > I don't have access to a imx6qp wandboard myself to mainline the dts. They added a real pmic, to the board: ;) https://github.com/wandboard-org/linux/commit/e093a1186879eef78d91f22f1e47089565bde8e9#diff-7ea50fb49a19acc65fa0f48cd855a153R328 I've recently picked up the quad/quadplus, but been to busy to test u-boot/kernel on it yet.. Regards,
Hi Otavio, Fabio, On 10/07/2017 22:04, Otavio Salvador wrote: > From: Fabio Berton <fabio.berton@ossystems.com.br> > > New kernel linux-wandboard version 4.1.15_1.1.0_ga changed device tree > name adding board revision on file name. The new names are: > > - imx6dl-wandboard-revb1 > - imx6dl-wandboard-revc1 > - imx6q-wandboard-revb1 > - imx6q-wandboard-revc1 > > This fixes the Wandboard C1 revision device tree files. > > Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > > 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 2a6c6fbb70..4291be4068 100644 > --- a/include/configs/wandboard.h > +++ b/include/configs/wandboard.h > @@ -105,9 +105,9 @@ > "fi\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 " \ > Fine with me - I will push the series to -next. Best regards, Stefano
Hi Stefano,
On Tue, Jul 11, 2017 at 7:57 AM, Stefano Babic <sbabic@denx.de> wrote:
> Fine with me - I will push the series to -next.
Please do not apply this one 1/4 as it will break the usage of U-Boot
with mainline kernel.
The other three patches are OK.
Thanks
On 11/07/2017 12:59, Fabio Estevam wrote: > Hi Stefano, > > On Tue, Jul 11, 2017 at 7:57 AM, Stefano Babic <sbabic@denx.de> wrote: > >> Fine with me - I will push the series to -next. > > Please do not apply this one 1/4 as it will break the usage of U-Boot > with mainline kernel. imx6dl-wandboard.dts is already for C1. Thanks for pointing this ! > > The other three patches are OK. Ok, they will be merged. Regards, Stefano
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 2a6c6fbb70..4291be4068 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -105,9 +105,9 @@ "fi\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 " \