| Message ID | 20180813073351.29293-3-simon.k.r.goldschmidt@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Marek Vasut |
| Headers | show |
| Series | Get socfpga gen5 SPL working again. | expand |
On Mon, Aug 13, 2018 at 09:33:45AM +0200, Simon Goldschmidt wrote: > Device trees need to have the serial console device available > before relocation and require a stdout-path in chosen at least > for SPL to have a console. > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> > --- > > Changes in v3: > - moved uart0's "u-boot,dm-pre-reloc;" from socfpga.dtsi to board > specific dts files since this can change per board Why are these not in socfpga-u-boot.dtsi ? We have the mechanism to grab CONFIG_SYS_CPU/CONFIG_SYS_SOC/CONFIG_SYS_VENDOR-u-boot.dtsi automatically so that we don't have to modify the files we sync in from upstream.
On Mon, Aug 13, 2018 at 3:17 PM Tom Rini <trini@konsulko.com> wrote: > > On Mon, Aug 13, 2018 at 09:33:45AM +0200, Simon Goldschmidt wrote: > > > Device trees need to have the serial console device available > > before relocation and require a stdout-path in chosen at least > > for SPL to have a console. > > > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> > > --- > > > > Changes in v3: > > - moved uart0's "u-boot,dm-pre-reloc;" from socfpga.dtsi to board > > specific dts files since this can change per board > > Why are these not in socfpga-u-boot.dtsi ? We have the mechanism to > grab CONFIG_SYS_CPU/CONFIG_SYS_SOC/CONFIG_SYS_VENDOR-u-boot.dtsi > automatically so that we don't have to modify the files we sync in from > upstream. Ehrm, I don't know, really. The DTS files for socfpga already have many U-Boot specifics and are quite different to Linux. It might make sense to sync them, but do we really have to do this for 2018.09? Keep in mind that this series exists to fix that 2018.07 broke on these boards. Simon
On Mon, Aug 13, 2018 at 03:25:19PM +0200, Simon Goldschmidt wrote: > On Mon, Aug 13, 2018 at 3:17 PM Tom Rini <trini@konsulko.com> wrote: > > > > On Mon, Aug 13, 2018 at 09:33:45AM +0200, Simon Goldschmidt wrote: > > > > > Device trees need to have the serial console device available > > > before relocation and require a stdout-path in chosen at least > > > for SPL to have a console. > > > > > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> > > > --- > > > > > > Changes in v3: > > > - moved uart0's "u-boot,dm-pre-reloc;" from socfpga.dtsi to board > > > specific dts files since this can change per board > > > > Why are these not in socfpga-u-boot.dtsi ? We have the mechanism to > > grab CONFIG_SYS_CPU/CONFIG_SYS_SOC/CONFIG_SYS_VENDOR-u-boot.dtsi > > automatically so that we don't have to modify the files we sync in from > > upstream. > > Ehrm, I don't know, really. The DTS files for socfpga already have > many U-Boot specifics and are quite different to Linux. It might make > sense to sync them, but do we really have to do this for 2018.09? > > Keep in mind that this series exists to fix that 2018.07 broke on these boards. Well, I think given that you're adding these changes right now, they should be added to the correct file so that they aren't lost on re-sync later. It would be adding: &uart0 { u-boot,dm-pre-reloc; }; once to arch/arm/dts/socfpga-u-boot.dtsi rather than for every board.
On 08/13/2018 03:28 PM, Tom Rini wrote: > On Mon, Aug 13, 2018 at 03:25:19PM +0200, Simon Goldschmidt wrote: >> On Mon, Aug 13, 2018 at 3:17 PM Tom Rini <trini@konsulko.com> wrote: >>> >>> On Mon, Aug 13, 2018 at 09:33:45AM +0200, Simon Goldschmidt wrote: >>> >>>> Device trees need to have the serial console device available >>>> before relocation and require a stdout-path in chosen at least >>>> for SPL to have a console. >>>> >>>> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> >>>> --- >>>> >>>> Changes in v3: >>>> - moved uart0's "u-boot,dm-pre-reloc;" from socfpga.dtsi to board >>>> specific dts files since this can change per board >>> >>> Why are these not in socfpga-u-boot.dtsi ? We have the mechanism to >>> grab CONFIG_SYS_CPU/CONFIG_SYS_SOC/CONFIG_SYS_VENDOR-u-boot.dtsi >>> automatically so that we don't have to modify the files we sync in from >>> upstream. >> >> Ehrm, I don't know, really. The DTS files for socfpga already have >> many U-Boot specifics and are quite different to Linux. It might make >> sense to sync them, but do we really have to do this for 2018.09? >> >> Keep in mind that this series exists to fix that 2018.07 broke on these boards. > > Well, I think given that you're adding these changes right now, they > should be added to the correct file so that they aren't lost on re-sync > later. It would be adding: > &uart0 { > u-boot,dm-pre-reloc; > }; > > once to arch/arm/dts/socfpga-u-boot.dtsi rather than for every board. Pulling the U-Boot specific crap would be most welcome, but it could be a separate patch.
On Mon, Aug 13, 2018 at 03:29:30PM +0200, Marek Vasut wrote: > On 08/13/2018 03:28 PM, Tom Rini wrote: > > On Mon, Aug 13, 2018 at 03:25:19PM +0200, Simon Goldschmidt wrote: > >> On Mon, Aug 13, 2018 at 3:17 PM Tom Rini <trini@konsulko.com> wrote: > >>> > >>> On Mon, Aug 13, 2018 at 09:33:45AM +0200, Simon Goldschmidt wrote: > >>> > >>>> Device trees need to have the serial console device available > >>>> before relocation and require a stdout-path in chosen at least > >>>> for SPL to have a console. > >>>> > >>>> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> > >>>> --- > >>>> > >>>> Changes in v3: > >>>> - moved uart0's "u-boot,dm-pre-reloc;" from socfpga.dtsi to board > >>>> specific dts files since this can change per board > >>> > >>> Why are these not in socfpga-u-boot.dtsi ? We have the mechanism to > >>> grab CONFIG_SYS_CPU/CONFIG_SYS_SOC/CONFIG_SYS_VENDOR-u-boot.dtsi > >>> automatically so that we don't have to modify the files we sync in from > >>> upstream. > >> > >> Ehrm, I don't know, really. The DTS files for socfpga already have > >> many U-Boot specifics and are quite different to Linux. It might make > >> sense to sync them, but do we really have to do this for 2018.09? > >> > >> Keep in mind that this series exists to fix that 2018.07 broke on these boards. > > > > Well, I think given that you're adding these changes right now, they > > should be added to the correct file so that they aren't lost on re-sync > > later. It would be adding: > > &uart0 { > > u-boot,dm-pre-reloc; > > }; > > > > once to arch/arm/dts/socfpga-u-boot.dtsi rather than for every board. > > Pulling the U-Boot specific crap would be most welcome, but it could be > a separate patch. So you want to add stuff now and pull it out later? That seems counter intuitive, but sure, you're the custodian here. When do you plan to do the clean-up, for v2018.11?
Tom Rini <trini@konsulko.com> schrieb am Mo., 13. Aug. 2018, 15:33: > On Mon, Aug 13, 2018 at 03:29:30PM +0200, Marek Vasut wrote: > > On 08/13/2018 03:28 PM, Tom Rini wrote: > > > On Mon, Aug 13, 2018 at 03:25:19PM +0200, Simon Goldschmidt wrote: > > >> On Mon, Aug 13, 2018 at 3:17 PM Tom Rini <trini@konsulko.com> wrote: > > >>> > > >>> On Mon, Aug 13, 2018 at 09:33:45AM +0200, Simon Goldschmidt wrote: > > >>> > > >>>> Device trees need to have the serial console device available > > >>>> before relocation and require a stdout-path in chosen at least > > >>>> for SPL to have a console. > > >>>> > > >>>> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> > > >>>> --- > > >>>> > > >>>> Changes in v3: > > >>>> - moved uart0's "u-boot,dm-pre-reloc;" from socfpga.dtsi to board > > >>>> specific dts files since this can change per board > > >>> > > >>> Why are these not in socfpga-u-boot.dtsi ? We have the mechanism to > > >>> grab CONFIG_SYS_CPU/CONFIG_SYS_SOC/CONFIG_SYS_VENDOR-u-boot.dtsi > > >>> automatically so that we don't have to modify the files we sync in > from > > >>> upstream. > > >> > > >> Ehrm, I don't know, really. The DTS files for socfpga already have > > >> many U-Boot specifics and are quite different to Linux. It might make > > >> sense to sync them, but do we really have to do this for 2018.09? > > >> > > >> Keep in mind that this series exists to fix that 2018.07 broke on > these boards. > > > > > > Well, I think given that you're adding these changes right now, they > > > should be added to the correct file so that they aren't lost on re-sync > > > later. It would be adding: > > > &uart0 { > > > u-boot,dm-pre-reloc; > > > }; > > > > > > once to arch/arm/dts/socfpga-u-boot.dtsi rather than for every board. > > > > Pulling the U-Boot specific crap would be most welcome, but it could be > > a separate patch. > > So you want to add stuff now and pull it out later? That seems counter > intuitive, but sure, you're the custodian here. When do you plan to do > the clean-up, for v2018.11? > Can we do this in one step with syncing up to the latest Linux device trees? Simon
On Mon, Aug 13, 2018 at 03:36:35PM +0200, Simon Goldschmidt wrote: > Tom Rini <trini@konsulko.com> schrieb am Mo., 13. Aug. 2018, 15:33: > > > On Mon, Aug 13, 2018 at 03:29:30PM +0200, Marek Vasut wrote: > > > On 08/13/2018 03:28 PM, Tom Rini wrote: > > > > On Mon, Aug 13, 2018 at 03:25:19PM +0200, Simon Goldschmidt wrote: > > > >> On Mon, Aug 13, 2018 at 3:17 PM Tom Rini <trini@konsulko.com> wrote: > > > >>> > > > >>> On Mon, Aug 13, 2018 at 09:33:45AM +0200, Simon Goldschmidt wrote: > > > >>> > > > >>>> Device trees need to have the serial console device available > > > >>>> before relocation and require a stdout-path in chosen at least > > > >>>> for SPL to have a console. > > > >>>> > > > >>>> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> > > > >>>> --- > > > >>>> > > > >>>> Changes in v3: > > > >>>> - moved uart0's "u-boot,dm-pre-reloc;" from socfpga.dtsi to board > > > >>>> specific dts files since this can change per board > > > >>> > > > >>> Why are these not in socfpga-u-boot.dtsi ? We have the mechanism to > > > >>> grab CONFIG_SYS_CPU/CONFIG_SYS_SOC/CONFIG_SYS_VENDOR-u-boot.dtsi > > > >>> automatically so that we don't have to modify the files we sync in > > from > > > >>> upstream. > > > >> > > > >> Ehrm, I don't know, really. The DTS files for socfpga already have > > > >> many U-Boot specifics and are quite different to Linux. It might make > > > >> sense to sync them, but do we really have to do this for 2018.09? > > > >> > > > >> Keep in mind that this series exists to fix that 2018.07 broke on > > these boards. > > > > > > > > Well, I think given that you're adding these changes right now, they > > > > should be added to the correct file so that they aren't lost on re-sync > > > > later. It would be adding: > > > > &uart0 { > > > > u-boot,dm-pre-reloc; > > > > }; > > > > > > > > once to arch/arm/dts/socfpga-u-boot.dtsi rather than for every board. > > > > > > Pulling the U-Boot specific crap would be most welcome, but it could be > > > a separate patch. > > > > So you want to add stuff now and pull it out later? That seems counter > > intuitive, but sure, you're the custodian here. When do you plan to do > > the clean-up, for v2018.11? > > > > Can we do this in one step with syncing up to the latest Linux device trees? I honestly don't understand the hesitation to not introduce more change than is required now. But, I will defer. I do want to know when people plan to fix this however, as that feels like a reasonable compromise to me.
On 08/13/2018 03:41 PM, Tom Rini wrote: > On Mon, Aug 13, 2018 at 03:36:35PM +0200, Simon Goldschmidt wrote: >> Tom Rini <trini@konsulko.com> schrieb am Mo., 13. Aug. 2018, 15:33: >> >>> On Mon, Aug 13, 2018 at 03:29:30PM +0200, Marek Vasut wrote: >>>> On 08/13/2018 03:28 PM, Tom Rini wrote: >>>>> On Mon, Aug 13, 2018 at 03:25:19PM +0200, Simon Goldschmidt wrote: >>>>>> On Mon, Aug 13, 2018 at 3:17 PM Tom Rini <trini@konsulko.com> wrote: >>>>>>> >>>>>>> On Mon, Aug 13, 2018 at 09:33:45AM +0200, Simon Goldschmidt wrote: >>>>>>> >>>>>>>> Device trees need to have the serial console device available >>>>>>>> before relocation and require a stdout-path in chosen at least >>>>>>>> for SPL to have a console. >>>>>>>> >>>>>>>> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> >>>>>>>> --- >>>>>>>> >>>>>>>> Changes in v3: >>>>>>>> - moved uart0's "u-boot,dm-pre-reloc;" from socfpga.dtsi to board >>>>>>>> specific dts files since this can change per board >>>>>>> >>>>>>> Why are these not in socfpga-u-boot.dtsi ? We have the mechanism to >>>>>>> grab CONFIG_SYS_CPU/CONFIG_SYS_SOC/CONFIG_SYS_VENDOR-u-boot.dtsi >>>>>>> automatically so that we don't have to modify the files we sync in >>> from >>>>>>> upstream. >>>>>> >>>>>> Ehrm, I don't know, really. The DTS files for socfpga already have >>>>>> many U-Boot specifics and are quite different to Linux. It might make >>>>>> sense to sync them, but do we really have to do this for 2018.09? >>>>>> >>>>>> Keep in mind that this series exists to fix that 2018.07 broke on >>> these boards. >>>>> >>>>> Well, I think given that you're adding these changes right now, they >>>>> should be added to the correct file so that they aren't lost on re-sync >>>>> later. It would be adding: >>>>> &uart0 { >>>>> u-boot,dm-pre-reloc; >>>>> }; >>>>> >>>>> once to arch/arm/dts/socfpga-u-boot.dtsi rather than for every board. >>>> >>>> Pulling the U-Boot specific crap would be most welcome, but it could be >>>> a separate patch. >>> >>> So you want to add stuff now and pull it out later? That seems counter >>> intuitive, but sure, you're the custodian here. When do you plan to do >>> the clean-up, for v2018.11? >>> >> >> Can we do this in one step with syncing up to the latest Linux device trees? > > I honestly don't understand the hesitation to not introduce more change > than is required now. But, I will defer. I do want to know when people > plan to fix this however, as that feels like a reasonable compromise to > me. I presume Simon will stick around, so I'm happy to cut him some slack ...
Tom Rini <trini@konsulko.com> schrieb am Mo., 13. Aug. 2018, 15:41: > On Mon, Aug 13, 2018 at 03:36:35PM +0200, Simon Goldschmidt wrote: > > Tom Rini <trini@konsulko.com> schrieb am Mo., 13. Aug. 2018, 15:33: > > > > > On Mon, Aug 13, 2018 at 03:29:30PM +0200, Marek Vasut wrote: > > > > On 08/13/2018 03:28 PM, Tom Rini wrote: > > > > > On Mon, Aug 13, 2018 at 03:25:19PM +0200, Simon Goldschmidt wrote: > > > > >> On Mon, Aug 13, 2018 at 3:17 PM Tom Rini <trini@konsulko.com> > wrote: > > > > >>> > > > > >>> On Mon, Aug 13, 2018 at 09:33:45AM +0200, Simon Goldschmidt > wrote: > > > > >>> > > > > >>>> Device trees need to have the serial console device available > > > > >>>> before relocation and require a stdout-path in chosen at least > > > > >>>> for SPL to have a console. > > > > >>>> > > > > >>>> Signed-off-by: Simon Goldschmidt < > simon.k.r.goldschmidt@gmail.com> > > > > >>>> --- > > > > >>>> > > > > >>>> Changes in v3: > > > > >>>> - moved uart0's "u-boot,dm-pre-reloc;" from socfpga.dtsi to > board > > > > >>>> specific dts files since this can change per board > > > > >>> > > > > >>> Why are these not in socfpga-u-boot.dtsi ? We have the > mechanism to > > > > >>> grab CONFIG_SYS_CPU/CONFIG_SYS_SOC/CONFIG_SYS_VENDOR-u-boot.dtsi > > > > >>> automatically so that we don't have to modify the files we sync > in > > > from > > > > >>> upstream. > > > > >> > > > > >> Ehrm, I don't know, really. The DTS files for socfpga already have > > > > >> many U-Boot specifics and are quite different to Linux. It might > make > > > > >> sense to sync them, but do we really have to do this for 2018.09? > > > > >> > > > > >> Keep in mind that this series exists to fix that 2018.07 broke on > > > these boards. > > > > > > > > > > Well, I think given that you're adding these changes right now, > they > > > > > should be added to the correct file so that they aren't lost on > re-sync > > > > > later. It would be adding: > > > > > &uart0 { > > > > > u-boot,dm-pre-reloc; > > > > > }; > > > > > > > > > > once to arch/arm/dts/socfpga-u-boot.dtsi rather than for every > board. > > > > > > > > Pulling the U-Boot specific crap would be most welcome, but it could > be > > > > a separate patch. > > > > > > So you want to add stuff now and pull it out later? That seems counter > > > intuitive, but sure, you're the custodian here. When do you plan to do > > > the clean-up, for v2018.11? > > > > > > > Can we do this in one step with syncing up to the latest Linux device > trees? > > I honestly don't understand the hesitation to not introduce more change > than is required now. But, I will defer. I do want to know when people > plan to fix this however, as that feels like a reasonable compromise to > me. > It's holiday season here so I can't say I'll be available all the time until the 2018.09 release. That's why I don't want to do changes I can't thoroughly test right now. I might try the sync in September. It should not be too much work, but I can only test one of the boards (the SoCrates). Simom
diff --git a/arch/arm/dts/socfpga_arria5_socdk.dts b/arch/arm/dts/socfpga_arria5_socdk.dts index 449ba9cbb9..6f4de2f563 100644 --- a/arch/arm/dts/socfpga_arria5_socdk.dts +++ b/arch/arm/dts/socfpga_arria5_socdk.dts @@ -11,6 +11,7 @@ chosen { bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; memory { @@ -99,3 +100,7 @@ cdns,tslch-ns = <4>; }; }; + +&uart0 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts b/arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts index aeb327dd5b..139a70f265 100644 --- a/arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts +++ b/arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts @@ -11,6 +11,7 @@ chosen { bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; aliases { @@ -56,3 +57,7 @@ disable-over-current; status = "okay"; }; + +&uart0 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts index f4a98e4bb0..d504150edd 100644 --- a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts +++ b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts @@ -11,6 +11,7 @@ chosen { bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; aliases { @@ -75,3 +76,7 @@ &usb1 { status = "okay"; }; + +&uart0 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/socfpga_cyclone5_de10_nano.dts b/arch/arm/dts/socfpga_cyclone5_de10_nano.dts index 7da2d8b043..d4dd9e9bca 100644 --- a/arch/arm/dts/socfpga_cyclone5_de10_nano.dts +++ b/arch/arm/dts/socfpga_cyclone5_de10_nano.dts @@ -13,6 +13,7 @@ chosen { bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; aliases { @@ -65,3 +66,7 @@ &usb1 { status = "okay"; }; + +&uart0 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/socfpga_cyclone5_de1_soc.dts b/arch/arm/dts/socfpga_cyclone5_de1_soc.dts index e6fadb4fc9..f62292284d 100644 --- a/arch/arm/dts/socfpga_cyclone5_de1_soc.dts +++ b/arch/arm/dts/socfpga_cyclone5_de1_soc.dts @@ -11,6 +11,7 @@ chosen { bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; aliases { @@ -63,3 +64,7 @@ &usb1 { status = "okay"; }; + +&uart0 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/socfpga_cyclone5_is1.dts b/arch/arm/dts/socfpga_cyclone5_is1.dts index aa1ce2c3e2..4e94d86114 100644 --- a/arch/arm/dts/socfpga_cyclone5_is1.dts +++ b/arch/arm/dts/socfpga_cyclone5_is1.dts @@ -11,6 +11,7 @@ chosen { bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; memory { @@ -102,3 +103,7 @@ &usb1 { status = "okay"; }; + +&uart0 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts index 55c70abb02..c28be67bb9 100644 --- a/arch/arm/dts/socfpga_cyclone5_socdk.dts +++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts @@ -11,6 +11,7 @@ chosen { bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; memory { @@ -113,3 +114,7 @@ &usb1 { status = "okay"; }; + +&uart0 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/socfpga_cyclone5_sockit.dts b/arch/arm/dts/socfpga_cyclone5_sockit.dts index 08d8356d80..c7a6cf2db8 100644 --- a/arch/arm/dts/socfpga_cyclone5_sockit.dts +++ b/arch/arm/dts/socfpga_cyclone5_sockit.dts @@ -11,6 +11,7 @@ chosen { bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; aliases { @@ -93,3 +94,7 @@ &usb1 { status = "okay"; }; + +&uart0 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts index 0d452ae300..8cde9906a0 100644 --- a/arch/arm/dts/socfpga_cyclone5_socrates.dts +++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts @@ -11,6 +11,7 @@ chosen { bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; aliases { @@ -84,3 +85,7 @@ disable-over-current; status = "okay"; }; + +&uart0 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/socfpga_cyclone5_sr1500.dts b/arch/arm/dts/socfpga_cyclone5_sr1500.dts index 341df7a3e7..86c61fe081 100644 --- a/arch/arm/dts/socfpga_cyclone5_sr1500.dts +++ b/arch/arm/dts/socfpga_cyclone5_sr1500.dts @@ -11,6 +11,7 @@ chosen { bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; aliases { @@ -67,6 +68,7 @@ &uart0 { status = "okay"; + u-boot,dm-pre-reloc; }; &usb1 { diff --git a/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts b/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts index 7a032af3a4..85ab56379f 100644 --- a/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts +++ b/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts @@ -11,6 +11,7 @@ chosen { bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; aliases { @@ -108,3 +109,7 @@ &usb1 { status = "okay"; }; + +&uart0 { + u-boot,dm-pre-reloc; +};
Device trees need to have the serial console device available before relocation and require a stdout-path in chosen at least for SPL to have a console. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> --- Changes in v3: - moved uart0's "u-boot,dm-pre-reloc;" from socfpga.dtsi to board specific dts files since this can change per board Changes in v2: None arch/arm/dts/socfpga_arria5_socdk.dts | 5 +++++ arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts | 5 +++++ arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts | 5 +++++ arch/arm/dts/socfpga_cyclone5_de10_nano.dts | 5 +++++ arch/arm/dts/socfpga_cyclone5_de1_soc.dts | 5 +++++ arch/arm/dts/socfpga_cyclone5_is1.dts | 5 +++++ arch/arm/dts/socfpga_cyclone5_socdk.dts | 5 +++++ arch/arm/dts/socfpga_cyclone5_sockit.dts | 5 +++++ arch/arm/dts/socfpga_cyclone5_socrates.dts | 5 +++++ arch/arm/dts/socfpga_cyclone5_sr1500.dts | 2 ++ arch/arm/dts/socfpga_cyclone5_vining_fpga.dts | 5 +++++ 11 files changed, 52 insertions(+)