Rebased nord changes

Kconfig

@@ -580,6 +580,7 @@ config BUILD_TARGET
 	default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
 				RISCV || ARCH_ZYNQMP)
 	default "u-boot.kwb" if (ARCH_KIRKWOOD || ARMADA_32BIT) && !SPL
+	default "u-boot.mbn" if ARCH_SNAPDRAGON && QCOM_GENERATE_MBN
 	help
 	  Some SoCs need special image types (e.g. U-Boot binary
 	  with a special header) as build targets. By defining

Makefile

@@ -2012,15 +2012,18 @@ u-boot.elf: u-boot.bin u-boot-elf.lds FORCE
 quiet_cmd_u-boot-spl-elf ?= LD      $@
 	cmd_u-boot-spl-elf ?= $(LD) spl/u-boot-spl-elf.o -o $@ \
 	$(if $(CONFIG_SYS_BIG_ENDIAN),-EB,-EL) \
-	-T u-boot-elf.lds --defsym=$(CONFIG_PLATFORM_ELFENTRY)=$(CONFIG_SPL_TEXT_BASE) \
+	-T spl/u-boot-spl-elf.lds --defsym=$(CONFIG_PLATFORM_ELFENTRY)=$(CONFIG_SPL_TEXT_BASE) \
 	-Ttext=$(CONFIG_SPL_TEXT_BASE)
-spl/u-boot-spl.elf: spl/u-boot-spl.bin u-boot-elf.lds
+spl/u-boot-spl.elf: spl/u-boot-spl.bin spl/u-boot-spl-elf.lds FORCE
 	$(Q)$(OBJCOPY) -I binary $(PLATFORM_ELFFLAGS) $< spl/u-boot-spl-elf.o
 	$(call if_changed,u-boot-spl-elf)
 
-REMAKE_ELF_LDSCRIPT := $(addprefix $(srctree)/,$(CONFIG_REMAKE_ELF_LDSCRIPT:"%"=%))
+SPL_REMAKE_ELF_LDSCRIPT := $(addprefix $(srctree)/,$(CONFIG_SPL_REMAKE_ELF_LDSCRIPT:"%"=%))
 
-u-boot-elf.lds: $(REMAKE_ELF_LDSCRIPT) prepare FORCE
+spl/u-boot-spl-elf.lds: $(SPL_REMAKE_ELF_LDSCRIPT) prepare FORCE
+	$(call if_changed_dep,cpp_lds)
+
+u-boot-elf.lds: arch/u-boot-elf.lds prepare FORCE
 	$(call if_changed_dep,cpp_lds)
 
 PHONY += prepare0

arch/arm/Kconfig

@@ -1139,6 +1139,7 @@ config ARCH_SNAPDRAGON
 	select DM_GPIO
 	select DM_SERIAL
 	select DM_RESET
+	select EVENT
 	select POWER_DOMAIN
 	select GPIO_EXTRA_HEADER
 	select OF_CONTROL
@@ -1149,10 +1150,39 @@ config ARCH_SNAPDRAGON
 	select SAVE_PREV_BL_FDT_ADDR if !ENABLE_ARM_SOC_BOOT0_HOOK && !SPL
 	select LINUX_KERNEL_IMAGE_HEADER if !ENABLE_ARM_SOC_BOOT0_HOOK && !SPL
 	select SYSRESET
-	select SYSRESET_PSCI if !QCOM_SNAGBOOT_MODE
+	select SYSRESET_PSCI if !QCOM_SNAGBOOT_MODE || !SPL
 	select ANDROID_BOOT_IMAGE_IGNORE_BLOB_ADDR
 	select MMU_PGPROT
 	select SUPPORT_SPL
+
+	select OF_LIVE
+	select SPL_OF_LIVE if SPL
+	select ARMV8_SPL_EXCEPTION_VECTORS if SPL
+	select ENABLE_ARM_SOC_BOOT0_HOOK if SPL
+	select SPL_DM if SPL
+	select SPL_DM_GPIO if SPL
+	select SPL_DM_PMIC if SPL && DM_PMIC
+	select SPL_DM_USB_GADGET if SPL && USB
+	select SPL_ENV_SUPPORT if SPL
+	select SPL_EVENT if SPL
+	select SPL_GPIO if SPL
+	select SPL_HAS_BSS_LINKER_SECTION if SPL && SPL_SEPARATE_BSS
+	select SPL_LIBCOMMON_SUPPORT if SPL
+	select SPL_LIBDISK_SUPPORT if SPL
+	select SPL_LIBGENERIC_SUPPORT if SPL
+	select SPL_OF_CONTROL if SPL
+	select SPL_PINCONF if SPL
+	select SPL_PINCTRL if SPL
+	select SPL_PINCTRL_FULL if SPL
+	select SPL_PINCTRL_GENERIC if SPL
+	select SPL_PINCONF_RECURSIVE if SPL
+	select SPL_PINMUX if SPL
+	select SPL_SPMI if SPL
+	select SPL_SPMI_MSM if SPL
+	select SPL_SPRINTF if SPL
+	select SPL_STRTO if SPL
+	select SPL_USB_GADGET if SPL && USB
+	imply SPL_MMC if SPL
 	imply OF_UPSTREAM
 	imply CMD_DM
 	imply DM_USB_GADGET

arch/arm/dts/ipq5210-rdp504-u-boot.dtsi

@@ -6,123 +6,7 @@
  */
 
 / {
-	/* Will be removed when SMEM parsing is updated */
-	memory@80000000 {
-		bootph-all;
-		device_type = "memory";
-		reg = <0x0 0x80000000 0x0 0x20000000>;
-	};
-
-	binman: binman {
-		description = "IPQ5210 boot loader";
-		fit {
-			description = "IPQ5210 Boot Loader FIT";
-			fit,fdt-list = "of-list";
-			fit,external-offset = <0x0>;
-
-			images {
-				@qcom-config-SEQ {
-					fit,operation = "split-elf";
-					description = "QC Config";
-					type = "qcom-config";
-					arch = "arm64";
-					os = "elf";
-					compression = "none";
-					fit,load;
-					fit,entry;
-					fit,data;
-
-					qcom-config {
-					};
-				};
-
-				@qcom-lib-SEQ {
-					fit,operation = "split-elf";
-					description = "QC Lib";
-					arch = "arm64";
-					os = "elf";
-					type = "qcom-lib";
-					compression = "none";
-					fit,load;
-					fit,entry;
-					fit,data;
-
-					qcom-lib {
-					};
-				};
-
-				@atf-SEQ {
-					fit,operation = "split-elf";
-					description = "ARM Trusted Firmware";
-					type = "atf_bl31";
-					arch = "arm64";
-					os = "arm-trusted-firmware";
-					compression = "none";
-					fit,load;
-					fit,entry;
-					fit,data;
-
-					atf-bl31 {
-					};
-				};
-
-				@qcom-appsbl-SEQ {
-					fit,operation = "split-elf";
-					type = "qcom-appsbl";
-					os = "U-Boot";
-					arch = "arm64";
-					compression = "none";
-					fit,load;
-					fit,entry;
-					fit,data;
-
-					qcom-appsbl {
-					};
-				};
-
-				@tee-SEQ {
-					fit,operation = "split-elf";
-					description = "TEE";
-					type = "tee_os";
-					arch = "arm64";
-					os = "tee";
-					compression = "none";
-					fit,load;
-					fit,entry;
-					fit,data;
-
-					tee-os {
-					};
-				};
-			};
-
-			configurations {
-				default = "pre-ddr";
-
-				pre-ddr {
-					description = "pre-ddr";
-					loadables = "qcom-config-1",
-						    "qcom-config-2",
-						    "qcom-config-3",
-						    "qcom-config-4",
-						    "qcom-lib-1",
-						    "qcom-lib-2",
-						    "qcom-lib-3",
-						    "qcom-lib-4";
-				};
-
-				post-ddr {
-					description = "post-ddr";
-					loadables = "atf-1",
-						    "atf-2",
-						    "atf-3",
-						    "atf-4",
-						    "atf-5",
-						    "atf-6",
-						    "qcom-appsbl-1",
-						    "tee-1";
-				};
-			};
-		};
+	reserved-memory {
+		/delete-node/ bootloader@87800000;
 	};
 };

arch/arm/dts/lemans-evk-u-boot.dtsi

@@ -1,18 +1,20 @@
 // SPDX-License-Identifier: BSD-3-Clause
 /*
- * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ * Copyright (c) 2026, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 / {
-	clocks {
-		/* Fixed clocks needed by GCC */
-		xo_board_clk {
-			bootph-all;
-		};
-
-		sleep_clk {
-			bootph-all;
-		};
+	/* Will be removed when bootloader updates later */
+	memory@80000000 {
+		device_type = "memory";
+		reg = <0x0 0x80000000 0x0 0x3ee00000>,
+		      <0x0 0xc0000000 0x0 0x0fd00000>,
+		      <0xD 0x00000000 0x2 0x54100000>,
+		      <0xA 0x80000000 0x1 0x80000000>,
+		      <0x9 0x00000000 0x1 0x80000000>,
+		      <0x1 0x00000000 0x3 0x00000000>,
+		      <0x0 0xd0000000 0x0 0x01900000>,
+		      <0x0 0xd3500000 0x0 0x2cb00000>;
 	};
 
 	/* IMEM boot cookie + TCSR HW version offsets */
@@ -27,40 +29,10 @@
 	};
 };
 
-&ufs_mem_hc {
-	bootph-all; /* Enable UFS for SPL */
-};
-
-&ufs_mem_phy {
-	bootph-all;
-};
-
-&gcc {
-	bootph-all; /* Enable GCC for SPL */
-};
-
-/* RPMH clock controller - required by GCC */
-&rpmhcc {
-	bootph-all;
-};
-
-/* Apps RSC - parent of rpmhcc and rpmhpd */
-&apps_rsc {
-	bootph-all;
-};
-
-/* UART10 - console serial port */
-&uart10 {
-	bootph-all;
-};
-
-&tlmm {
-	bootph-all;   /* Make TLMM GPIO controller available in SPL */
-};
-
 /* Enter Qualcomm EDL/download mode via "reset -edl". */
 &{/psci} {
 	reboot-mode {
 		mode-edl = <0x80000000 0x00000001>;
 	};
 };
+

arch/arm/dts/nord-ride-u-boot.dtsi

@@ -15,13 +15,22 @@
 
 #include <dt-bindings/clock/qcom,nord-negcc.h>
 
+&xo_board_clk {
+	bootph-all;
+};
+
+&sleep_clk {
+	bootph-all;
+};
+
 / {
 	negcc: clock-controller@8900000 {
 		compatible = "qcom,nord-negcc";
 		reg = <0x0 0x08900000 0x0 0xf4200>;
 		#clock-cells = <1>;
 		#reset-cells = <1>;
 		#power-domain-cells = <1>;
+		bootph-all;
 	};
 
 	ufs_mem_phy: phy@1d40000 {
@@ -38,21 +47,49 @@
 		#phy-cells = <0>;
 
 		status = "okay";
+		bootph-all;
 	};
 
 	smem {
 		compatible = "qcom,smem";
 		memory-region = <&smem_region>;
+		bootph-all;
 	};
+
+	sram: sram@146d8000 {
+		compatible = "qcom,nord-imem", "syscon", "simple-mfd";
+		reg = <0x0 0x146d8000 0x0 0x1000>;
+		ranges = <0x0 0x0 0x146d8000 0x1000>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+	};
+
+	/* IMEM boot cookie + TCSR HW version offsets */
+	qcom_hwinfo: qcom-hwinfo {
+		compatible = "qcom,hwinfo";
+
+		imem = <&sram>;
+		imem-boot-cookie-offset = <0x0>;
+
+		tcsr = <&tcsr>;
+		tcsr-hw-version-offset = <0x68000>;
+	};
+
 };
 
 &reserved_memory {
 	smem_region: smem-region@89b00000 {
 		reg = <0x0 0x89b00000 0x0 0x400000>;
 		no-map;
+		bootph-all;
 	};
 };
 
+&tlmm {
+	bootph-all;
+};
+
 &ufs_mem_hc {
 	compatible = "qcom,sa8797p-ufshc",
 		     "qcom,sa8255p-ufshc",
@@ -80,6 +117,8 @@
 
 	phys = <&ufs_mem_phy>;
 	phy-names = "ufsphy";
+
+	bootph-all;
 };
 
 &uart4 {
@@ -92,12 +131,14 @@
 	compatible = "qcom,sa8797p-geni-debug-uart",
 		     "qcom,sa8255p-geni-debug-uart",
 		     "qcom,geni-debug-uart";
+	bootph-all;
 };
 
 &qupv3_0 {
 	compatible = "qcom,sa8797p-geni-se-qup",
 		     "qcom,sa8255p-geni-se-qup",
 		     "qcom,geni-se-qup";
+	bootph-all;
 };
 
 &qupv3_1 {

arch/arm/dts/sdm845-shift-axolotl-u-boot.dtsi

@@ -0,0 +1,2 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "sdm845-u-boot.dtsi"

arch/arm/dts/sdm845-u-boot.dtsi

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0
+&gcc {
+	bootph-all;
+};
+
+&usb_1_hsphy {
+	bootph-all;
+};
+
+&usb_1_dwc3 {
+	bootph-all;
+};
+
+&rpmhcc {
+	bootph-all;
+};