[U-Boot] SiFive FU540 U-Boot patches,

[Anup Patel]

On Mon, Feb 25, 2019 at 7:50 AM Rick Chen <rickchen36 at gmail.com> wrote:
>
> Hi Anup
>
> Rick Chen <rickchen36 at gmail.com> 於 2019年2月22日 週五 下午12:05寫道：
> >
> > Hi Anup
> >
> > Anup Patel <anup at brainfault.org> 於 2019年2月21日 週四 下午5:57寫道：
> >
> > >
> > > On Thu, Feb 21, 2019 at 11:31 AM Bin Meng <bmeng.cn at gmail.com> wrote:
> > > >
> > > > On Thu, Feb 21, 2019 at 12:48 PM Anup Patel <anup at brainfault.org> wrote:
> > > > >
> > > > > Hi Rick,
> > > > >
> > > > > On Fri, Feb 15, 2019 at 10:19 AM Rick Chen <rickchen36 at gmail.com> wrote:
> > > > > >
> > > > > > Hi Anup
> > > > > >
> > > > > > > > Hi All,
> > > > > > > >
> > > > > > > > Thanks for all the review comments so far.
> > > > > > > >
> > > > > > > > Is it possible to accept "[PATCH v7 00/15] SiFive FU540 Support" for
> > > > > > > > U-Boot-2019.04 ??
> > > > > > > >
> > > > > > > > Based on our discussion with various folks at FOSDEM19, lot of people want to
> > > > > > > > use U-Boot on Unleashed board. In general, it will be exciting to see U-Boot being
> > > > > > > > adopted as bootloader by various RISC-V HW vendors.
> > > > > >
> > > > > > I am still waiting for Simon's response about the two patchs
> > > > > > that he have comments.
> > > > >
> > > > > I have addressed Simon's patches and got Reviewed-by as well.
> > > > >
> > > > > I have posted "[PATCH v9 00/15] SiFive FU540 Support" which
> > > > > is based on U-Boot-2019.4-rc2.
> > > > >
> > > > > You can also find this patches in riscv_sifive_fu540_v9 branch of
> > > > > https://github.com/avpatel/u-boot.git
> > > >
> > > > Thanks for the support and hopefully we can get this one plus Lukas's
> > > > SMP series in the v2019.04 release.
> > >
> > > It will be awesome to have Lukas's SMP patches along with
> > > SiFive FU540 patches in v2019.04
> > >
> >
> > OK
> > I will pull into u-boot-riscv and run Travis.
>
> Can you take a look this Travis fail item 12.44 as below
> https://travis-ci.org/rickchen36/u-boot-riscv/jobs/496911491

Ahh, this issue got introduced when I removed "#if" (Suggested by Alex)
from clk_fixed_factor_ofdata_to_platdata() in v3 of this patchset.

I suggest we bring back the "#if" by modifying PATCH9 with following
additional change:

diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/clk_fixed_factor.c
index 9e00544889..5fa20a84db 100644
--- a/drivers/clk/clk_fixed_factor.c
+++ b/drivers/clk/clk_fixed_factor.c
@@ -42,6 +42,7 @@ const struct clk_ops clk_fixed_factor_ops = {

 static int clk_fixed_factor_ofdata_to_platdata(struct udevice *dev)
 {
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
        int err;
        struct clk_fixed_factor *ff = to_clk_fixed_factor(dev);

@@ -51,6 +52,7 @@ static int
clk_fixed_factor_ofdata_to_platdata(struct udevice *dev)

        ff->div = dev_read_u32_default(dev, "clock-div", 1);
        ff->mult = dev_read_u32_default(dev, "clock-mult", 1);
+#endif

        return 0;
 }

The above will resolve Travis build fail.

Regards,
Anup

>
> Thanks
> Rick