SONiC support for BMC cards based on Aspeed AST2720

build_debian.sh

@@ -756,10 +756,72 @@ 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/$CONFIGURED_PLATFORM/sonic_fit.its $FILESYSTEM_ROOT/boot/
+            # Check if sonic_fit.its uses placeholders (template-based)
+            if grep -q "__KERNEL_VERSION__\|__KERNEL_PATH__" $PLATFORM_DIR/$CONFIGURED_PLATFORM/sonic_fit.its 2>/dev/null; then
+                # Generate sonic_fit.its with actual kernel version
+                # Detect the actual installed kernel version from the filesystem
+                # The kernel package may have a different version suffix than LINUX_KERNEL_VERSION
+                KERNEL_FILE=$(ls $FILESYSTEM_ROOT/boot/vmlinuz-* 2>/dev/null | head -1)
+                if [ -z "$KERNEL_FILE" ]; then
+                    echo "Error: No kernel found in $FILESYSTEM_ROOT/boot/"
+                    exit 1
+                fi
+                KERNEL_VERSION_FULL=$(basename "$KERNEL_FILE" | sed 's/^vmlinuz-//')
+
+                # Replace placeholders with actual paths
+                KERNEL_PATH="/boot/vmlinuz-${KERNEL_VERSION_FULL}"
+                INITRD_PATH="/boot/initrd.img-${KERNEL_VERSION_FULL}"
+
+                # Read DTB name from platform config if available
+                platform_conf_file="$PLATFORM_DIR/$CONFIGURED_PLATFORM/platform_${CONFIGURED_ARCH}.conf"
+                if [ ! -f "$platform_conf_file" ]; then
+                    platform_conf_file="$PLATFORM_DIR/$CONFIGURED_PLATFORM/platform.conf"
+                fi
+
+                # Extract dtb_name from platform config (e.g., dtb_name="ast2700-evb.dtb")
+                # Strip quotes and comments
+                DTB_NAME=$(grep "^dtb_name=" "$platform_conf_file" 2>/dev/null | cut -d'=' -f2 | sed 's/#.*//' | tr -d '"' | tr -d "'" | tr -d ' ')
+
+                if [ -z "$DTB_NAME" ]; then
+                    echo "Warning: dtb_name not found in $platform_conf_file, using default"
+                    DTB_NAME="default.dtb"
+                fi
+
+                # Construct DTB path based on platform
+                if [[ $CONFIGURED_PLATFORM == aspeed ]]; then
+                    DTB_PATH="/usr/lib/linux-image-${KERNEL_VERSION_FULL}/aspeed/${DTB_NAME}"
+                else
+                    # Generic fallback - use platform name
+                    DTB_PATH="/usr/lib/linux-image-${KERNEL_VERSION_FULL}/${CONFIGURED_PLATFORM}/${DTB_NAME}"
+                fi
+
+                # Substitute placeholders in sonic_fit.its template
+                sed -e "s|__KERNEL_VERSION__|${KERNEL_VERSION_FULL}|g" \
+                    -e "s|__KERNEL_PATH__|${KERNEL_PATH}|g" \
+                    -e "s|__INITRD_PATH__|${INITRD_PATH}|g" \
+                    -e "s|__DTB_PATH__|${DTB_PATH}|g" \
+                    -e "s|__DTB_NAME__|${DTB_NAME}|g" \
+                    $PLATFORM_DIR/$CONFIGURED_PLATFORM/sonic_fit.its > /tmp/sonic_fit.its.tmp
+
+                sudo cp -v /tmp/sonic_fit.its.tmp $FILESYSTEM_ROOT/boot/sonic_fit.its
+                rm -f /tmp/sonic_fit.its.tmp
+            else
+                # Platform uses hardcoded paths - copy as-is
+                sudo cp -v $PLATFORM_DIR/$CONFIGURED_PLATFORM/sonic_fit.its $FILESYSTEM_ROOT/boot/
+            fi
+
             sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -f /boot/sonic_fit.its /boot/sonic_${CONFIGURED_ARCH}.fit
         fi
     fi
+
+    # Install U-Boot environment initialization script and service for aspeed platform
+    if [[ $CONFIGURED_PLATFORM == aspeed ]]; then
+        echo "Installing U-Boot environment initialization service for aspeed platform..."
+        sudo cp -v $PLATFORM_DIR/$CONFIGURED_PLATFORM/sonic-uboot-env-init.sh $FILESYSTEM_ROOT/usr/bin/
+        sudo chmod +x $FILESYSTEM_ROOT/usr/bin/sonic-uboot-env-init.sh
+        sudo cp -v $PLATFORM_DIR/$CONFIGURED_PLATFORM/sonic-uboot-env-init.service $FILESYSTEM_ROOT/etc/systemd/system/
+        sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable sonic-uboot-env-init.service
+    fi
 fi
 
 # Collect host image version files before cleanup

device/aspeed/arm64-aspeed_ast2700-r0/asic.conf

@@ -0,0 +1,2 @@
+# aspeed-ast2700 doesn't have a switch asic but SONIC assumes NUM_ASIC to be atleast 1
+NUM_ASIC=1

device/aspeed/arm64-aspeed_ast2700-r0/default_sku

@@ -0,0 +1 @@
+AST2700-BMC

device/aspeed/arm64-aspeed_ast2700-r0/installer.conf

@@ -0,0 +1,4 @@
+# AST2700 uses U-Boot, not GRUB, so CONSOLE_PORT/CONSOLE_DEV are not used
+# Console configuration is handled in platform_arm64.conf via kernel cmdline
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX=""
+CONSOLE_SPEED=115200

device/aspeed/arm64-aspeed_ast2700-r0/platform.json

@@ -0,0 +1,23 @@
+{
+    "chassis": {
+        "name": "AST2700-BMC",
+        "thermal_manager": false,
+        "status_led": {
+            "controllable": true,
+            "colors": ["green", "amber", "off"]
+        },
+        "components": [
+            {
+                "name": "BMC"
+            },
+            {
+                "name": "BIOS"
+            }
+        ],
+        "fans": [],
+        "psus": [],
+        "thermals": [],
+        "sfps": []
+    },
+    "interfaces": {}
+}

device/aspeed/arm64-aspeed_ast2700-r0/platform_asic

@@ -0,0 +1 @@
+aspeed

device/aspeed/arm64-aspeed_ast2700-r0/platform_components.json

@@ -0,0 +1,10 @@
+{
+    "chassis": {
+        "AST2700-BMC": {
+            "component": {
+                "BMC": {},
+                "BIOS": {}
+            }
+        }
+    }
+}

device/aspeed/arm64-aspeed_ast2700-r0/platform_env.conf

@@ -0,0 +1,2 @@
+# BMC platform environment
+export BMC_PLATFORM=1

device/aspeed/arm64-aspeed_ast2700-r0/pmon_daemon_control.json

@@ -0,0 +1,17 @@
+{
+    "skip_thermalctld": false,
+    "skip_ledd": true,
+    "skip_xcvrd": true,
+    "skip_psud": true,
+    "skip_syseepromd": false,
+    "skip_pcied": true,
+    "skip_chassisd": true,
+    "skip_fancontrol": true,
+    "include_sensormond": false,
+    "thermalctld": {
+        "thermal_monitor_initial_interval": 5,
+        "thermal_monitor_update_interval": 60,
+        "thermal_monitor_update_elapsed_threshold": 30
+    }
+}
+

dockers/docker-database/database_config.json.j2

@@ -24,7 +24,7 @@
             "persistence_for_warm_boot" : "yes"
         }
 {% endif %}
-{% if DATABASE_TYPE is defined and DATABASE_TYPE == "dpudb" %}
+{% if DATABASE_TYPE is defined and (DATABASE_TYPE == "dpudb" or DATABASE_TYPE == "bmcdb") %}
 {% else %}
         ,
         "redis_bmp":{
@@ -139,6 +139,8 @@
             "separator": ":",
             "instance" : {% if include_remote_db %} "remote_redis" {% else %} "redis" {% endif %}
         }
+{% elif DATABASE_TYPE is defined and DATABASE_TYPE == "bmcdb" %}
+        {# No BMP_STATE_DB for BMC devices #}
 {% else %}
         ,
         "BMP_STATE_DB" : {

dockers/docker-database/docker-database-init.sh

@@ -41,6 +41,11 @@ then
     fi
 fi
 
+if [[ $IS_BMC_DEVICE == "true" ]]
+then
+    export DATABASE_TYPE="bmcdb"
+fi
+
 export BMP_DB_PORT=6400
 
 REDIS_DIR=/var/run/redis$NAMESPACE_ID
@@ -143,6 +148,8 @@ done
 
 chown -R redis:redis $REDIS_DIR
 REDIS_BMP_DIR="/var/lib/redis_bmp"
-chown -R redis:redis $REDIS_BMP_DIR
+if [[ -d $REDIS_BMP_DIR ]]; then
+    chown -R redis:redis $REDIS_BMP_DIR
+fi
 
 exec /usr/local/bin/supervisord

dockers/docker-database/multi_database_config.json.j2

@@ -59,13 +59,17 @@
             "unix_socket_path": "",
             "persistence_for_warm_boot" : "yes"
         }
-{% endif %},
+{% endif %}
+{% if DATABASE_TYPE is defined and (DATABASE_TYPE == "dpudb" or DATABASE_TYPE == "bmcdb") %}
+{% else %}
+        ,
         "redis_bmp":{
             "hostname" : "{{HOST_IP}}",
             "port" : {{BMP_DB_PORT}},
             "unix_socket_path" : "/var/run/redis{{DEV}}/redis_bmp.sock",
             "persistence_for_warm_boot" : "yes"
         }
+{% endif %}
     },
     "DATABASES" : {
        "APPL_DB": {
@@ -181,12 +185,16 @@
             "separator": ":",
             "instance" : {% if include_remote_db %} "remote_redis" {% else %} "redis" {% endif %}
         }
-{% endif %},
-         "BMP_STATE_DB" : {
+{% elif DATABASE_TYPE is defined and DATABASE_TYPE == "bmcdb" %}
+        {# No BMP_STATE_DB for BMC devices #}
+{% else %}
+        ,
+        "BMP_STATE_DB" : {
             "id" : 20,
             "separator": "|",
             "instance" : "redis_bmp"
         }
+{% endif %}
     },
     "VERSION" : "1.0"
 }