* [Buildroot] [PATCH/next v3 1/6] package/freescale-imx: Add support for i.MX8X
2019-02-18 20:48 [Buildroot] [PATCH/next v3 0/6] Adding support for i.MX8QXP MEK board André Hentschel
@ 2019-02-18 20:48 ` André Hentschel
2019-02-23 15:34 ` Thomas Petazzoni
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 2/6] package/freescale-imx: Add imx-sc-firmware package André Hentschel
` (4 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: André Hentschel @ 2019-02-18 20:48 UTC (permalink / raw)
To: buildroot
From: Andr? Hentschel <andre.hentschel@zf.com>
Signed-off-by: Andr? Hentschel <andre.hentschel@zf.com>
---
package/freescale-imx/Config.in | 3 +++
package/freescale-imx/firmware-imx/firmware-imx.mk | 8 ++++++++
2 files changed, 11 insertions(+)
diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index 95c0aab08c..9001764437 100644
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -42,6 +42,9 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7
config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
bool "imx8m"
+
+config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X
+ bool "imx8x"
endchoice
config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
index f9db09dae8..0e2ff7bba2 100644
--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
+++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -45,6 +45,14 @@ define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
cp $(@D)/firmware/hdmi/cadence/signed_hdmi_imx8m.bin \
$(BINARIES_DIR)/signed_hdmi_imx8m.bin
endef
+else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y)
+FIRMWARE_IMX_INSTALL_IMAGES = YES
+define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
+ # SECO firmware is needed when generating imx8-boot-sd.bin which
+ # is done in post-image script.
+ cp $(@D)/firmware/seco/ahab-container.img \
+ $(BINARIES_DIR)/ahab-container.img
+endef
else
define FIRMWARE_IMX_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/lib/firmware/imx
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH/next v3 1/6] package/freescale-imx: Add support for i.MX8X
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 1/6] package/freescale-imx: Add support for i.MX8X André Hentschel
@ 2019-02-23 15:34 ` Thomas Petazzoni
0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2019-02-23 15:34 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 18 Feb 2019 21:48:02 +0100
Andr? Hentschel <nerv@dawncrow.de> wrote:
> From: Andr? Hentschel <andre.hentschel@zf.com>
>
> Signed-off-by: Andr? Hentschel <andre.hentschel@zf.com>
> ---
> package/freescale-imx/Config.in | 3 +++
> package/freescale-imx/firmware-imx/firmware-imx.mk | 8 ++++++++
> 2 files changed, 11 insertions(+)
I've applied to next, but after splitting into two commits: a first one
adding the new Config.in option, and another one adding i.MX8X support
to firmware-imx.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH/next v3 2/6] package/freescale-imx: Add imx-sc-firmware package
2019-02-18 20:48 [Buildroot] [PATCH/next v3 0/6] Adding support for i.MX8QXP MEK board André Hentschel
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 1/6] package/freescale-imx: Add support for i.MX8X André Hentschel
@ 2019-02-18 20:48 ` André Hentschel
2019-02-23 15:35 ` Thomas Petazzoni
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 3/6] package/imx-mkimage: Bump to rel_imx_4.14.78_1.0.0_ga André Hentschel
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: André Hentschel @ 2019-02-18 20:48 UTC (permalink / raw)
To: buildroot
From: Andr? Hentschel <andre.hentschel@zf.com>
Signed-off-by: Andr? Hentschel <andre.hentschel@zf.com>
---
DEVELOPERS | 1 +
package/freescale-imx/Config.in | 1 +
.../freescale-imx/imx-sc-firmware/Config.in | 8 ++++++
.../imx-sc-firmware/imx-sc-firmware.mk | 27 +++++++++++++++++++
4 files changed, 37 insertions(+)
create mode 100644 package/freescale-imx/imx-sc-firmware/Config.in
create mode 100644 package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 44de17aba1..65051db72c 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -129,6 +129,7 @@ F: package/ktap/
N: Andr? Hentschel <nerv@dawncrow.de>
F: package/azure-iot-sdk-c/
+F: package/freescale-imx/imx-sc-firmware/
F: package/libkrb5/
F: package/openal/
F: package/p7zip/
diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index 9001764437..fcceacdc9e 100644
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -90,6 +90,7 @@ source "package/freescale-imx/imx-vpu/Config.in"
source "package/freescale-imx/imx-vpu-hantro/Config.in"
source "package/freescale-imx/imx-vpuwrap/Config.in"
source "package/freescale-imx/firmware-imx/Config.in"
+source "package/freescale-imx/imx-sc-firmware/Config.in"
if (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53)
source "package/freescale-imx/gpu-amd-bin-mx51/Config.in"
source "package/freescale-imx/libz160/Config.in"
diff --git a/package/freescale-imx/imx-sc-firmware/Config.in b/package/freescale-imx/imx-sc-firmware/Config.in
new file mode 100644
index 0000000000..5c71618ce0
--- /dev/null
+++ b/package/freescale-imx/imx-sc-firmware/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_IMX_SC_FIRMWARE
+ bool "imx-sc-firmware"
+ depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X
+ help
+ System Control Unit Firmware blobs for the Freescale i.MX8 SoCs.
+
+ This library is provided by Freescale as-is and doesn't have
+ an upstream.
diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
new file mode 100644
index 0000000000..fac20d0c6f
--- /dev/null
+++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# imx-sc-firmware
+#
+################################################################################
+
+IMX_SC_FIRMWARE_VERSION = 1.0
+IMX_SC_FIRMWARE_SITE = $(FREESCALE_IMX_SITE)
+IMX_SC_FIRMWARE_SOURCE = imx-sc-firmware-$(IMX_SC_FIRMWARE_VERSION).bin
+
+IMX_SC_FIRMWARE_LICENSE = NXP Semiconductor Software License Agreement
+IMX_SC_FIRMWARE_LICENSE_FILES = EULA COPYING
+IMX_SC_FIRMWARE_REDISTRIBUTE = NO
+
+define IMX_SC_FIRMWARE_EXTRACT_CMDS
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_SC_FIRMWARE_DL_DIR)/$(IMX_SC_FIRMWARE_SOURCE))
+endef
+
+IMX_SC_FIRMWARE_INSTALL_IMAGES = YES
+define IMX_SC_FIRMWARE_INSTALL_IMAGES_CMDS
+ # SCFW firmware is needed when generating imx8-boot-sd.bin which
+ # is done in post-image script.
+ cp $(@D)/mx8qx-mek-scfw-tcm.bin $(BINARIES_DIR)/mx8qx-mek-scfw-tcm.bin
+ cp $(@D)/mx8qx-val-scfw-tcm.bin $(BINARIES_DIR)/mx8qx-val-scfw-tcm.bin
+endef
+
+$(eval $(generic-package))
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH/next v3 2/6] package/freescale-imx: Add imx-sc-firmware package
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 2/6] package/freescale-imx: Add imx-sc-firmware package André Hentschel
@ 2019-02-23 15:35 ` Thomas Petazzoni
0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2019-02-23 15:35 UTC (permalink / raw)
To: buildroot
On Mon, 18 Feb 2019 21:48:03 +0100
Andr? Hentschel <nerv@dawncrow.de> wrote:
> From: Andr? Hentschel <andre.hentschel@zf.com>
>
> Signed-off-by: Andr? Hentschel <andre.hentschel@zf.com>
> ---
> DEVELOPERS | 1 +
> package/freescale-imx/Config.in | 1 +
> .../freescale-imx/imx-sc-firmware/Config.in | 8 ++++++
> .../imx-sc-firmware/imx-sc-firmware.mk | 27 +++++++++++++++++++
> 4 files changed, 37 insertions(+)
> create mode 100644 package/freescale-imx/imx-sc-firmware/Config.in
> create mode 100644 package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
Applied to next after changing the commit title to:
package/freescale-imx/imx-sc-firmware: new package
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH/next v3 3/6] package/imx-mkimage: Bump to rel_imx_4.14.78_1.0.0_ga
2019-02-18 20:48 [Buildroot] [PATCH/next v3 0/6] Adding support for i.MX8QXP MEK board André Hentschel
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 1/6] package/freescale-imx: Add support for i.MX8X André Hentschel
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 2/6] package/freescale-imx: Add imx-sc-firmware package André Hentschel
@ 2019-02-18 20:48 ` André Hentschel
2019-02-23 15:35 ` Thomas Petazzoni
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 4/6] package/imx-mkimage: Add support for both other SOC families (i.MX8 and i.MX8X) André Hentschel
` (2 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: André Hentschel @ 2019-02-18 20:48 UTC (permalink / raw)
To: buildroot
From: Andr? Hentschel <andre.hentschel@zf.com>
Signed-off-by: Andr? Hentschel <andre.hentschel@zf.com>
---
package/imx-mkimage/imx-mkimage.hash | 2 +-
package/imx-mkimage/imx-mkimage.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash
index e1cbdd973c..c9dcd0fa1d 100644
--- a/package/imx-mkimage/imx-mkimage.hash
+++ b/package/imx-mkimage/imx-mkimage.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 bc79e11cfbde303e200287fa6624028c8ce5344f8a35ed179b3fe217d74155da imx-mkimage-rel_imx_4.9.51_8mq_ga.tar.gz
+sha256 d5d7afca6abef4fc6653a2f8b99545d62921a5ab8c44ff3481120232e2162dde imx-mkimage-rel_imx_4.14.78_1.0.0_ga.tar.gz
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c iMX8dv/COPYING
diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk
index 6fd6aa39b0..ac22c974ac 100644
--- a/package/imx-mkimage/imx-mkimage.mk
+++ b/package/imx-mkimage/imx-mkimage.mk
@@ -4,7 +4,7 @@
#
################################################################################
-IMX_MKIMAGE_VERSION = rel_imx_4.9.51_8mq_ga
+IMX_MKIMAGE_VERSION = rel_imx_4.14.78_1.0.0_ga
IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage
IMX_MKIMAGE_SITE_METHOD = git
IMX_MKIMAGE_LICENSE = GPL-2.0+
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH/next v3 4/6] package/imx-mkimage: Add support for both other SOC families (i.MX8 and i.MX8X)
2019-02-18 20:48 [Buildroot] [PATCH/next v3 0/6] Adding support for i.MX8QXP MEK board André Hentschel
` (2 preceding siblings ...)
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 3/6] package/imx-mkimage: Bump to rel_imx_4.14.78_1.0.0_ga André Hentschel
@ 2019-02-18 20:48 ` André Hentschel
2019-02-23 15:35 ` Thomas Petazzoni
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 5/6] board/freescale/common/imx: Add support for i.MX8X André Hentschel
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 6/6] configs/freescale_imx8qxpmek: New defconfig André Hentschel
5 siblings, 1 reply; 13+ messages in thread
From: André Hentschel @ 2019-02-18 20:48 UTC (permalink / raw)
To: buildroot
From: Andr? Hentschel <andre.hentschel@zf.com>
Signed-off-by: Andr? Hentschel <andre.hentschel@zf.com>
---
package/imx-mkimage/imx-mkimage.mk | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk
index ac22c974ac..06d3157dc1 100644
--- a/package/imx-mkimage/imx-mkimage.mk
+++ b/package/imx-mkimage/imx-mkimage.mk
@@ -11,15 +11,23 @@ IMX_MKIMAGE_LICENSE = GPL-2.0+
IMX_MKIMAGE_LICENSE_FILES = iMX8dv/COPYING
HOST_IMX_MKIMAGE_DEPENDENCIES = host-zlib
+ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M),y)
+# i.MX8M needs a different binary
define HOST_IMX_MKIMAGE_BUILD_CMDS
- # Currently this only supports iMX8M. When more hardware is available
- # this needs to be selectable based on iMX8-version (iMX8M,iMXQ etc).
$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)/iMX8M -f soc.mak mkimage_imx8
endef
-
define HOST_IMX_MKIMAGE_INSTALL_CMDS
$(INSTALL) -D -m 755 $(@D)/iMX8M/mkimage_imx8 $(HOST_DIR)/bin/mkimage_imx8
$(INSTALL) -D -m 755 $(@D)/iMX8M/mkimage_fit_atf.sh $(HOST_DIR)/bin/mkimage_fit_atf.sh
endef
+else
+# i.MX8 and i.MX8X
+define HOST_IMX_MKIMAGE_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) MKIMG=mkimage_imx8 mkimage_imx8
+endef
+define HOST_IMX_MKIMAGE_INSTALL_CMDS
+ $(INSTALL) -D -m 755 $(@D)/mkimage_imx8 $(HOST_DIR)/bin/mkimage_imx8
+endef
+endif
$(eval $(host-generic-package))
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH/next v3 5/6] board/freescale/common/imx: Add support for i.MX8X
2019-02-18 20:48 [Buildroot] [PATCH/next v3 0/6] Adding support for i.MX8QXP MEK board André Hentschel
` (3 preceding siblings ...)
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 4/6] package/imx-mkimage: Add support for both other SOC families (i.MX8 and i.MX8X) André Hentschel
@ 2019-02-18 20:48 ` André Hentschel
2019-02-23 15:36 ` Thomas Petazzoni
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 6/6] configs/freescale_imx8qxpmek: New defconfig André Hentschel
5 siblings, 1 reply; 13+ messages in thread
From: André Hentschel @ 2019-02-18 20:48 UTC (permalink / raw)
To: buildroot
From: Andr? Hentschel <andre.hentschel@zf.com>
Signed-off-by: Andr? Hentschel <andre.hentschel@zf.com>
---
.../common/imx/genimage.cfg.template_imx8 | 2 +-
.../common/imx/imx8-bootloader-prepare.sh | 20 ++++++++++++++-----
board/freescale/common/imx/post-image.sh | 13 ++++++++++++
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/board/freescale/common/imx/genimage.cfg.template_imx8 b/board/freescale/common/imx/genimage.cfg.template_imx8
index 2f8842f8e0..bd5f6cdc73 100644
--- a/board/freescale/common/imx/genimage.cfg.template_imx8
+++ b/board/freescale/common/imx/genimage.cfg.template_imx8
@@ -23,7 +23,7 @@ image sdcard.img {
partition imx-boot {
in-partition-table = "no"
image = "imx8-boot-sd.bin"
- offset = 33K
+ offset = %IMXOFFSET%
}
partition boot {
diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh
index cc12666ae6..e98e93a857 100755
--- a/board/freescale/common/imx/imx8-bootloader-prepare.sh
+++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh
@@ -7,12 +7,22 @@ main ()
echo "ERROR: couldn't find dtb: $UBOOT_DTB"
exit 1
fi
- cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
- BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
- ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
- rm -f ${BINARIES_DIR}/u-boot.its
- ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
+ if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
+ cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
+ BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
+ ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
+ rm -f ${BINARIES_DIR}/u-boot.its
+
+ ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
+ else
+ ${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit
+ 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
+ fi
exit $?
}
diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh
index 6590beda3e..12a5bea73b 100755
--- a/board/freescale/common/imx/post-image.sh
+++ b/board/freescale/common/imx/post-image.sh
@@ -34,6 +34,8 @@ genimage_type()
{
if 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_IMX8X=y$" ${BR2_CONFIG}; then
+ echo "genimage.cfg.template_imx8"
elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
echo "genimage.cfg.template_spl"
else
@@ -41,6 +43,15 @@ genimage_type()
fi
}
+imx_offset()
+{
+ if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
+ echo "33K"
+ else
+ echo "32K"
+ fi
+}
+
uboot_image()
{
if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" ${BR2_CONFIG}; then
@@ -53,11 +64,13 @@ uboot_image()
main()
{
local FILES="$(dtb_list) $(linux_image)"
+ local IMXOFFSET="$(imx_offset)"
local UBOOTBIN="$(uboot_image)"
local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)"
local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
sed -e "s/%FILES%/${FILES}/" \
+ -e "s/%IMXOFFSET%/${IMXOFFSET}/" \
-e "s/%UBOOTBIN%/${UBOOTBIN}/" \
board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG}
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH/next v3 5/6] board/freescale/common/imx: Add support for i.MX8X
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 5/6] board/freescale/common/imx: Add support for i.MX8X André Hentschel
@ 2019-02-23 15:36 ` Thomas Petazzoni
0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2019-02-23 15:36 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 18 Feb 2019 21:48:06 +0100
Andr? Hentschel <nerv@dawncrow.de> wrote:
> From: Andr? Hentschel <andre.hentschel@zf.com>
>
> Signed-off-by: Andr? Hentschel <andre.hentschel@zf.com>
A more verbose commit log would have been nice, but I've applied to
next anyway.
> - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
> - BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
> - ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
> - rm -f ${BINARIES_DIR}/u-boot.its
>
> - ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
> + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
> + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
> + BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
> + ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
> + rm -f ${BINARIES_DIR}/u-boot.its
> +
> + ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
> + else
> + ${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit
> + 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
> + fi
This is getting really atrocious. I'm wondering if we should find a way
to move this to some Buildroot package.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH/next v3 6/6] configs/freescale_imx8qxpmek: New defconfig
2019-02-18 20:48 [Buildroot] [PATCH/next v3 0/6] Adding support for i.MX8QXP MEK board André Hentschel
` (4 preceding siblings ...)
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 5/6] board/freescale/common/imx: Add support for i.MX8X André Hentschel
@ 2019-02-18 20:48 ` André Hentschel
2019-02-23 15:36 ` Thomas Petazzoni
5 siblings, 1 reply; 13+ messages in thread
From: André Hentschel @ 2019-02-18 20:48 UTC (permalink / raw)
To: buildroot
From: Andr? Hentschel <andre.hentschel@zf.com>
Signed-off-by: Andr? Hentschel <andre.hentschel@zf.com>
---
.gitlab-ci.yml | 1 +
board/freescale/imx8qxpmek/readme.txt | 67 ++++++++++++++++++++++++++
configs/freescale_imx8qxpmek_defconfig | 40 +++++++++++++++
3 files changed, 108 insertions(+)
create mode 100644 board/freescale/imx8qxpmek/readme.txt
create mode 100644 configs/freescale_imx8qxpmek_defconfig
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f0ebaa25c..3f7d2e2d7d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,6 +144,7 @@ freescale_imx6qsabresd_defconfig: { extends: .defconfig }
freescale_imx6sxsabresd_defconfig: { extends: .defconfig }
freescale_imx7dsabresd_defconfig: { extends: .defconfig }
freescale_imx8mqevk_defconfig: { extends: .defconfig }
+freescale_imx8qxpmek_defconfig: { extends: .defconfig }
freescale_p1025twr_defconfig: { extends: .defconfig }
freescale_t1040d4rdb_defconfig: { extends: .defconfig }
friendlyarm_nanopi_a64_defconfig: { extends: .defconfig }
diff --git a/board/freescale/imx8qxpmek/readme.txt b/board/freescale/imx8qxpmek/readme.txt
new file mode 100644
index 0000000000..45f7915fe4
--- /dev/null
+++ b/board/freescale/imx8qxpmek/readme.txt
@@ -0,0 +1,67 @@
+***************************
+Freescale i.MX8QXP MEK board
+***************************
+
+This file documents the Buildroot support for the Freescale i.MX8QXP
+MEK board.
+
+Build
+=====
+
+First, configure Buildroot for the i.MX8QXP MEK board:
+
+ make freescale_imx8qxpmek_defconfig
+
+Build all components:
+
+ make
+
+You will find in output/images/ the following files:
+ - ahab-container.img
+ - bl31.bin
+ - boot.vfat
+ - fsl-imx8qxp-mek.dtb
+ - Image
+ - imx8-boot-sd.bin
+ - mkimg.commit
+ - mx8qx-mek-scfw-tcm.bin
+ - mx8qx-val-scfw-tcm.bin
+ - rootfs.ext2
+ - rootfs.ext4
+ - rootfs.tar
+ - sdcard.img
+ - u-boot-atf.bin
+ - u-boot.bin
+ - u-boot-hash.bin
+
+Create a bootable SD card
+=========================
+
+To determine the device associated to the SD card have a look in the
+/proc/partitions file:
+
+ cat /proc/partitions
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be dumped on a SD card. Launch the following
+command as root:
+
+ dd if=output/images/sdcard.img of=/dev/<your-sd-device>
+
+*** WARNING! This will destroy all the card content. Use with care! ***
+
+For details about the medium image layout, see the definition in
+board/freescale/common/imx/genimage.cfg.template_imx8.
+
+Boot the i.MX8QXP MEK board
+==========================
+
+To boot your newly created system:
+- insert the SD card in the SD slot of the board;
+- Configure the boot switch as follows:
+SW2: ON ON OFF OFF
+- put a micro USB cable into the Debug USB Port and connect using a terminal
+ emulator at 115200 bps, 8n1;
+- power on the board.
+
+Enjoy!
diff --git a/configs/freescale_imx8qxpmek_defconfig b/configs/freescale_imx8qxpmek_defconfig
new file mode 100644
index 0000000000..33e2a50dd7
--- /dev/null
+++ b/configs/freescale_imx8qxpmek_defconfig
@@ -0,0 +1,40 @@
+BR2_aarch64=y
+BR2_cortex_a35=y
+BR2_ARM_FPU_VFPV3=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.78_1.0.0_ga"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8qxp-mek"
+BR2_PACKAGE_FREESCALE_IMX=y
+BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y
+BR2_PACKAGE_FIRMWARE_IMX=y
+BR2_PACKAGE_IMX_SC_FIRMWARE=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.78_1.0.0_ga"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qxp"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.78_1.0.0_ga"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_IMX_MKIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH/next v3 6/6] configs/freescale_imx8qxpmek: New defconfig
2019-02-18 20:48 ` [Buildroot] [PATCH/next v3 6/6] configs/freescale_imx8qxpmek: New defconfig André Hentschel
@ 2019-02-23 15:36 ` Thomas Petazzoni
0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2019-02-23 15:36 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 18 Feb 2019 21:48:07 +0100
Andr? Hentschel <nerv@dawncrow.de> wrote:
> From: Andr? Hentschel <andre.hentschel@zf.com>
>
> Signed-off-by: Andr? Hentschel <andre.hentschel@zf.com>
> ---
> .gitlab-ci.yml | 1 +
> board/freescale/imx8qxpmek/readme.txt | 67 ++++++++++++++++++++++++++
> configs/freescale_imx8qxpmek_defconfig | 40 +++++++++++++++
> 3 files changed, 108 insertions(+)
> create mode 100644 board/freescale/imx8qxpmek/readme.txt
> create mode 100644 configs/freescale_imx8qxpmek_defconfig
You forgot to update the DEVELOPERS file, so I've done that and applied
to next. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 13+ messages in thread