All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [git commit] board/freescale/common/imx: add support for i.MX8
@ 2020-02-05 11:25 Thomas Petazzoni
  2020-02-12 15:18 ` Fabio Estevam
  0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2020-02-05 11:25 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=3f8ace002831a01ed6aec59b704bd92c8a3b957f
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Signed-off-by: Maeva Manuel <maeva.manuel@nxp.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 board/freescale/common/imx/imx8-bootloader-prepare.sh | 7 +++++--
 board/freescale/common/imx/post-image.sh              | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh
index cbf741af30..302fd00658 100755
--- a/board/freescale/common/imx/imx8-bootloader-prepare.sh
+++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh
@@ -27,8 +27,11 @@ main ()
 		cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin
 		cp ${BINARIES_DIR}/bl31.bin ${BINARIES_DIR}/u-boot-atf.bin
 		dd if=${BINARIES_DIR}/u-boot-hash.bin of=${BINARIES_DIR}/u-boot-atf.bin bs=1K seek=128
-
-		${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
+		if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then
+			${HOST_DIR}/bin/mkimage_imx8 -soc QM -rev B0 -append ${BINARIES_DIR}/mx8qm-ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qm-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a53 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
+		else
+			${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/mx8qx-ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
+		fi
 	fi
 
 	exit $?
diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh
index 19d8fffb63..138ea7b123 100755
--- a/board/freescale/common/imx/post-image.sh
+++ b/board/freescale/common/imx/post-image.sh
@@ -32,7 +32,9 @@ linux_image()
 
 genimage_type()
 {
-	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
+	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then
+		echo "genimage.cfg.template_imx8"
+	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_imx8"
 	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_imx8"

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [git commit] board/freescale/common/imx: add support for i.MX8
  2020-02-12 15:18 ` Fabio Estevam
@ 2020-02-12 15:18   ` Thomas Petazzoni
  2020-02-12 15:28     ` Fabio Estevam
  0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2020-02-12 15:18 UTC (permalink / raw)
  To: buildroot

Hello Fabio,

On Wed, 12 Feb 2020 12:18:37 -0300
Fabio Estevam <festevam@gmail.com> wrote:

> This commit breaks the freescale_imx8qxpmek_defconfig target:
> 
> 774122 bytes (774 kB, 756 KiB) copied, 0,00407387 s, 190 MB/s
> AP file_offset = 0x25000 size = 0xbd000
> Can't open /home/fabio/buildroot/output/images/mx8qx-ahab-container.img:
> No such file or directory
> Makefile:806: recipe for target 'target-post-image' failed
> make: *** [target-post-image] Error 1
> 
> Reverting it make the build work again.
> 
> Please fix it.

It's my fault for applying only parts of Maeva's patches, because some
of the patches had already been applied in a different form.

Could you try this:

diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh
index 302fd00658..45c648e360 100755
--- a/board/freescale/common/imx/imx8-bootloader-prepare.sh
+++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh
@@ -28,9 +28,9 @@ main ()
                cp ${BINARIES_DIR}/bl31.bin ${BINARIES_DIR}/u-boot-atf.bin
                dd if=${BINARIES_DIR}/u-boot-hash.bin of=${BINARIES_DIR}/u-boot-atf.bin bs=1K seek=128
                if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then
-                       ${HOST_DIR}/bin/mkimage_imx8 -soc QM -rev B0 -append ${BINARIES_DIR}/mx8qm-ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qm-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a53 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
+                       ${HOST_DIR}/bin/mkimage_imx8 -soc QM -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qm-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a53 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
                else
-                       ${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/mx8qx-ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
+                       ${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
                fi
        fi
 

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [git commit] board/freescale/common/imx: add support for i.MX8
  2020-02-05 11:25 [Buildroot] [git commit] board/freescale/common/imx: add support for i.MX8 Thomas Petazzoni
@ 2020-02-12 15:18 ` Fabio Estevam
  2020-02-12 15:18   ` Thomas Petazzoni
  0 siblings, 1 reply; 6+ messages in thread
From: Fabio Estevam @ 2020-02-12 15:18 UTC (permalink / raw)
  To: buildroot

Hi Maeva,

On Wed, Feb 5, 2020 at 8:25 AM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> commit: https://git.buildroot.net/buildroot/commit/?id=3f8ace002831a01ed6aec59b704bd92c8a3b957f
> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>
> Signed-off-by: Maeva Manuel <maeva.manuel@nxp.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

This commit breaks the freescale_imx8qxpmek_defconfig target:

774122 bytes (774 kB, 756 KiB) copied, 0,00407387 s, 190 MB/s
AP file_offset = 0x25000 size = 0xbd000
Can't open /home/fabio/buildroot/output/images/mx8qx-ahab-container.img:
No such file or directory
Makefile:806: recipe for target 'target-post-image' failed
make: *** [target-post-image] Error 1

Reverting it make the build work again.

Please fix it.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [git commit] board/freescale/common/imx: add support for i.MX8
  2020-02-12 15:18   ` Thomas Petazzoni
@ 2020-02-12 15:28     ` Fabio Estevam
  2020-02-14  9:45       ` Peter Korsgaard
  2020-02-19 23:41       ` Fabio Estevam
  0 siblings, 2 replies; 6+ messages in thread
From: Fabio Estevam @ 2020-02-12 15:28 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

On Wed, Feb 12, 2020 at 12:18 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:

> It's my fault for applying only parts of Maeva's patches, because some
> of the patches had already been applied in a different form.
>
> Could you try this:

This fixes the build issue. Also did a boot test and it works fine:

Tested-by: Fabio Estevam <festevam@gmail.com>

Thanks

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [git commit] board/freescale/common/imx: add support for i.MX8
  2020-02-12 15:28     ` Fabio Estevam
@ 2020-02-14  9:45       ` Peter Korsgaard
  2020-02-19 23:41       ` Fabio Estevam
  1 sibling, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2020-02-14  9:45 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabio" == Fabio Estevam <festevam@gmail.com> writes:

 > Hi Thomas,
 > On Wed, Feb 12, 2020 at 12:18 PM Thomas Petazzoni
 > <thomas.petazzoni@bootlin.com> wrote:

 >> It's my fault for applying only parts of Maeva's patches, because some
 >> of the patches had already been applied in a different form.
 >> 
 >> Could you try this:

 > This fixes the build issue. Also did a boot test and it works fine:

 > Tested-by: Fabio Estevam <festevam@gmail.com>

Great. Thomas, can you send a real patch for this?

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [git commit] board/freescale/common/imx: add support for i.MX8
  2020-02-12 15:28     ` Fabio Estevam
  2020-02-14  9:45       ` Peter Korsgaard
@ 2020-02-19 23:41       ` Fabio Estevam
  1 sibling, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2020-02-19 23:41 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

On Wed, Feb 12, 2020 at 12:28 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> Hi Thomas,
>
> On Wed, Feb 12, 2020 at 12:18 PM Thomas Petazzoni
> <thomas.petazzoni@bootlin.com> wrote:
>
> > It's my fault for applying only parts of Maeva's patches, because some
> > of the patches had already been applied in a different form.
> >
> > Could you try this:
>
> This fixes the build issue. Also did a boot test and it works fine:
>
> Tested-by: Fabio Estevam <festevam@gmail.com>

Do you plan to submit this as a formal patch?

Thanks

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-02-19 23:41 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-05 11:25 [Buildroot] [git commit] board/freescale/common/imx: add support for i.MX8 Thomas Petazzoni
2020-02-12 15:18 ` Fabio Estevam
2020-02-12 15:18   ` Thomas Petazzoni
2020-02-12 15:28     ` Fabio Estevam
2020-02-14  9:45       ` Peter Korsgaard
2020-02-19 23:41       ` Fabio Estevam

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.