[PATCH] dts: qcom: remove hardcoded memory maps
Casey Connolly
casey.connolly at linaro.org
Wed Jul 1 12:19:33 CEST 2026
Qualcomm boards have traditionally relied on a prior bootloader stage
to populate the memory map in devicetree, and when that wasn't available
the memory map would instead be hardcoded.
With proper support for SMEM in U-Boot the memory map can now
dynamically be read out of the SMEM database which is populated on boot
by the preloader (sbl1).
Switch over all the boards that previously relied on hardcoded memory
maps to use SMEM instead. This has been tested on the Rubik Pi 3 and
db410c however other platforms still need testing (see below).
This affects the following boards:
* IPQ5424 RDP466
* IPQ9574 RDP433
* QCS615 Ride
* QCS6490 RB3 Gen 2
* QCS8300 Ride
* QCS9100 Ride
Signed-off-by: Casey Connolly <casey.connolly at linaro.org>
---
This patch is based on the qcom-next branch found on the Qualcomm U-Boot
Custodian repository [1]. For testing please check out that branch,
apply this patch and then build/boot U-Boot. Ensure that you have
CONFIG_LOGLEVEL set to >=6 and look for the "Memory map loaded from"
message during boot, it should say SMEM.
If nothing is broken in U-Boot and Linux then please send your Tested-by
indicating which board(s) you tried as a "#" comment after your email.
[1]: https://source.denx.de/u-boot/custodians/u-boot-snapdragon
Cc: u-boot-qcom at groups.io
Cc: Neil Armstrong <neil.armstrong at linaro.org>
Cc: Sumit Garg <sumit.garg at kernel.org>
Cc: Ilias Apalodimas <ilias.apalodimas at linaro.org>
---
arch/arm/dts/ipq5424-rdp466-u-boot.dtsi | 6 ------
arch/arm/dts/ipq9574-rdp433-u-boot.dtsi | 9 ---------
arch/arm/dts/qcs615-ride-u-boot.dtsi | 14 --------------
arch/arm/dts/qcs6490-rb3gen2-u-boot.dtsi | 23 -----------------------
arch/arm/dts/qcs8300-ride-u-boot.dtsi | 19 -------------------
arch/arm/dts/qcs9100-ride-r3-u-boot.dtsi | 20 --------------------
6 files changed, 91 deletions(-)
delete mode 100644 arch/arm/dts/qcs615-ride-u-boot.dtsi
delete mode 100644 arch/arm/dts/qcs6490-rb3gen2-u-boot.dtsi
delete mode 100644 arch/arm/dts/qcs8300-ride-u-boot.dtsi
delete mode 100644 arch/arm/dts/qcs9100-ride-r3-u-boot.dtsi
diff --git a/arch/arm/dts/ipq5424-rdp466-u-boot.dtsi b/arch/arm/dts/ipq5424-rdp466-u-boot.dtsi
index 36640f31d616..3b7897b909c7 100644
--- a/arch/arm/dts/ipq5424-rdp466-u-boot.dtsi
+++ b/arch/arm/dts/ipq5424-rdp466-u-boot.dtsi
@@ -5,14 +5,8 @@
* Copyright (c) 2025 The Linux Foundation. All rights reserved.
*/
/ {
- /* Will be removed when SMEM parsing is updated */
- memory at 80000000 {
- device_type = "memory";
- reg = <0x0 0x80000000 0x0 0x20000000>;
- };
-
chosen {
stdout-path = "serial0:115200n8";
};
};
diff --git a/arch/arm/dts/ipq9574-rdp433-u-boot.dtsi b/arch/arm/dts/ipq9574-rdp433-u-boot.dtsi
index 390e2338d659..f50d75d59852 100644
--- a/arch/arm/dts/ipq9574-rdp433-u-boot.dtsi
+++ b/arch/arm/dts/ipq9574-rdp433-u-boot.dtsi
@@ -2,17 +2,8 @@
/*
* Copyright (c) 2025, Qualcomm Innovation Center, Inc. All rights reserved.
*/
-/ {
- /* Will be removed when SMEM parsing is updated */
- memory at 40000000 {
- device_type = "memory";
- reg = <0x0 0x40000000 0x0 0x40000000>,
- <0x0 0x4a500000 0x0 0x00100000>;
- };
-};
-
&sdhc_1 {
sdhci-caps-mask = <0x0 0x04000000>;
sdhci-caps = <0x0 0x04000000>; /* SDHCI_CAN_VDD_180 */
diff --git a/arch/arm/dts/qcs615-ride-u-boot.dtsi b/arch/arm/dts/qcs615-ride-u-boot.dtsi
deleted file mode 100644
index 68fffc70fcb4..000000000000
--- a/arch/arm/dts/qcs615-ride-u-boot.dtsi
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2025, Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-/ {
- memory at 80000000 {
- device_type = "memory";
- reg = <0x0 0x80000000 0x0 0x7a00000>,
- <0x0 0x89600000 0x0 0x30100000>,
- <0x0 0xc0000000 0x0 0xc0000000>,
- <0x1 0x80000000 0x1 0x00000000>;
- };
-};
diff --git a/arch/arm/dts/qcs6490-rb3gen2-u-boot.dtsi b/arch/arm/dts/qcs6490-rb3gen2-u-boot.dtsi
deleted file mode 100644
index c3ec4a317f7c..000000000000
--- a/arch/arm/dts/qcs6490-rb3gen2-u-boot.dtsi
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2024 Linaro Ltd.
- */
-/ {
- /* When running as the primary bootloader there is no prior
- * stage to populate the memory layout for us. We *should*
- * have two nodes here, but ABL does NOT like that.
- * sooo we're stuck with this.
- */
- memory at 80000000 {
- device_type = "memory";
- reg = <0 0x80000000 0 0x3A800000>,
- <0 0xC0000000 0 0x01800000>,
- <0 0xC3400000 0 0x3CC00000>,
- <1 0x00000000 1 0x00000000>;
- };
-};
-
-// RAM Entry 0 : Base 0x0080000000 Size 0x003A800000
-// RAM Entry 1 : Base 0x00C0000000 Size 0x0001800000
-// RAM Entry 2 : Base 0x00C3400000 Size 0x003CC00000
-// RAM Entry 3 : Base 0x0100000000 Size 0x0100000000
diff --git a/arch/arm/dts/qcs8300-ride-u-boot.dtsi b/arch/arm/dts/qcs8300-ride-u-boot.dtsi
deleted file mode 100644
index 8c353ace71e1..000000000000
--- a/arch/arm/dts/qcs8300-ride-u-boot.dtsi
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2025, Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-/ {
- memory at 80000000 {
- device_type = "memory";
- reg = <0x0 0x80000000 0x0 0x11a80000>,
- <0x0 0xc0000000 0x0 0x10000000>,
- <0x0 0xd3100000 0x0 0x26b00000>,
- <0xe 0x80000000 0x1 0x00000000>,
- <0xa 0x80000000 0x1 0x80000000>,
- <0x0 0xb0800000 0x0 0x0f200000>,
- <0x0 0xd0100000 0x0 0x01800000>,
- <0x0 0x91b00000 0x0 0x1e500000>;
- };
-};
-
diff --git a/arch/arm/dts/qcs9100-ride-r3-u-boot.dtsi b/arch/arm/dts/qcs9100-ride-r3-u-boot.dtsi
deleted file mode 100644
index 5905dfad18f1..000000000000
--- a/arch/arm/dts/qcs9100-ride-r3-u-boot.dtsi
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2025, Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-/ {
- /* Will be removed when bootloader updates later */
- memory at 80000000 {
- device_type = "memory";
- reg = <0x0 0x80000000 0x0 0x3ee00000>,
- <0x0 0xc0000000 0x0 0x04d00000>,
- <0xd 0x00000000 0x2 0x54100000>,
- <0xa 0x80000000 0x1 0x52d00000>,
- <0x9 0x00000000 0x1 0x80000000>,
- <0x1 0x00000000 0x2 0xf7500000>,
- <0x0 0xd0000000 0x0 0x00100000>,
- <0x0 0xd3500000 0x0 0x07c00000>,
- <0x0 0xdb300000 0x0 0x24d00000>;
- };
-};
--
2.54.0
More information about the U-Boot
mailing list