[nord-staging-qcom-next] Upgrade SPL form v4 to v8

Kconfig

@@ -559,6 +559,14 @@ config REMAKE_ELF
 	  U-Boot binary (u-boot.bin), which may already have been statically
 	  relocated and may already have a device-tree appended to it.
 
+config REMAKE_ELF_LDSCRIPT
+	string "Linker script for u-boot.elf"
+	depends on REMAKE_ELF
+	default "arch/u-boot-elf.lds"
+	help
+	  This allows specifying a linker script that will be used to
+	  re-wrap the U-Boot binary into an ELF.
+
 config BUILD_TARGET
 	string "Build target special images"
 	default "u-boot-elf.shdr" if RCAR_64 && RCAR_64_RSIP

Makefile

@@ -2018,7 +2018,9 @@ spl/u-boot-spl.elf: spl/u-boot-spl.bin u-boot-elf.lds
 	$(Q)$(OBJCOPY) -I binary $(PLATFORM_ELFFLAGS) $< spl/u-boot-spl-elf.o
 	$(call if_changed,u-boot-spl-elf)
 
-u-boot-elf.lds: arch/u-boot-elf.lds prepare FORCE
+REMAKE_ELF_LDSCRIPT := $(addprefix $(srctree)/,$(CONFIG_REMAKE_ELF_LDSCRIPT:"%"=%))
+
+u-boot-elf.lds: $(REMAKE_ELF_LDSCRIPT) prepare FORCE
 	$(call if_changed_dep,cpp_lds)
 
 PHONY += prepare0

arch/arm/Kconfig

@@ -1153,6 +1153,10 @@ config ARCH_SNAPDRAGON
 	select ANDROID_BOOT_IMAGE_IGNORE_BLOB_ADDR
 	select MMU_PGPROT
 	select SUPPORT_SPL
+	select SPL_DM_PMIC if SPL && DM_PMIC
+	select SPL_DM_USB_GADGET if SPL && USB
+	select SPL_HAS_BSS_LINKER_SECTION if SPL && SPL_SEPARATE_BSS
+	select SPL_USB_GADGET if SPL && USB
 	imply OF_UPSTREAM
 	imply CMD_DM
 	imply DM_USB_GADGET

arch/arm/config.mk

@@ -120,6 +120,13 @@ ifeq ($(CONFIG_ARM64),y)
 LDFLAGS_u-boot += -z common-page-size=0x1000 -z max-page-size=0x1000
 endif
 
+ifeq ($(CONFIG_ARCH_SNAPDRAGON),y)
+# The CONFIG_REMAKE_ELF u-boot.elf link step doesn't pick up the
+# 4K page-size flags used for u-boot.bin above, so wire them in here
+# too. TME's IMGAUTH requires 4K-aligned ELF segments.
+LDFLAGS_u-boot-elf += -z common-page-size=0x1000 -z max-page-size=0x1000
+endif
+
 #
 # FIXME: binutils versions < 2.22 have a bug in the assembler where
 # branches to weak symbols can be incorrectly optimized in thumb mode

arch/arm/cpu/armv8/cache_v8.c

@@ -1063,6 +1063,15 @@ static void set_regions(u64 start, u64 size, u64 attrs, bool flag)
 				break;
 			}
 		}
+		if (level == 4) {
+			/* No level could map this granule — without this guard the
+			 * outer while(size>0) spins forever. Report and bail so the
+			 * offending region is visible instead of hanging.
+			 */
+			log_err("mmu_change_region_attr_nobreak: STUCK at start=0x%llx size=0x%llx (no level mapped)\n",
+			        (unsigned long long)start, (unsigned long long)size);
+			break;
+		}
 	}
 }
 

arch/arm/dts/Makefile

@@ -505,6 +505,7 @@ dtb-$(CONFIG_TARGET_TEN64) += fsl-ls1088a-ten64.dtb
 dtb-$(CONFIG_TARGET_STEMMY) += ste-ux500-samsung-stemmy.dtb
 
 dtb-$(CONFIG_ARCH_SNAPDRAGON) += \
+        nord-ride.dtb \
         shikra-cqm-evk.dtb \
         shikra-cqs-evk.dtb \
         shikra-iqs-evk.dtb