arm: mxs: Preprocess u-boot.bd so they contain full path
The u-boot-imx23.bd and u-boot-imx28.bd need to be preprocessed, otherwise they have issues with out-of-tree build where elftosb tool couldn't sometimes find the u-boot.bin and spl/u-boot-spl.bin . Preprocess these .bd files with sed and insert full path to u-boot.bin and spl/u-boot-spl.bin to prevent this issue. Moreover, to avoid adding more churn into main Makefile, move all this preprocessing and u-boot.sb generation into CPU directory instead. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Otavio Salvador <otavio@ossystems.com.br>utp
parent
dd3ecf020e
commit
714dc001fc
|
@ -46,6 +46,7 @@
|
||||||
/u-boot.ais
|
/u-boot.ais
|
||||||
/u-boot.dtb
|
/u-boot.dtb
|
||||||
/u-boot.sb
|
/u-boot.sb
|
||||||
|
/u-boot.bd
|
||||||
/u-boot.geany
|
/u-boot.geany
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
7
Makefile
7
Makefile
|
@ -512,13 +512,9 @@ $(obj)u-boot.ais: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img
|
||||||
cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.img > \
|
cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.img > \
|
||||||
$(obj)u-boot.ais
|
$(obj)u-boot.ais
|
||||||
|
|
||||||
# Specify the target for use in elftosb call
|
|
||||||
ELFTOSB_TARGET-$(CONFIG_MX23) = imx23
|
|
||||||
ELFTOSB_TARGET-$(CONFIG_MX28) = imx28
|
|
||||||
|
|
||||||
$(obj)u-boot.sb: $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
|
$(obj)u-boot.sb: $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
|
||||||
elftosb -zf $(ELFTOSB_TARGET-y) -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd \
|
$(MAKE) -C $(SRCTREE)/$(CPUDIR)/$(SOC)/ $(OBJTREE)/u-boot.sb
|
||||||
-o $(obj)u-boot.sb
|
|
||||||
|
|
||||||
# On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
|
# On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
|
||||||
# Both images are created using mkimage (crc etc), so that the ROM
|
# Both images are created using mkimage (crc etc), so that the ROM
|
||||||
|
@ -849,6 +845,7 @@ clobber: tidy
|
||||||
@rm -f $(obj)u-boot.ais
|
@rm -f $(obj)u-boot.ais
|
||||||
@rm -f $(obj)u-boot.dtb
|
@rm -f $(obj)u-boot.dtb
|
||||||
@rm -f $(obj)u-boot.sb
|
@rm -f $(obj)u-boot.sb
|
||||||
|
@rm -f $(obj)u-boot.bd
|
||||||
@rm -f $(obj)u-boot.spr
|
@rm -f $(obj)u-boot.spr
|
||||||
@rm -f $(obj)nand_spl/{u-boot.{lds,lst},System.map}
|
@rm -f $(obj)nand_spl/{u-boot.{lds,lst},System.map}
|
||||||
@rm -f $(obj)nand_spl/{u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map}
|
@rm -f $(obj)nand_spl/{u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map}
|
||||||
|
|
|
@ -40,6 +40,16 @@ all: $(obj).depend $(LIB)
|
||||||
$(LIB): $(OBJS)
|
$(LIB): $(OBJS)
|
||||||
$(call cmd_link_o_target, $(OBJS))
|
$(call cmd_link_o_target, $(OBJS))
|
||||||
|
|
||||||
|
# Specify the target for use in elftosb call
|
||||||
|
ELFTOSB_TARGET-$(CONFIG_MX23) = imx23
|
||||||
|
ELFTOSB_TARGET-$(CONFIG_MX28) = imx28
|
||||||
|
|
||||||
|
$(OBJTREE)/u-boot.bd: $(SRCTREE)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd
|
||||||
|
sed "s@OBJTREE@$(OBJTREE)@g" $^ > $@
|
||||||
|
|
||||||
|
$(OBJTREE)/u-boot.sb: $(OBJTREE)/u-boot.bin $(OBJTREE)/spl/u-boot-spl.bin $(OBJTREE)/u-boot.bd
|
||||||
|
elftosb -zf $(ELFTOSB_TARGET-y) -c $(OBJTREE)/u-boot.bd -o $(OBJTREE)/u-boot.sb
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
|
||||||
# defines $(obj).depend target
|
# defines $(obj).depend target
|
||||||
|
|
|
@ -4,8 +4,8 @@ options {
|
||||||
}
|
}
|
||||||
|
|
||||||
sources {
|
sources {
|
||||||
u_boot_spl="spl/u-boot-spl.bin";
|
u_boot_spl="OBJTREE/spl/u-boot-spl.bin";
|
||||||
u_boot="u-boot.bin";
|
u_boot="OBJTREE/u-boot.bin";
|
||||||
}
|
}
|
||||||
|
|
||||||
section (0) {
|
section (0) {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
sources {
|
sources {
|
||||||
u_boot_spl="spl/u-boot-spl.bin";
|
u_boot_spl="OBJTREE/spl/u-boot-spl.bin";
|
||||||
u_boot="u-boot.bin";
|
u_boot="OBJTREE/u-boot.bin";
|
||||||
}
|
}
|
||||||
|
|
||||||
section (0) {
|
section (0) {
|
||||||
|
|
Loading…
Reference in New Issue