From 579a8608c95edfbb9c0412b01f0492252e80e1f4 Mon Sep 17 00:00:00 2001 From: Timo Sairiala Date: Tue, 24 Sep 2024 13:44:59 +0300 Subject: [PATCH] add MFT_ETHERNET config to manifest add MFT_ETHERNET support to manifest but also have to disable netman call from rcS as we use netconfig from rc.board_mavlink instead --- ROMFS/px4fmu_common/init.d/rcS | 9 +++++---- boards/ssrc/common | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 61ef182f3ad0..3e9e98706795 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -183,10 +183,11 @@ else param select-backup $PARAM_BACKUP_FILE fi - if mft query -q -k MFT -s MFT_ETHERNET -v 1 - then - netman update -i eth0 - fi + # in Saluki we use netconfig in rc.board_mavlink + # if mft query -q -k MFT -s MFT_ETHERNET -v 1 + # then + # netman update -i eth0 + # fi # # If the airframe has been previously reset SYS_AUTCONFIG will have been set to 1 and other params will be reset on the next boot. diff --git a/boards/ssrc/common b/boards/ssrc/common index 0975a65c22fc..610b00721cc7 160000 --- a/boards/ssrc/common +++ b/boards/ssrc/common @@ -1 +1 @@ -Subproject commit 0975a65c22fc92fe77cd7b98108d4c424614dfd1 +Subproject commit 610b00721cc7c04ad9081aa777b95f0fbf62f1e6