| Message ID | 20210519151820.319379-10-green.wan@sifive.com |
|---|---|
| State | Superseded |
| Delegated to: | Andes |
| Headers | show |
| Series | Add FU740 chip and HiFive Unmatched board support | expand |
Hi Green, On Wed, May 19, 2021 at 11:19 PM Green Wan <green.wan@sifive.com> wrote: > > Update to use binman instead. > > Signed-off-by: Green Wan <green.wan@sifive.com> > --- > arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi | 1 + > board/sifive/unmatched/Kconfig | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi b/arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi > index 3dcd2b4987..c5475aa149 100644 > --- a/arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi > +++ b/arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi > @@ -3,6 +3,7 @@ > * Copyright (C) 2020-2021 SiFive, Inc > */ > > +#include "binman.dtsi" > #include "fu740-c000-u-boot.dtsi" > #include "fu740-hifive-unmatched-a00-ddr.dtsi" > > diff --git a/board/sifive/unmatched/Kconfig b/board/sifive/unmatched/Kconfig > index 9e2748ce1e..88b5883cae 100644 > --- a/board/sifive/unmatched/Kconfig > +++ b/board/sifive/unmatched/Kconfig > @@ -28,6 +28,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy > select SIFIVE_FU740 > select SUPPORT_SPL > select RESET_SIFIVE > + select BINMAN > imply CMD_DHCP > imply CMD_EXT2 > imply CMD_EXT4 I wonder if without this patch, does previous patches build? If not, you need to squash this patch into previous patches to keep bisectablility. Regards, Bin
Hi Bin, Thanks for the comment. Originally, I wanted to keep the binman change tracked separately. I'll give it a try and create the new patch if it doesn't. Regards, Green On Thu, May 20, 2021 at 9:57 AM Bin Meng <bmeng.cn@gmail.com> wrote: > Hi Green, > > On Wed, May 19, 2021 at 11:19 PM Green Wan <green.wan@sifive.com> wrote: > > > > Update to use binman instead. > > > > Signed-off-by: Green Wan <green.wan@sifive.com> > > --- > > arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi | 1 + > > board/sifive/unmatched/Kconfig | 1 + > > 2 files changed, 2 insertions(+) > > > > diff --git a/arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi > b/arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi > > index 3dcd2b4987..c5475aa149 100644 > > --- a/arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi > > +++ b/arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi > > @@ -3,6 +3,7 @@ > > * Copyright (C) 2020-2021 SiFive, Inc > > */ > > > > +#include "binman.dtsi" > > #include "fu740-c000-u-boot.dtsi" > > #include "fu740-hifive-unmatched-a00-ddr.dtsi" > > > > diff --git a/board/sifive/unmatched/Kconfig > b/board/sifive/unmatched/Kconfig > > index 9e2748ce1e..88b5883cae 100644 > > --- a/board/sifive/unmatched/Kconfig > > +++ b/board/sifive/unmatched/Kconfig > > @@ -28,6 +28,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy > > select SIFIVE_FU740 > > select SUPPORT_SPL > > select RESET_SIFIVE > > + select BINMAN > > imply CMD_DHCP > > imply CMD_EXT2 > > imply CMD_EXT4 > > I wonder if without this patch, does previous patches build? > > If not, you need to squash this patch into previous patches to keep > bisectablility. > > Regards, > Bin >
Hi Green, On Thu, May 20, 2021 at 11:10 AM Green Wan <green.wan@sifive.com> wrote: > > Hi Bin, > > Thanks for the comment. Originally, I wanted to keep the binman change tracked separately. I'll give it a try and create the new patch if it doesn't. > Yep, this situation is like previous FU740 PCIe driver. How we organize the patch depends on which patch goes first in the mainline :) Regards, Bin
On Thu, May 20, 2021 at 11:27 AM Bin Meng <bmeng.cn@gmail.com> wrote: > Hi Green, > > On Thu, May 20, 2021 at 11:10 AM Green Wan <green.wan@sifive.com> wrote: > > > > Hi Bin, > > > > Thanks for the comment. Originally, I wanted to keep the binman change > tracked separately. I'll give it a try and create the new patch if it > doesn't. > > > > Yep, this situation is like previous FU740 PCIe driver. How we > organize the patch depends on which patch goes first in the mainline > :) > Yes, I know that. =) Just give it a try and squash 'binman changes' to the previous patch. Thanks, Green > > Regards, > Bin >
diff --git a/arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi b/arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi index 3dcd2b4987..c5475aa149 100644 --- a/arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi +++ b/arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi @@ -3,6 +3,7 @@ * Copyright (C) 2020-2021 SiFive, Inc */ +#include "binman.dtsi" #include "fu740-c000-u-boot.dtsi" #include "fu740-hifive-unmatched-a00-ddr.dtsi" diff --git a/board/sifive/unmatched/Kconfig b/board/sifive/unmatched/Kconfig index 9e2748ce1e..88b5883cae 100644 --- a/board/sifive/unmatched/Kconfig +++ b/board/sifive/unmatched/Kconfig @@ -28,6 +28,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SIFIVE_FU740 select SUPPORT_SPL select RESET_SIFIVE + select BINMAN imply CMD_DHCP imply CMD_EXT2 imply CMD_EXT4
Update to use binman instead. Signed-off-by: Green Wan <green.wan@sifive.com> --- arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi | 1 + board/sifive/unmatched/Kconfig | 1 + 2 files changed, 2 insertions(+)