Merge cb20 build updates from 'next'

.gitlab-ci.yml

@@ -46,47 +46,37 @@ include:
   - when: on_success
 
 build_cb20:
-  extends: .repo-image
+  extends: .cooker-image
   rules: !reference [.rules_cb20, rules]
   stage: image
   variables:
-    LAYER_PATH: ../layers
-    REPO_BB_CONF_PATH: ./conf
-    REPO_BB_BUILD_PATH: ./
-    ENV_SOURCE_SCRIPT: export
     MACHINE: cb20
-    IMAGE: ost-image
+    YOCTOMAN_CACHE_ARTIFACTS: ${CB20_IMAGE_ARTIFACTS}
+  artifacts:
+    name: ${MACHINE}-${TYPE}-${BUILD_DATE}
+    paths:
+      - "*.manifest"
+      - "*Tezi*.tar"
+      - "digest.yaml"
+    expire_in: 6 hours
 
 sdk_cb20:
-  extends: .repo-sdk
+  extends: .cooker-sdk
   rules: !reference [.rules_cb20, rules]
   stage: sdk
   needs:
     - build_cb20
   variables:
-    LAYER_PATH: ../layers
-    REPO_BB_CONF_PATH: ./conf
-    REPO_BB_BUILD_PATH: ./
-    ENV_SOURCE_SCRIPT: export
     MACHINE: cb20
-    IMAGE: ost-image
 
 esdk_cb20:
-  extends: .repo-esdk
+  extends: .cooker-esdk
   rules: !reference [.rules_cb20, rules]
   stage: esdk
   needs:
     - sdk_cb20
   variables:
-    LAYER_PATH: ../layers
-    REPO_BB_CONF_PATH: ./conf
-    REPO_BB_BUILD_PATH: ./
-    ENV_SOURCE_SCRIPT: export
     MACHINE: cb20
-    IMAGE: ost-image
-  # seems to be flaky and we don't really need it at the moment,
-  # so still try to build it, but don't complain if it fails
-  allow_failure: true
 
 build_x86rt:
   extends: .cooker-image
@@ -155,3 +145,18 @@ package_bblue:
   dependencies: [build_bblue,sdk_bblue,esdk_bblue]
   variables:
     MACHINE: "bblue"
+
+package_cb20:
+  rules:
+    - if: $CI_COMMIT_TAG
+  extends: .cooker-package
+  rules:
+    - if: $CI_COMMIT_TAG
+  dependencies: [build_cb20,sdk_cb20,esdk_cb20]
+  variables:
+    MACHINE: "cb20"
+    # CB20 has a different image format, so we need to special case this
+  script:
+    # make sure we have no more than 3 versions of a package at any one time to not overwhekm the Gitlab server's storage
+    - yoctoman package delete --all-but-newest-n 2
+    - yoctoman package upload --name ${MACHINE} --version ${CI_COMMIT_TAG} *.sh *.manifest *Tezi*.tar

meta-ost-toradex/conf/machine/cb20.conf

 require conf/machine/colibri-imx6.conf
+require conf/machine/include/colibri-imx6.inc
 
 KERNEL_DEVICETREE += "imx6dl-colibri-cb20.dtb"
 
@@ -20,4 +21,4 @@ PREFERRED_PROVIDER_u-boot-fw-utils = "libubootenv"
 PREFERRED_RPROVIDER_u-boot-fw-utils = "libubootenv"
 
 MACHINEOVERRIDES .= ":tdx:preempt-rt"
-IMX_DEFAULT_BSP = "nxp"
\ No newline at end of file
+IMX_DEFAULT_BSP = "nxp"

meta-ost-toradex/recipes-kernel/linux/linux-toradex/git/arch/arm/boot/dts/imx6dl-colibri-cb20.dts

@@ -85,6 +85,10 @@
 		  2 0 0x0c000000 0x02000000
 		  3 0 0x0e000000 0x02000000>;
 
+	sram@0,0 {
+		status = "disabled";
+	};
+
 	/* FPGA on CS0 */
 	fpga@0,0 {
 		compatible = "ntb,flink_eim_driver";
@@ -96,3 +100,4 @@
 	};
 };
 
+