| Message ID | 20220801154220.20068-1-pali@kernel.org |
|---|---|
| State | Accepted |
| Commit | d6c5bdb8794f5ee1b4f332f717ceed32a4510366 |
| Delegated to: | Marek Behun |
| Headers | show |
| Series | [1/2] Makefile: Fix dependency for u-boot-with-dtb.bin | expand |
On Mon, Aug 01, 2022 at 05:42:19PM +0200, Pali Rohár wrote: > Makefile uses binman to produce u-boot-with-dtb.bin target. As its input it > takes DTB file and u-boot binary without DTB, which is stored in file > u-boot-nodtb.bin. So fix target dependency. > > Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Tom Rini <trini@konsulko.com>
On Mon, 1 Aug 2022 at 09:43, Pali Rohár <pali@kernel.org> wrote: > > Makefile uses binman to produce u-boot-with-dtb.bin target. As its input it > takes DTB file and u-boot binary without DTB, which is stored in file > u-boot-nodtb.bin. So fix target dependency. > > Signed-off-by: Pali Rohár <pali@kernel.org> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index ff25f9297486..dcfcd7ebd5d2 100644 > --- a/Makefile > +++ b/Makefile > @@ -1628,7 +1628,7 @@ u-boot-with-nand-spl.sfp: u-boot-spl-padx4.sfp u-boot.img FORCE > endif > > ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy) > -u-boot-with-dtb.bin: u-boot.bin u-boot.dtb \ > +u-boot-with-dtb.bin: u-boot-nodtb.bin u-boot.dtb \ > $(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR), u-boot-br.bin) FORCE > $(call if_changed,binman) > > -- > 2.20.1 > Reviewed-by: Simon Glass <sjg@chromium.org> But I feel this should be dropped and be handled by the normal binman rule in the Makefile.
On Monday 01 August 2022 17:42:19 Pali Rohár wrote: > Makefile uses binman to produce u-boot-with-dtb.bin target. As its input it > takes DTB file and u-boot binary without DTB, which is stored in file > u-boot-nodtb.bin. So fix target dependency. > > Signed-off-by: Pali Rohár <pali@kernel.org> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index ff25f9297486..dcfcd7ebd5d2 100644 > --- a/Makefile > +++ b/Makefile > @@ -1628,7 +1628,7 @@ u-boot-with-nand-spl.sfp: u-boot-spl-padx4.sfp u-boot.img FORCE > endif > > ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy) > -u-boot-with-dtb.bin: u-boot.bin u-boot.dtb \ > +u-boot-with-dtb.bin: u-boot-nodtb.bin u-boot.dtb \ > $(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR), u-boot-br.bin) FORCE > $(call if_changed,binman) > > -- > 2.20.1 > PING? This fix is also waiting here for month.
On Wed, Aug 31, 2022 at 02:03:06PM +0200, Pali Rohár wrote: > On Monday 01 August 2022 17:42:19 Pali Rohár wrote: > > Makefile uses binman to produce u-boot-with-dtb.bin target. As its input it > > takes DTB file and u-boot binary without DTB, which is stored in file > > u-boot-nodtb.bin. So fix target dependency. > > > > Signed-off-by: Pali Rohár <pali@kernel.org> > > --- > > Makefile | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/Makefile b/Makefile > > index ff25f9297486..dcfcd7ebd5d2 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -1628,7 +1628,7 @@ u-boot-with-nand-spl.sfp: u-boot-spl-padx4.sfp u-boot.img FORCE > > endif > > > > ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy) > > -u-boot-with-dtb.bin: u-boot.bin u-boot.dtb \ > > +u-boot-with-dtb.bin: u-boot-nodtb.bin u-boot.dtb \ > > $(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR), u-boot-br.bin) FORCE > > $(call if_changed,binman) > > PING? This fix is also waiting here for month. Like all of your other PowerPC changes, Marek?
+ Peng Fan On Monday 01 August 2022 17:42:19 Pali Rohár wrote: > Makefile uses binman to produce u-boot-with-dtb.bin target. As its input it > takes DTB file and u-boot binary without DTB, which is stored in file > u-boot-nodtb.bin. So fix target dependency. > > Signed-off-by: Pali Rohár <pali@kernel.org> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index ff25f9297486..dcfcd7ebd5d2 100644 > --- a/Makefile > +++ b/Makefile > @@ -1628,7 +1628,7 @@ u-boot-with-nand-spl.sfp: u-boot-spl-padx4.sfp u-boot.img FORCE > endif > > ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy) > -u-boot-with-dtb.bin: u-boot.bin u-boot.dtb \ > +u-boot-with-dtb.bin: u-boot-nodtb.bin u-boot.dtb \ > $(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR), u-boot-br.bin) FORCE > $(call if_changed,binman) > > -- > 2.20.1 >
diff --git a/Makefile b/Makefile index ff25f9297486..dcfcd7ebd5d2 100644 --- a/Makefile +++ b/Makefile @@ -1628,7 +1628,7 @@ u-boot-with-nand-spl.sfp: u-boot-spl-padx4.sfp u-boot.img FORCE endif ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy) -u-boot-with-dtb.bin: u-boot.bin u-boot.dtb \ +u-boot-with-dtb.bin: u-boot-nodtb.bin u-boot.dtb \ $(if $(CONFIG_MPC85XX_HAVE_RESET_VECTOR), u-boot-br.bin) FORCE $(call if_changed,binman)
Makefile uses binman to produce u-boot-with-dtb.bin target. As its input it takes DTB file and u-boot binary without DTB, which is stored in file u-boot-nodtb.bin. So fix target dependency. Signed-off-by: Pali Rohár <pali@kernel.org> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)