From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Korsgaard Date: Tue, 01 Jan 2019 16:29:38 +0100 Subject: [Buildroot] [PATCH 2/2] configs/freescale_imx7dsabresd: Apply upstream U-Boot fix In-Reply-To: <20181220165412.7982-2-festevam@gmail.com> (Fabio Estevam's message of "Thu, 20 Dec 2018 14:54:12 -0200") References: <20181220165412.7982-1-festevam@gmail.com> <20181220165412.7982-2-festevam@gmail.com> Message-ID: <87d0pgs8f1.fsf@dell.be.48ers.dk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net >>>>> "Fabio" == Fabio Estevam writes: > NXP U-Boot tree has the following build issue: > MKIMAGE u-boot-dtb.imx > Error: No BOOT_FROM tag in board/freescale/mx7dsabresd/imximage.cfg.cfgtmp > arch/arm/imx-common/Makefile:91: recipe for target 'u-boot-dtb.imx' failed > make[2]: *** [u-boot-dtb.imx] Error 1 > Makefile:877: recipe for target 'u-boot-dtb.imx' failed > This issue has been fixed by commit f916757300c1 ("imx: Create > distinct pre-processed mkimage config files"), so backport this > commit to the NXP U-Boot tree in order to fix the build error. > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/136980027 > Reported-by: Thomas Petazzoni > Signed-off-by: Fabio Estevam Committed to 2018.11.x, thanks. > --- > ...nct-pre-processed-mkimage-config-fil.patch | 89 +++++++++++++++++++ > configs/freescale_imx7dsabresd_defconfig | 3 + > 2 files changed, 92 insertions(+) > create mode 100644 board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch > diff --git a/board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch b/board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch > new file mode 100644 > index 0000000000..b8989cb965 > --- /dev/null > +++ b/board/freescale/imx7dsdb/patches/uboot/0001-imx-Create-distinct-pre-processed-mkimage-config-fil.patch > @@ -0,0 +1,89 @@ > +From 27a2cd6a1980adf3002412678c8fdec6528dc47d Mon Sep 17 00:00:00 2001 > +From: Trent Piepho > +Date: Fri, 6 Apr 2018 17:11:27 -0700 > +Subject: [PATCH] imx: Create distinct pre-processed mkimage config files > + > +Each imx image is created by a separate sub-make and during this process > +the mkimage config file is run though cpp. > + > +The cpp output is to the same file no matter what imx image is being > +created. > + > +This means if two imx images are generated in parallel they will attempt > +to independently produce the same pre-processed mkimage config file at > +the same time. > + > +Avoid the problem by making the pre-processed config file name unique > +based on the imx image it will be used in. This way each image will > +create a unique config file and they won't clobber each other when run > +in parallel. > + > +This should fixed the build bug referenced in b5b0e4e3 ("imximage: > +Remove failure when no IVT offset is found"). > + > +Cc: Breno Lima > +Cc: Thomas Petazzoni > +Cc: Fabio Estevam > +Signed-off-by: Trent Piepho > +Tested-by: Fabio Estevam > +[fabio: Adapted to imx_v2017.03_4.9.11_1.0.0_ga] > +Signed-off-by: Fabio Estevam > +--- > + arch/arm/imx-common/Makefile | 15 ++++++++------- > + 1 file changed, 8 insertions(+), 7 deletions(-) > + > +diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile > +index d862258..f1bae8d 100644 > +--- a/arch/arm/imx-common/Makefile > ++++ b/arch/arm/imx-common/Makefile > +@@ -69,9 +69,11 @@ endif > + quiet_cmd_cpp_cfg = CFGS $@ > + cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $< > + > +-IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%).cfgtmp > ++# mkimage source config file > ++IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%) > + > +-$(IMX_CONFIG): %.cfgtmp: % FORCE > ++# How to create a cpp processed config file, they all use the same source > ++%.cfgout: $(IMX_CONFIG) FORCE > + $(Q)mkdir -p $(dir $@) > + $(call if_changed_dep,cpp_cfg) > + > +@@ -79,7 +81,7 @@ MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imxim > + -e $(CONFIG_SYS_TEXT_BASE) > + u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log > + > +-u-boot.imx: u-boot.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE > ++u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE > + $(call if_changed,mkimage) > + > + ifeq ($(CONFIG_OF_SEPARATE),y) > +@@ -87,16 +89,15 @@ MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T i > + -e $(CONFIG_SYS_TEXT_BASE) > + u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log > + > +-u-boot-dtb.imx: u-boot-dtb.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE > ++u-boot-dtb.imx: u-boot-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE > + $(call if_changed,mkimage) > + endif > + > + MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \ > + -e $(CONFIG_SPL_TEXT_BASE) > +- > + SPL: MKIMAGEOUTPUT = SPL.log > + > +-SPL: spl/u-boot-spl.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE > ++SPL: spl/u-boot-spl.bin spl/u-boot-spl.cfgout $(PLUGIN).bin FORCE > + $(call if_changed,mkimage) > + > + MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \ > +@@ -124,4 +125,4 @@ cmd_u-boot-nand-spl_imx = (printf '\000\000\000\000\106\103\102\040\001' && \ > + spl/u-boot-nand-spl.imx: SPL FORCE > + $(call if_changed,u-boot-nand-spl_imx) > + > +-targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-spl.imx) > ++targets += $(addprefix ../../../,SPL spl/u-boot-spl.cfgout u-boot-dtb.cfgout u-boot.cfgout u-boot.uim spl/u-boot-nand-spl.imx) > +-- > +2.7.4 > + > diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig > index 3563d1e1b2..9d00a53eb8 100644 > --- a/configs/freescale_imx7dsabresd_defconfig > +++ b/configs/freescale_imx7dsabresd_defconfig > @@ -2,6 +2,9 @@ > BR2_arm=y > BR2_cortex_a7=y > +# patches > +BR2_GLOBAL_PATCH_DIR="board/freescale/imx7dsdb/patches" > + > # Linux headers same as kernel, a 4.9 series > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y > -- > 2.17.1 > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- Bye, Peter Korsgaard