From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
To: sbabic@denx.de, festevam@gmail.com, trini@konsulko.com,
alpernebiyasak@gmail.com,
"NXP i.MX U-Boot Team" <uboot-imx@nxp.com>,
"Ariel D'Alessandro" <ariel.dalessandro@collabora.com>,
Michael Trimarchi <michael@amarulasolutions.com>,
Tim Harvey <tharvey@gateworks.com>
Cc: u-boot@lists.denx.de, Peng Fan <peng.fan@nxp.com>
Subject: [PATCH 3/8] arm: dts: imx8m: update binman ddr firmware node name
Date: Fri, 3 Jun 2022 15:17:10 +0800 [thread overview]
Message-ID: <20220603071715.15212-4-peng.fan@oss.nxp.com> (raw)
In-Reply-To: <20220603071715.15212-1-peng.fan@oss.nxp.com>
From: Peng Fan <peng.fan@nxp.com>
We are migrating to use BINMAN SYMBOLS, the current name is not
a valid binman type, so update to unify them.
Also add `type = "blob-ext";` for generating a valid binman symbol
The current names are inconsistent across different boards, so unify them.
Also add `type = "blob-ext";`, since the new names are not valid binman types.
Tested-by: Tim Harvey <tharvey@gateworks.com> #imx8m[m,n,p]-venice
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
arch/arm/dts/imx8mm-u-boot.dtsi | 8 ++++----
arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi | 12 ++++++++----
arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi | 4 ++--
arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 12 ++++++++----
arch/arm/dts/imx8mn-evk-u-boot.dtsi | 12 ++++++++----
arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi | 8 ++++----
arch/arm/dts/imx8mn-venice-u-boot.dtsi | 8 ++++----
arch/arm/dts/imx8mp-u-boot.dtsi | 12 ++++++++----
arch/arm/dts/imx8mq-cm-u-boot.dtsi | 12 ++++++++----
arch/arm/dts/imx8mq-u-boot.dtsi | 8 ++++----
10 files changed, 58 insertions(+), 38 deletions(-)
diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 9f66cdb65a9..86f8e1a284b 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -39,25 +39,25 @@
filename = "u-boot-spl.bin";
};
- 1d-imem {
+ ddr-1d-imem-fw {
filename = "lpddr4_pmu_train_1d_imem.bin";
size = <0x8000>;
type = "blob-ext";
};
- 1d-dmem {
+ ddr-1d-dmem-fw {
filename = "lpddr4_pmu_train_1d_dmem.bin";
size = <0x4000>;
type = "blob-ext";
};
- 2d-imem {
+ ddr-2d-imem-fw {
filename = "lpddr4_pmu_train_2d_imem.bin";
size = <0x8000>;
type = "blob-ext";
};
- 2d-dmem {
+ ddr-2d-dmem-fw {
filename = "lpddr4_pmu_train_2d_dmem.bin";
size = <0x4000>;
type = "blob-ext";
diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
index eb1dd8debba..d28bb2b2ffe 100644
--- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
@@ -147,24 +147,28 @@
align-end = <4>;
};
- blob_1: blob-ext@1 {
+ ddr-1d-imem-fw {
filename = "lpddr4_pmu_train_1d_imem.bin";
size = <0x8000>;
+ type = "blob-ext";
};
- blob_2: blob-ext@2 {
+ ddr-1d-dmem-fw {
filename = "lpddr4_pmu_train_1d_dmem.bin";
size = <0x4000>;
+ type = "blob-ext";
};
- blob_3: blob-ext@3 {
+ ddr-2d-imem-fw {
filename = "lpddr4_pmu_train_2d_imem.bin";
size = <0x8000>;
+ type = "blob-ext";
};
- blob_4: blob-ext@4 {
+ ddr-2d-dmem-fw {
filename = "lpddr4_pmu_train_2d_dmem.bin";
size = <0x4000>;
+ type = "blob-ext";
};
};
diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
index 46a9d7fd78b..dc4cec250ef 100644
--- a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
+++ b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
@@ -111,13 +111,13 @@
filename = "u-boot-spl.bin";
};
- 1d-imem {
+ ddr-1d-imem-fw {
filename = "ddr3_imem_1d.bin";
size = <0x8000>;
type = "blob-ext";
};
- 1d_dmem {
+ ddr-1d-dmem-fw {
filename = "ddr3_dmem_1d.bin";
size = <0x4000>;
type = "blob-ext";
diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
index 4d0ecb07d4f..30ef8bc47d9 100644
--- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
@@ -155,24 +155,28 @@
align-end = <4>;
};
- blob_1: blob-ext@1 {
+ ddr-1d-imem-fw {
filename = "ddr4_imem_1d_201810.bin";
size = <0x8000>;
+ type = "blob-ext";
};
- blob_2: blob-ext@2 {
+ ddr-1d-dmem-fw {
filename = "ddr4_dmem_1d_201810.bin";
size = <0x4000>;
+ type = "blob-ext";
};
- blob_3: blob-ext@3 {
+ ddr-2d-imem-fw {
filename = "ddr4_imem_2d_201810.bin";
size = <0x8000>;
+ type = "blob-ext";
};
- blob_4: blob-ext@4 {
+ ddr-2d-dmem-fw {
filename = "ddr4_dmem_2d_201810.bin";
size = <0x4000>;
+ type = "blob-ext";
};
};
diff --git a/arch/arm/dts/imx8mn-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-evk-u-boot.dtsi
index 3db46d4cbcb..f366117f210 100644
--- a/arch/arm/dts/imx8mn-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-evk-u-boot.dtsi
@@ -36,24 +36,28 @@
align-end = <4>;
};
- blob_1: blob-ext@1 {
+ ddr-1d-imem-fw {
filename = "lpddr4_pmu_train_1d_imem.bin";
size = <0x8000>;
+ type = "blob-ext";
};
- blob_2: blob-ext@2 {
+ ddr-1d-dmem-fw {
filename = "lpddr4_pmu_train_1d_dmem.bin";
size = <0x4000>;
+ type = "blob-ext";
};
- blob_3: blob-ext@3 {
+ ddr-2d-imem-fw {
filename = "lpddr4_pmu_train_2d_imem.bin";
size = <0x8000>;
+ type = "blob-ext";
};
- blob_4: blob-ext@4 {
+ ddr-2d-dmem-fw {
filename = "lpddr4_pmu_train_2d_dmem.bin";
size = <0x4000>;
+ type = "blob-ext";
};
};
diff --git a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
index 6e37622cca7..b8df6f749b0 100644
--- a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
@@ -130,25 +130,25 @@
filename = "u-boot-spl.bin";
};
- 1d-imem {
+ ddr-1d-imem-fw {
filename = "ddr4_imem_1d.bin";
size = <0x8000>;
type = "blob-ext";
};
- 1d_dmem {
+ ddr-1d-dmem-fw {
filename = "ddr4_dmem_1d.bin";
size = <0x4000>;
type = "blob-ext";
};
- 2d_imem {
+ ddr-2d-imem-fw {
filename = "ddr4_imem_2d.bin";
size = <0x8000>;
type = "blob-ext";
};
- 2d_dmem {
+ ddr-2d-dmem-fw {
filename = "ddr4_dmem_2d.bin";
size = <0x4000>;
type = "blob-ext";
diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
index 35819553879..bcf2abd0676 100644
--- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
@@ -126,25 +126,25 @@
filename = "u-boot-spl.bin";
};
- 1d-imem {
+ ddr-1d-imem-fw {
filename = "lpddr4_pmu_train_1d_imem.bin";
size = <0x8000>;
type = "blob-ext";
};
- 1d_dmem {
+ ddr-1d-dmem-fw {
filename = "lpddr4_pmu_train_1d_dmem.bin";
size = <0x4000>;
type = "blob-ext";
};
- 2d_imem {
+ ddr-2d-imem-fw {
filename = "lpddr4_pmu_train_2d_imem.bin";
size = <0x8000>;
type = "blob-ext";
};
- 2d_dmem {
+ ddr-2d-dmem-fw {
filename = "lpddr4_pmu_train_2d_dmem.bin";
size = <0x4000>;
type = "blob-ext";
diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
index 20edd90cfad..dc57ee20411 100644
--- a/arch/arm/dts/imx8mp-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-u-boot.dtsi
@@ -61,24 +61,28 @@
align-end = <4>;
};
- blob_1: blob-ext@1 {
+ ddr-1d-imem-fw {
filename = "lpddr4_pmu_train_1d_imem_202006.bin";
size = <0x8000>;
+ type = "blob-ext";
};
- blob_2: blob-ext@2 {
+ ddr-1d-dmem-fw {
filename = "lpddr4_pmu_train_1d_dmem_202006.bin";
size = <0x4000>;
+ type = "blob-ext";
};
- blob_3: blob-ext@3 {
+ ddr-2d-imem-fw {
filename = "lpddr4_pmu_train_2d_imem_202006.bin";
size = <0x8000>;
+ type = "blob-ext";
};
- blob_4: blob-ext@4 {
+ ddr-2d-dmem-fw {
filename = "lpddr4_pmu_train_2d_dmem_202006.bin";
size = <0x4000>;
+ type = "blob-ext";
};
};
diff --git a/arch/arm/dts/imx8mq-cm-u-boot.dtsi b/arch/arm/dts/imx8mq-cm-u-boot.dtsi
index e2f4b0e740d..bc7e9756c23 100644
--- a/arch/arm/dts/imx8mq-cm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-cm-u-boot.dtsi
@@ -28,24 +28,28 @@
align-end = <4>;
};
- blob_1: blob-ext@1 {
+ ddr-1d-imem-fw {
filename = "lpddr4_pmu_train_1d_imem.bin";
size = <0x8000>;
+ type = "blob-ext";
};
- blob_2: blob-ext@2 {
+ ddr-1d-dmem-fw {
filename = "lpddr4_pmu_train_1d_dmem.bin";
size = <0x4000>;
+ type = "blob-ext";
};
- blob_3: blob-ext@3 {
+ ddr-2d-imem-fw {
filename = "lpddr4_pmu_train_2d_imem.bin";
size = <0x8000>;
+ type = "blob-ext";
};
- blob_4: blob-ext@4 {
+ ddr-2d-dmem-fw {
filename = "lpddr4_pmu_train_2d_dmem.bin";
size = <0x4000>;
+ type = "blob-ext";
};
};
diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi
index 912a3d4a356..462c470091a 100644
--- a/arch/arm/dts/imx8mq-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-u-boot.dtsi
@@ -46,25 +46,25 @@
filename = "u-boot-spl.bin";
};
- 1d-imem {
+ ddr-1d-imem-fw {
filename = "lpddr4_pmu_train_1d_imem.bin";
size = <0x8000>;
type = "blob-ext";
};
- 1d-dmem {
+ ddr-1d-dmem-fw {
filename = "lpddr4_pmu_train_1d_dmem.bin";
size = <0x4000>;
type = "blob-ext";
};
- 2d-imem {
+ ddr-2d-imem-fw {
filename = "lpddr4_pmu_train_2d_imem.bin";
size = <0x8000>;
type = "blob-ext";
};
- 2d-dmem {
+ ddr-2d-dmem-fw {
filename = "lpddr4_pmu_train_2d_dmem.bin";
size = <0x4000>;
type = "blob-ext";
--
2.36.0
next prev parent reply other threads:[~2022-06-03 6:35 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-03 7:17 [PATCH 0/8] arm64: binman: use binman symbols for imx Peng Fan (OSS)
2022-06-03 6:37 ` Peng Fan
2022-06-03 7:17 ` [PATCH 1/8] spl: Kconfig: not select SPL_RAW_IMAGE_SUPPORT for i.MX8M Peng Fan (OSS)
2022-06-03 12:19 ` Tom Rini
2022-06-04 11:49 ` Alper Nebi Yasak
2022-06-03 7:17 ` [PATCH 2/8] configs: imx8mm_data_modul_edm_sbc: not select SPL_RAM_DEVICE Peng Fan (OSS)
2022-06-04 11:49 ` Alper Nebi Yasak
2022-06-06 14:07 ` Marek Vasut
2022-06-07 17:26 ` Alper Nebi Yasak
2022-06-07 18:11 ` Marek Vasut
2022-06-07 20:54 ` Alper Nebi Yasak
2022-06-07 22:54 ` Marek Vasut
2022-06-10 15:51 ` Alper Nebi Yasak
2022-06-11 10:09 ` Marek Vasut
2022-06-03 7:17 ` Peng Fan (OSS) [this message]
2022-06-04 11:50 ` [PATCH 3/8] arm: dts: imx8m: update binman ddr firmware node name Alper Nebi Yasak
2022-06-03 7:17 ` [PATCH 4/8] armv8: u-boot-spl.lds: mark __image_copy_start as symbol Peng Fan (OSS)
2022-06-04 11:50 ` Alper Nebi Yasak
2022-06-03 7:17 ` [PATCH 5/8] ddr: imx8m: helper: load ddr firmware according to binman symbols Peng Fan (OSS)
2022-06-04 11:50 ` Alper Nebi Yasak
2022-06-03 7:17 ` [PATCH 6/8] arm: dts: imx8m: shrink ddr firmware size to actual file size Peng Fan (OSS)
2022-06-04 11:50 ` Alper Nebi Yasak
2022-06-03 7:17 ` [PATCH 7/8] binman_sym: guard with CONFIG_IS_ENABLED(BINMAN_SYMBOLS) Peng Fan (OSS)
2022-06-04 11:50 ` Alper Nebi Yasak
2022-06-10 16:47 ` Alper Nebi Yasak
2022-06-11 10:32 ` Peng Fan (OSS)
2022-06-11 12:44 ` Alper Nebi Yasak
2022-06-13 2:34 ` Peng Fan (OSS)
2022-06-14 21:20 ` Alper Nebi Yasak
2022-06-14 23:25 ` Peng Fan
2022-06-18 12:24 ` Alper Nebi Yasak
2022-06-13 2:31 ` Peng Fan (OSS)
2022-06-14 21:01 ` Alper Nebi Yasak
2022-06-03 7:17 ` [PATCH 8/8] imx: imx8mm-icore: migrate to use BINMAN Peng Fan (OSS)
2022-06-04 11:50 ` Alper Nebi Yasak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220603071715.15212-4-peng.fan@oss.nxp.com \
--to=peng.fan@oss.nxp.com \
--cc=alpernebiyasak@gmail.com \
--cc=ariel.dalessandro@collabora.com \
--cc=festevam@gmail.com \
--cc=michael@amarulasolutions.com \
--cc=peng.fan@nxp.com \
--cc=sbabic@denx.de \
--cc=tharvey@gateworks.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=uboot-imx@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).