Hi Sean Tom Rini <tr...@konsulko.com> 於 2020年6月23日 週二 上午8:45寫道: > > On Mon, Jun 22, 2020 at 02:03:52PM +0800, Rick Chen wrote: > > Hi Tom > > > > > From: Tom Rini [mailto:tr...@konsulko.com] > > > Sent: Monday, May 25, 2020 11:40 PM > > > To: Open Source Project uboot > > > Cc: u-boot@lists.denx.de; Rick Jian-Zhi Chen(陳建志) > > > Subject: Re: [U-Boot] Pull request: u-boot-riscv/master > > > > > > On Mon, May 25, 2020 at 04:01:08PM +0800, ub...@andestech.com wrote: > > > > > > > Hi Tom, > > > > > > > > Please pull some riscv updates: > > > > > > > > - Add Sipeed Maix support. > > > > - sifive: fix palmer's email address. > > > > - Move all SMP related SBI calls to SBI_v01. > > > > > > > > https://travis-ci.org/github/rickchen36/u-boot-riscv/builds/690778926 > > > > > > > > Thanks > > > > Rick > > > > > > > > > > > > The following changes since commit > > > > 9c5fef577494769e3ff07952a85f9b7125ef765b: > > > > > > > > Merge git://git.denx.de/u-boot-usb (2020-05-22 22:58:50 -0400) > > > > > > > > are available in the Git repository at: > > > > > > > > g...@gitlab.denx.de:u-boot/custodians/u-boot-riscv.git > > > > > > > > for you to fetch changes up to 421c4eb2dcf39f65c31c1804369267ed8a7b5607: > > > > > > > > riscv: Add Sipeed Maix support (2020-05-25 10:01:21 +0800) > > > > > > > > > > There's too many generic changes in this PR for this late in the cycle, > > > for things I gather related to the Maix platform. All of the clk and DM > > > changes impact virtually all platforms. Please re-do this PR to drop the > > > Maix platform support for now, and resubmit that for -next, which I will > > > be opening shortly. Everything else however is good for master. > > > > May I ask for your suggestions about this patch series about "riscv: > > Add Sipeed Maix support " ? > > Shall I send a PR include this patch series in early release cycle or > > shall I suggest Sean to re-edit this patch series for less generic > > changes which may bring virtual impacts? > > So I looked over the generic changes again. There's no other way to > support the platform without those type of changes, yes? If so, yes, > lets put it in to -next.
Please rebase -next for upstream There are some conflicts needed to be fixed. Applying: clk: Always use the supplied struct clk Applying: clk: Check that ops of composite clock components exist before calling Applying: clk: Unconditionally recursively en-/dis-able clocks Applying: clk: Fix clk_get_by_* handling of index Applying: clk: Add K210 pll support Applying: clk: Add a bypass clock for K210 Applying: clk: Add K210 clock support Applying: dm: Add support for simple-pm-bus Applying: dm: Fix error handling for dev_read_addr_ptr Applying: reset: Add generic reset driver error: patch failed: configs/sandbox_defconfig:196 error: configs/sandbox_defconfig: patch does not apply Patch failed at 0010 reset: Add generic reset driver Thanks, Rick > > -- > Tom