[Marvell] Build infrastructure enhancements (sonic-net#18143)

* Move mrvl-prestera and sonic-platform-marvell submodule

'mrvl-prestera' and 'sonic-platform-marvell' submodules are
moved from 'marvell-arm64'to 'marvell'.
Additionaly submodules are changed to support multi-architecture build.

Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>

Author: pavannaregundi

.azure-pipelines/azure-pipelines-build.yml

@@ -90,13 +90,15 @@ jobs:
             pool: sonicbld-armhf
           timeoutInMinutes: 2880
           variables:
+            PLATFORM_NAME: marvell
             PLATFORM_ARCH: armhf
 
         - name: marvell-arm64
           ${{ if not(parameters.qemuOrCrossBuild) }}:
             pool: sonicbld-arm64
           timeoutInMinutes: 2880
           variables:
+            PLATFORM_NAME: marvell
             PLATFORM_ARCH: arm64
 
         - name: marvell

.azure-pipelines/azure-pipelines-image-template.yml

@@ -49,7 +49,8 @@ jobs:
           sudo modprobe overlay
           sudo apt-get install -y acl
           sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
-          ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
+          [ -z "$PLATFORM_NAME" ] && PLATFORM_NAME=$(PLATFORM_AZP)
+          ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$PLATFORM_NAME PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
         displayName: 'Make configure'
     postSteps:
       - script: |

.azure-pipelines/official-build-cache.yml

@@ -49,4 +49,5 @@ stages:
           pool: sonicbld-armhf
           timeoutInMinutes: 1200
           variables:
+            PLATFORM_NAME: marvell
             PLATFORM_ARCH: armhf

.gitmodules

@@ -115,9 +115,9 @@
 [submodule "src/sonic-dash-api"]
 	path = src/sonic-dash-api
 	url = https://github.com/sonic-net/sonic-dash-api.git
-[submodule "platform/marvell-arm64/mrvl-prestera"]
-	path = platform/marvell-arm64/mrvl-prestera
+[submodule "platform/marvell/mrvl-prestera"]
+	path = platform/marvell/mrvl-prestera
 	url = https://github.com/Marvell-switching/mrvl-prestera.git
-[submodule "platform/marvell-arm64/sonic-platform-marvell"]
-	path = platform/marvell-arm64/sonic-platform-marvell
+[submodule "platform/marvell/sonic-platform-marvell"]
+	path = platform/marvell/sonic-platform-marvell
 	url = https://github.com/Marvell-switching/sonic-platform-arm64.git

README.md

@@ -204,7 +204,7 @@ make target/sonic-[ASIC_VENDER]-armhf.bin
 _example:_
 
 ```shell
-make configure PLATFORM=marvell-armhf PLATFORM_ARCH=armhf
+make configure PLATFORM=marvell PLATFORM_ARCH=armhf
 make target/sonic-marvell-armhf.bin
 ```
 
@@ -215,7 +215,7 @@ using cross-compilation, run the following commands:
 # Execute make configure once to configure ASIC and ARCH for cross-compilation build
 
 NOJESSIE=1 NOSTRETCH=1 BLDENV=buster CROSS_BLDENV=1 \
-make configure PLATFORM=marvell-armhf PLATFORM_ARCH=armhf
+make configure PLATFORM=marvell PLATFORM_ARCH=armhf
 
 # Execute Arm32 build using cross-compilation environment
 
@@ -234,7 +234,7 @@ make configure PLATFORM=[ASIC_VENDOR] PLATFORM_ARCH=arm64
 
 # example:
 
-make configure PLATFORM=marvell-arm64 PLATFORM_ARCH=arm64
+make configure PLATFORM=marvell PLATFORM_ARCH=arm64
 ```
 
  **NOTE**:

azure-pipelines.yml

@@ -79,11 +79,13 @@ stages:
       - name: marvell-arm64
         pool: sonicbld-arm64
         variables:
+           PLATFORM_NAME: marvell
            PLATFORM_ARCH: arm64
       - name: marvell-armhf
         pool: sonicbld-armhf
         timeoutInMinutes: 1200
         variables:
+          PLATFORM_NAME: marvell
           PLATFORM_ARCH: armhf
           INCLUDE_RESTAPI: y
 

build_debian.sh

@@ -781,7 +781,7 @@ if [[ $TARGET_BOOTLOADER == uboot ]]; then
             ## Overwriting the initrd image with uInitrd
             sudo LANG=C chroot $FILESYSTEM_ROOT mv /boot/u${INITRD_FILE} /boot/$INITRD_FILE
         else
-            sudo cp -v $PLATFORM_DIR/${sonic_asic_platform}-${CONFIGURED_ARCH}/sonic_fit.its $FILESYSTEM_ROOT/boot/
+            sudo cp -v $PLATFORM_DIR/$CONFIGURED_PLATFORM/sonic_fit.its $FILESYSTEM_ROOT/boot/
             sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -f /boot/sonic_fit.its /boot/sonic_${CONFIGURED_ARCH}.fit
         fi
     fi

build_image.sh

@@ -9,7 +9,11 @@ set -x -e
 CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
 
 if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
-    . ./onie-image-${CONFIGURED_ARCH}.conf
+    if [ -r ./platform/${CONFIGURED_PLATFORM}/onie-image-${CONFIGURED_ARCH}.conf ]; then
+        . ./platform/${CONFIGURED_PLATFORM}/onie-image-${CONFIGURED_ARCH}.conf
+    else
+        . ./onie-image-${CONFIGURED_ARCH}.conf
+    fi
 else
     . ./onie-image.conf
 fi
@@ -82,10 +86,14 @@ generate_onie_installer_image()
         done
     done
 
+    platform_conf_file="platform/$TARGET_MACHINE/platform_${CONFIGURED_ARCH}.conf"
+    if [ ! -f $platform_conf_file ]; then
+        platform_conf_file="platform/$TARGET_MACHINE/platform.conf"
+    fi
     ## Generate an ONIE installer image
     ## Note: Don't leave blank between lines. It is single line command.
     ./onie-mk-demo.sh $CONFIGURED_ARCH $TARGET_MACHINE $TARGET_PLATFORM-$TARGET_MACHINE-$ONIEIMAGE_VERSION \
-          installer platform/$TARGET_MACHINE/platform.conf $output_file OS $IMAGE_VERSION $ONIE_IMAGE_PART_SIZE \
+          installer $platform_conf_file $output_file OS $IMAGE_VERSION $ONIE_IMAGE_PART_SIZE \
           $INSTALLER_PAYLOAD $SECURE_UPGRADE_SIGNING_CERT $SECURE_UPGRADE_DEV_SIGNING_KEY
 }
 

device/marvell/arm64-marvell_rd98DX35xx-r0/platform_asic

@@ -1 +1 @@
-marvell-arm64
+marvell

device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/platform_asic

@@ -1 +1 @@
-marvell-arm64
+marvell

device/nokia/arm64-nokia_ixs7215_52xb-r0/platform_asic

@@ -1 +1 @@
-marvell-arm64
+marvell

device/nokia/armhf-nokia_ixs7215_52x-r0/platform_asic

@@ -1 +1 @@
-marvell-armhf
+marvell

onie-image-armhf.conf

@@ -31,22 +31,22 @@ DOCKERFS_DIR=docker
 DOCKER_RAMFS_SIZE=2500M
 
 ## Output file name for onie installer
-OUTPUT_ONIE_IMAGE=target/sonic-$TARGET_MACHINE.bin
+OUTPUT_ONIE_IMAGE=target/sonic-$TARGET_MACHINE-$CONFIGURED_ARCH.bin
 
 ## Output file name for raw image
-OUTPUT_RAW_IMAGE=target/sonic-$TARGET_MACHINE.raw
+OUTPUT_RAW_IMAGE=target/sonic-$TARGET_MACHINE-$CONFIGURED_ARCH.raw
 
 ## Raw image size in MB
 RAW_IMAGE_DISK_SIZE=4096
 
 ## Output file name for kvm image
-OUTPUT_KVM_IMAGE=target/sonic-$TARGET_MACHINE.img
+OUTPUT_KVM_IMAGE=target/sonic-$TARGET_MACHINE-$CONFIGURED_ARCH.img
 
 ## Kvm image size in GB
 KVM_IMAGE_DISK_SIZE=16
 
 ## Output file name for aboot installer
-OUTPUT_ABOOT_IMAGE=target/sonic-aboot-$TARGET_MACHINE.swi
+OUTPUT_ABOOT_IMAGE=target/sonic-aboot-$TARGET_MACHINE-$CONFIGURED_ARCH.swi
 
 ## Aboot boot image name
 ABOOT_BOOT_IMAGE=.sonic-boot.swi

onie-mk-demo.sh

@@ -107,7 +107,7 @@ echo -n "."
 cp -r $onie_installer_payload $tmp_installdir || clean_up 1
 echo -n "."
 [ -r "$platform_conf" ] && {
-    cp $platform_conf $tmp_installdir || clean_up 1
+    cp $platform_conf $tmp_installdir/platform.conf || clean_up 1
 }
 echo "machine=$machine" > $tmp_installdir/machine.conf
 echo "platform=$platform" >> $tmp_installdir/machine.conf