[PATCH] firmware: Fix dependencies for PBL

Sascha Hauer s.hauer at pengutronix.de
Fri Nov 13 02:48:25 EST 2020


On Thu, Nov 05, 2020 at 02:32:41PM +0100, Ahmad Fatoum wrote:
> Hello Sascha,
> 
> On 11/5/20 9:02 AM, Sascha Hauer wrote:
> > The firmware object files for PBL have the name %.gen-pbl.o, not
> > pbl-%.gen.o. Fix The dependencies so that the object files for PBL
> > get rebuilt when the firmware changes.
> > 
> > Fixes: ff047395b9 ("kbuild: rename pbl object pbl-*.o to *.pbl.o")
> 
> With this applied, there is one remaining instance:
> 
> $ egrep -I --exclude-dir=.git -r 'pbl-\S+\.[ao]' .
> ./common/Makefile:$(obj)/pbl-imd-barebox.o: include/generated/compile.h
> 
> This should be s/pbl-imd-barebox.o/imd-barebox.pbl.o/ as well, right?

Right, thanks for looking at it. I fixed that up.

Sascha

> 
> 
> > Reported-by: Rouven Czerwinski <r.czerwinski at pengutronix.de>
> > Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
> > ---
> >  firmware/Makefile | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/firmware/Makefile b/firmware/Makefile
> > index 0d1b445783..cc28c0fc39 100644
> > --- a/firmware/Makefile
> > +++ b/firmware/Makefile
> > @@ -55,7 +55,7 @@ $(patsubst %,$(obj)/%.gen.S, $(fw-external-y)): %: $(wordsize_deps) \
> >  $(patsubst %,$(obj)/%.gen.o, $(fw-external-y)): $(obj)/%.gen.o: $(fwdir)/%
> >  
> >  # The same for pbl:
> > -$(patsubst %,$(obj)/pbl-%.gen.o, $(fw-external-y)): $(obj)/pbl-%.gen.o: $(fwdir)/%
> > +$(patsubst %,$(obj)/%.gen.pbl.o, $(fw-external-y)): $(obj)/%.gen.pbl.o: $(fwdir)/%
> >  
> >  obj-pbl-y			 += $(patsubst %,%.gen.o, $(fw-external-y))
> >  
> > 
> 
> -- 
> Pengutronix e.K.                           |                             |
> Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



More information about the barebox mailing list