Merge branch '262-add-artifacs'

6051d5dc · Grzegorz Daniluk · 6d97cb8a · b026fd87 · 6051d5dc · 6051d5dc
Commit 6051d5dc authored Dec 18, 2023 by Grzegorz Daniluk
Hide whitespace changes
Inline Side-by-side

Showing with 31 additions and 34 deletions

.gitlab-ci.yml .gitlab-ci.yml +26 -21

Makefile gw/Makefile +1 -1

Makefile sw/Makefile +3 -3

ps-user_v2.dtsi sw/configs/device-tree/ps-user_v2.dtsi +1 -9

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ variables:
 # Define stages
 stages:
 - gateware
- bootbin
+- firmware
 - release

 # Built bistream job
@@ -27,14 +27,14 @@ stages:
    expire_in: 7d

 # Build bitstream for each project
-build_diot_v1:
-  extends: .build-gw
-  variables:
-    PROJECT: diot_v1
-  artifacts:
-    name: diot_v1-gw-$CI_JOB_ID
+#diot-v1-GW:
+#  extends: .build-gw
+#  variables:
+#    PROJECT: diot_v1
+#  artifacts:
+#    name: diot_v1-gw-$CI_JOB_ID

-build_diot_v2:
+diot-v2-GW:
  extends: .build-gw
  variables:
    PROJECT: diot_v2
@@ -42,8 +42,8 @@ build_diot_v2:
    name: diot_v2-gw-$CI_JOB_ID

 # Build OS
-.build-image:
-  stage: bootbin
+.build_fw:
+  stage: firmware
  tags:
    - petalinux-2019.2
  script:
@@ -53,25 +53,30 @@ build_diot_v2:
  artifacts:
    when: on_success
    paths:
-    - sw/artifacts/BOOT.BIN
-    - sw/artifacts/image.ub
    - sw/artifacts/fsbl.elf
+    - sw/artifacts/pmufw.elf
+    - sw/artifacts/pl_gateware.bit
+    - sw/artifacts/bl31.elf
+    - sw/artifacts/u-boot.elf
+    - sw/artifacts/system.dtb
+    - sw/artifacts/boot.bin
+    - sw/artifacts/image.ub
    - sw/log/*
    - gw/output_files/$PROJECT/diot_v$BOARD_VERSION.xsa
    expire_in: 7d

 # Build OS for each project
-build-diot-v1-img:
-  extends: .build-image
-  variables:
-    PROJECT: diot_v1
-    BOARD_VERSION: 1
-  artifacts:
-    name: diot_v1-linux-$CI_JOB_ID
+#diot-v1-SW:
+#  extends: .build_fw
+#  variables:
+#    PROJECT: diot_v1
+#    BOARD_VERSION: 1
+#  artifacts:
+#    name: diot_v1-linux-$CI_JOB_ID

 # Build OS for each project
-build-diot-v2-img:
-  extends: .build-image
+diot-v2-SW:
+  extends: .build_fw
  variables:
    PROJECT: diot_v2
    BOARD_VERSION: 2

--- a/gw/Makefile
+++ b/gw/Makefile
 #!/usr/bin/make
 # ##############################################################################
 # Settings
-DOCKER_NAME=vivado-template
+DOCKER_NAME=gitlab-registry.cern.ch/be-cem-edl/diot/docker-util/xilinx_tools:latest
 DOCKERFILE_PATH=docker
 XILINX_TOOLS=/opt/Xilinx
 XIL_VER?=2019.2

--- a/sw/Makefile
+++ b/sw/Makefile
@@ -627,7 +627,7 @@ bootbin_build: bootbin_config $(BOOTGEN_BIN)
 			$(VT_LOOP) stat -c "%y %15s %n" artifacts/"$$i"; \
 			cp -a artifacts/"$$i" "$(BOOTBIN_DIR)" || exit 1; \
 		done $(LOGT)
-	$(V) cd "$(BOOTBIN_DIR)" && "$(BOOTGEN_BIN)" -image boot_bin.bif -arch zynqmp -w -o BOOT.BIN  $(LOG)
+	$(V) cd "$(BOOTBIN_DIR)" && "$(BOOTGEN_BIN)" -image boot_bin.bif -arch zynqmp -w -o boot.bin  $(LOG)
 	$(VT)echo -e "$(CO)Building boot.bin... done$(NC)"                        $(LOGT)
 	$(V) echo `date` > _done/$@                                            $(LOG)

@@ -638,13 +638,13 @@ bootbin_build_force:

 bootbin_artifacts: bootbin_build
 	$(VT)echo -e "$(CO)Copy boot.bin's artifacts...$(NC)"                     $(LOGT)
-	$(V) cp -v "$(BOOTBIN_DIR)"/BOOT.BIN artifacts                         $(LOG)
+	$(V) cp -v "$(BOOTBIN_DIR)"/boot.bin artifacts                         $(LOG)
 	$(VT)echo -e "$(CO)Copy boot.bin's artifacts... done$(NC)"                $(LOGT)
 	$(V) echo `date` > _done/$@                                            $(LOG)

 bootbin_clean:
 	$(VT)echo -e "$(CO)Clean boot.bin...$(NC)"                                $(LOGT)
-	$(V) rm -f "$(BOOTBIN_DIR)"/BOOT.BIN                                   $(LOG)
+	$(V) rm -f "$(BOOTBIN_DIR)"/boot.bin                                   $(LOG)
 	$(V) rm -f _done/bootbin_artifacts _done/bootbin_build _done/bootbin_config $(LOG)
 	$(VT)echo -e "$(CO)Clean boot.bin... done$(NC)"                           $(LOGT)


--- a/sw/configs/device-tree/ps-user_v2.dtsi
+++ b/sw/configs/device-tree/ps-user_v2.dtsi
@@ -153,15 +153,7 @@
 		spi-max-frequency = <108000000>;
 		partition@0x00000000 {
 			label = "boot";
-			reg = <0x00000000 0x02000000>; /* 32MB */
-		};
-		partition@0x02000000 {
-			label = "bootenv";
-			reg = <0x02000000 0x00040000>; /* 256KB */
-		};
-		partition@0x02040000 {
-			label = "kernel";
-			reg = <0x02040000 0x04000000>; /* 64MB */
+			reg = <0x00000000 0x08000000>; /* 32MB */
 		};
 	};
 };