From: Marcel Ziswiler <marcel@ziswiler.com>
To: u-boot@lists.denx.de
Cc: Tim Harvey <tharvey@gateworks.com>,
Frieder Schrempf <frieder.schrempf@kontron.de>,
Stefano Babic <sbabic@denx.de>, Simon Glass <sjg@chromium.org>,
Fabio Estevam <festevam@gmail.com>,
Marcel Ziswiler <marcel.ziswiler@toradex.com>,
"NXP i.MX U-Boot Team" <uboot-imx@nxp.com>,
Tom Rini <trini@konsulko.com>
Subject: [PATCH v2 5/7] arm64: dts: imx8mm-u-boot.dtsi: alphabetically re-order properties
Date: Fri, 8 Oct 2021 23:02:33 +0200 [thread overview]
Message-ID: <20211008210236.1087637-6-marcel@ziswiler.com> (raw)
In-Reply-To: <20211008210236.1087637-1-marcel@ziswiler.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Alphabetically re-order properties.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v2:
- Rather than doing that clean-up to the separate binman dtsi now do it
to the common u-boot dtsi one.
arch/arm/dts/imx8mm-u-boot.dtsi | 34 ++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 5020255fa0f..770282d2b98 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -15,8 +15,8 @@
};
&aips1 {
- u-boot,dm-spl;
u-boot,dm-pre-reloc;
+ u-boot,dm-spl;
};
&aips2 {
@@ -29,10 +29,10 @@
&binman {
u-boot-spl-ddr {
+ align = <4>;
+ align-size = <4>;
filename = "u-boot-spl-ddr.bin";
pad-byte = <0xff>;
- align-size = <4>;
- align = <4>;
u-boot-spl {
align-end = <4>;
@@ -76,17 +76,17 @@
fit {
description = "Configuration to load ATF before U-Boot";
- #address-cells = <1>;
fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
fit,fdt-list = "of-list";
+ #address-cells = <1>;
images {
uboot {
- description = "U-Boot (64-bit)";
- type = "standalone";
arch = "arm64";
compression = "none";
+ description = "U-Boot (64-bit)";
load = <CONFIG_SYS_TEXT_BASE>;
+ type = "standalone";
uboot_blob: blob-ext {
filename = "u-boot-nodtb.bin";
@@ -94,12 +94,12 @@
};
atf {
- description = "ARM Trusted Firmware";
- type = "firmware";
arch = "arm64";
compression = "none";
- load = <0x920000>;
+ description = "ARM Trusted Firmware";
entry = <0x920000>;
+ load = <0x920000>;
+ type = "firmware";
atf_blob: blob-ext {
filename = "bl31.bin";
@@ -107,17 +107,17 @@
};
binman_fip: fip {
- description = "Trusted Firmware FIP";
- type = "firmware";
arch = "arm64";
compression = "none";
+ description = "Trusted Firmware FIP";
load = <0x40310000>;
+ type = "firmware";
};
@fdt-SEQ {
+ compression = "none";
description = "NAME";
type = "flat_dt";
- compression = "none";
uboot_fdt_blob: blob-ext {
filename = "u-boot.dtb";
@@ -130,9 +130,9 @@
binman_configuration: @config-SEQ {
description = "NAME";
+ fdt = "fdt-SEQ";
firmware = "uboot";
loadables = "atf";
- fdt = "fdt-SEQ";
};
};
};
@@ -143,20 +143,20 @@
pad-byte = <0x00>;
spl: blob-ext@1 {
- offset = <0x0>;
filename = "spl.bin";
+ offset = <0x0>;
};
binman_uboot: blob-ext@2 {
- offset = <0x57c00>;
filename = "u-boot.itb";
+ offset = <0x57c00>;
};
};
};
&clk {
- u-boot,dm-spl;
u-boot,dm-pre-reloc;
+ u-boot,dm-spl;
/delete-property/ assigned-clocks;
/delete-property/ assigned-clock-parents;
/delete-property/ assigned-clock-rates;
@@ -167,6 +167,6 @@
};
&osc_24m {
- u-boot,dm-spl;
u-boot,dm-pre-reloc;
+ u-boot,dm-spl;
};
--
2.26.2
next prev parent reply other threads:[~2021-10-08 21:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-08 21:02 [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 1/7] imx8mm-cl-iot-gate: fix imximage intermediate binary naming Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 2/7] arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: alphabetically re-order Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 3/7] arm64: dts: imx8mm-cl-iot-gate-u-boot.dtsi: use common imx8mm-u-boot.dtsi Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 4/7] arm64: dts: imx8mm: use common binman configuration Marcel Ziswiler
2021-10-08 21:02 ` Marcel Ziswiler [this message]
2021-10-08 21:02 ` [PATCH v2 6/7] arm64: dts: imx8mm-u-boot.dtsi: explicitly add spl filename Marcel Ziswiler
2021-10-08 21:02 ` [PATCH v2 7/7] arm64: dts: imx8mm-u-boot.dtsi: improve odd blob-ext naming Marcel Ziswiler
2021-10-09 5:59 ` [PATCH v2 0/7] arm64: dts: imx8mm: add common -binman.dtsi and further clean-up Peng Fan (OSS)
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=20211008210236.1087637-6-marcel@ziswiler.com \
--to=marcel@ziswiler.com \
--cc=festevam@gmail.com \
--cc=frieder.schrempf@kontron.de \
--cc=marcel.ziswiler@toradex.com \
--cc=sbabic@denx.de \
--cc=sjg@chromium.org \
--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).