[U-Boot] [PATCH 1/2] imx: imx8qxp_mek: imximage: remove config.h

Discussion:

Peng Fan

2018-11-05 10:01:34 UTC

config.h is not needed, remove it.

Signed-off-by: Peng Fan <***@nxp.com>
---
board/freescale/imx8qxp_mek/imximage.cfg | 1 -
1 file changed, 1 deletion(-)

diff --git a/board/freescale/imx8qxp_mek/imximage.cfg b/board/freescale/imx8qxp_mek/imximage.cfg
index 9d39f25bf6..bbffb1a88f 100644
--- a/board/freescale/imx8qxp_mek/imximage.cfg
+++ b/board/freescale/imx8qxp_mek/imximage.cfg
@@ -7,7 +7,6 @@
*/

#define __ASSEMBLY__
-#include <config.h>

/* Boot from SD, sector size 0x400 */
BOOT_FROM SD 0x400

--
2.14.1

Peng Fan

2018-11-05 10:01:37 UTC

Permalink

Build u-boot-dtb.cfgout before checking files, otherwise
u-boot-dtb.cfgout is generated at late stage and cause final image not
generated.

Signed-off-by: Peng Fan <***@nxp.com>
---
arch/arm/mach-imx/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 72fe23a2b9..a3190ad2f0 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -89,7 +89,7 @@ IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%)
ifeq ($(CONFIG_ARCH_IMX8), y)
CNTR_DEPFILES := $(srctree)/tools/imx_cntr_image.sh
IMAGE_TYPE := imx8image
-DEPFILE_EXISTS := $(shell if [ -f u-boot-dtb.cfgout ]; then $(CNTR_DEPFILES) u-boot-dtb.cfgout; echo $$?; fi)
+DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o u-boot-dtb.cfgout $(srctree)/$(IMX_CONFIG); if [ -f u-boot-dtb.cfgout ]; then $(CNTR_DEPFILES) u-boot-dtb.cfgout; echo $$?; fi)
else
IMAGE_TYPE := imximage
DEPFILE_EXISTS := 0

--
2.14.1

Stefano Babic

2018-12-08 17:23:23 UTC

Permalink

Hi Peng,

Post by Peng Fan
Build u-boot-dtb.cfgout before checking files, otherwise
u-boot-dtb.cfgout is generated at late stage and cause final image not
generated.
---
arch/arm/mach-imx/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 72fe23a2b9..a3190ad2f0 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -89,7 +89,7 @@ IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%)
ifeq ($(CONFIG_ARCH_IMX8), y)
CNTR_DEPFILES := $(srctree)/tools/imx_cntr_image.sh
IMAGE_TYPE := imx8image
-DEPFILE_EXISTS := $(shell if [ -f u-boot-dtb.cfgout ]; then $(CNTR_DEPFILES) u-boot-dtb.cfgout; echo $$?; fi)
+DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o u-boot-dtb.cfgout $(srctree)/$(IMX_CONFIG); if [ -f u-boot-dtb.cfgout ]; then $(CNTR_DEPFILES) u-boot-dtb.cfgout; echo $$?; fi)
else
IMAGE_TYPE := imximage
DEPFILE_EXISTS := 0

This fixes an issue but it creates apparently a new one. After applying
this, the board is not built clean. It looks like it cannot find
ahab-container.img, even if it is present in my U-Boot directory.

+Fail open first container file ahab-container.img
+make[2]: *** [u-boot-dtb.imx] Error 1
+make[1]: *** [u-boot-dtb.imx] Error 2
+make: *** [sub-make] Error 2

Without it, build is fine.

Regards,
Stefano

--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: ***@denx.de
=====================================================================

Stefano Babic

2018-12-08 17:35:53 UTC

Permalink

Post by Peng Fan
config.h is not needed, remove it.
---
board/freescale/imx8qxp_mek/imximage.cfg | 1 -
1 file changed, 1 deletion(-)
diff --git a/board/freescale/imx8qxp_mek/imximage.cfg b/board/freescale/imx8qxp_mek/imximage.cfg
index 9d39f25bf6..bbffb1a88f 100644
--- a/board/freescale/imx8qxp_mek/imximage.cfg
+++ b/board/freescale/imx8qxp_mek/imximage.cfg
@@ -7,7 +7,6 @@
*/
#define __ASSEMBLY__
-#include <config.h>
/* Boot from SD, sector size 0x400 */
BOOT_FROM SD 0x400

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic