glymur-crd: add spinor-nvme combo subdir

Add a combined SPINOR + NVMe partition definition for Glymur CRD. Use
%include to pull in the existing spinor and nvme partitions.conf files.
Move contents.xml.in from spinor/ to spinor-nvme/ since it already
references both storage types and update file_path references to use
subdirectory names (spinor/, nvme/) instead of relative paths (., ../).

The combo subdir generates artifacts for both storage types under
spinor-nvme/spinor/ and spinor-nvme/nvme/, making it straightforward for
downstream consumers to discover all required storages for this
platform.

Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>

Author: lool

…tforms/glymur-crd/spinor/contents.xml.in …s/glymur-crd/spinor-nvme/contents.xml.inplatforms/glymur-crd/spinor/contents.xml.in renamed to platforms/glymur-crd/spinor-nvme/contents.xml.in platforms/glymur-crd/spinor/contents.xml.in renamed to platforms/glymur-crd/spinor-nvme/contents.xml.in

@@ -60,41 +60,41 @@
       <download_file>
         <fastboot_complete>{partition_name}</fastboot_complete>
         <file_name>{image_name}</file_name>
-        <file_path>.</file_path>
+        <file_path>disk0</file_path>
       </download_file>
       <partition_file>
         <storage_type>{storage_type}</storage_type>
         <file_name>{partition_file_name}</file_name>
-        <file_path flavor="default">.</file_path>
+        <file_path flavor="default">disk0</file_path>
       </partition_file>
       <partition_patch_file>
         <storage_type>{storage_type}</storage_type>
         <file_name>{partition_patch_file_name}</file_name>
-        <file_path flavor="default">.</file_path>
+        <file_path flavor="default">disk0</file_path>
       </partition_patch_file>
       <download_file storage_type="nvme" fastboot_complete="efi">
         <file_name>efi.bin</file_name>
-        <file_path flavor="qcom_server">../</file_path>
+        <file_path flavor="qcom_server">disk1</file_path>
       </download_file>
       <download_file storage_type="nvme" fastboot_complete="rootfs">
         <file_name>rootfs.img</file_name>
-        <file_path flavor="qcom_server">../</file_path>
+        <file_path flavor="qcom_server">disk1</file_path>
       </download_file>
       <download_file storage_type="nvme" flavor="qcom_server">
         <file_name>gpt_main0.bin</file_name>
-        <file_path flavor="qcom_server">../</file_path>
+        <file_path flavor="qcom_server">disk1</file_path>
       </download_file>
       <download_file storage_type="nvme" flavor="qcom_server">
         <file_name>gpt_backup0.bin</file_name>
-        <file_path flavor="qcom_server">../</file_path>
+        <file_path flavor="qcom_server">disk1</file_path>
       </download_file>
       <partition_file storage_type="nvme" flavor="qcom_server">
         <file_name>rawprogram0.xml</file_name>
-        <file_path flavor="qcom_server">../</file_path>
+        <file_path flavor="qcom_server">disk1</file_path>
       </partition_file>
       <partition_patch_file storage_type="nvme" flavor="qcom_server">
         <file_name>patch0.xml</file_name>
-        <file_path flavor="qcom_server">../</file_path>
+        <file_path flavor="qcom_server">disk1</file_path>
       </partition_patch_file>
     </build>
   </builds_flat>

platforms/glymur-crd/spinor-nvme/partitions.conf

@@ -0,0 +1,8 @@
+# Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+#
+# Combined NVMe + SPINOR partition layout for Glymur CRD.
+# NHLOS firmware on SPINOR, HLOS (Linux) on NVMe.
+
+%include ../spinor/partitions.conf
+%include ../nvme/partitions.conf