Add support Asus TUF-AX4200q

.github/workflows/build.yml

@@ -157,8 +157,9 @@ jobs:
           - rt-ax57m
           - rt-ax59u
           - rt-ax89x
-          - tuf_ax4200
-          - tuf_ax6000
+          - tuf-ax4200
+          - tuf-ax4200q
+          - tuf-ax6000
           - zen-bt8
         isTest:
           - ${{ needs.check.outputs.test_build == 'true' }}

_initramfs/tuf-ax4200q.config

@@ -0,0 +1,14 @@
+CONFIG_TARGET_mediatek=y
+CONFIG_TARGET_mediatek_filogic=y
+CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax4200q=y
+
+#include _addons.config
+#include _base_initrd.config
+#include _wifi_en.config
+
+
+CONFIG_TARGET_INITRAMFS_FORCE=y
+CONFIG_TARGET_ROOTFS_INITRAMFS=y
+CONFIG_USES_SEPARATE_INITRAMFS=n
+CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n
+

tuf-ax4200q.config

@@ -0,0 +1,42 @@
+CONFIG_TARGET_mediatek=y
+CONFIG_TARGET_mediatek_filogic=y
+CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax4200q=y
+
+#include _addons.config
+#include _base.config
+#include _wifi_en.config
+#include _printer.config
+#include _samba.config
+#include _torrents.config
+#include _proxy.config
+#include _argon.config
+#include _vpn.config
+
+### Temp and sensors
+CONFIG_PACKAGE_lm-sensors=y
+CONFIG_PACKAGE_lm-sensors-detect=y
+CONFIG_PACKAGE_luci-app-temp-status=y
+CONFIG_PACKAGE_luci-i18n-temp-status-ru=y
+CONFIG_PACKAGE_collectd-mod-sensors=y
+
+### HDD tools
+CONFIG_PACKAGE_smartmontools=y
+CONFIG_PACKAGE_hdparm=y
+CONFIG_PACKAGE_hd-idle=y
+CONFIG_PACKAGE_luci-app-hd-idle=y
+#CONFIG_PACKAGE_luci-i18n-hd-idle-ru=y
+CONFIG_PACKAGE_luci-app-disks-info=y
+#CONFIG_PACKAGE_luci-i18n-disks-info-ru=y
+CONFIG_PACKAGE_luci-app-diskman=y
+
+### Luci dashboard
+CONFIG_PACKAGE_luci-mod-dashboard=y
+CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
+
+### Network Ports viewer
+CONFIG_PACKAGE_luci-app-tn-netports=y
+CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
+
+### TimeControl
+CONFIG_PACKAGE_luci-app-timecontrol=m
+

xmake.sh

@@ -15,7 +15,6 @@ OPT_FULL_REBUILD=false
 KALLSYMS=false
 TESTING_KERNEL=false
 BUILD_ONLY_INITRAMFS=false
-BUILD_SKIP_INITRAMFS=false
 ONLY_INIT=false
 
 while getopts "j:t:fiskTI" opt; do
@@ -26,7 +25,6 @@ while getopts "j:t:fiskTI" opt; do
 		k) KALLSYMS=true;;
 		T) TESTING_KERNEL=true;;
 		i) BUILD_ONLY_INITRAMFS=true;;
-		s) BUILD_SKIP_INITRAMFS=true;;
 		I) ONLY_INIT=true;;
 	esac
 done
@@ -70,7 +68,7 @@ function build_target {
 	fi
 	inclst=$( get_cfg_inc_lst $CFG )
 	for inc in $inclst; do
-		incfn=$XDIR/$inc
+		incfn=$XDIR/_cfginc/$inc
 		[ ! -f $incfn ] && die "File '$inc' not found!"
 		sed -i "/#include $inc/a <<LF>><<LF>>" $CFG
 		sed -i "s/<<LF>>/\n/g" $CFG
@@ -312,6 +310,9 @@ function build_target {
 		sed -i "s/<<ARCH>>/$TARGET_ARCH_PACKAGES/g" $APK_CFEED_FN
 		logmsg "Added support of Fantastic packages [https://fantastic-packages.github.io/releases]"
 	fi
+	if [ $BUILD_ONLY_INITRAMFS = true ]; then
+		rm -f $APK_DIR/repositories.d/customfeeds.list
+	fi
 
 	SYSCTLCONF_FN=$XDIR/files/etc/sysctl.conf
 	if [ -f $SYSCTLCONF_FN ]; then
@@ -341,13 +342,19 @@ function build_config {
 	local cfg=$1
 	local cfg_name=$( basename $cfg )
 	local target_name=${cfg_name%.*}
+	local initramfs=false
 	local board=$( get_cfg_board $cfg )
 	local subtarget=$( get_cfg_subtarget $cfg $board )
 	local device=$( get_cfg_dev_lst $cfg $board $subtarget )
 	local outdir=$XDIR/bin/targets/$board/$subtarget	
-	echo Start build for target $cfg_name "($board-$subtarget-$device)"
-	
-	build_target $cfg_name
+
+	if echo "$cfg" | grep -q '_initramfs/' ; then
+		initramfs=true
+		target_name=${target_name}_initramfs
+	fi
+	echo Start build for target $target_name "($board-$subtarget-$device)"
+
+	build_target $cfg
 	
 	if [ ! -f $outdir/kernel-debug.tar.zst ]; then
 		echo "ERROR: cannot build images for target $target_name"
@@ -362,6 +369,9 @@ function build_config {
 
 if [ "$XTARGET" != "*" ]; then
 	TARGETCFG=$XDIR/$XTARGET
+	if [ $BUILD_ONLY_INITRAMFS = true ]; then
+		TARGETCFG=$XDIR/_initramfs/$XTARGET
+	fi
 	XTARGET_EXT="${XTARGET##*.}"
 	[ $XTARGET_EXT != config ] && TARGETCFG=$TARGETCFG.config
 	[ ! -f $TARGETCFG ] && die "File '"`basename $TARGETCFG`"' not found!"
@@ -373,7 +383,12 @@ if [ "$XTARGET" != "*" ]; then
 fi
 
 XOUT=$XDIR/xout
-CFG_LIST=$( find $XDIR/* -maxdepth 1 -name '[a-z0-9]*.config' )
+
+if [ $BUILD_ONLY_INITRAMFS = true ]; then
+	CFG_LIST=$( find $XDIR/_initramfs/* -maxdepth 1 -name '[a-z0-9]*.config' )
+else
+	CFG_LIST=$( find $XDIR/* -maxdepth 1 -name '[a-z0-9]*.config' )
+fi
 
 rm -rf $XOUT
 
@@ -382,35 +397,16 @@ if [ -z "$CFG_LIST" ]; then
 	exit 1
 fi
 
-INITRAMFS_COUNT=0
+if [ $BUILD_ONLY_INITRAMFS = true ]; then
+	echo "Start make initramfs configs!"
+else
+	echo "Start make non initramfs configs!"
+fi	
+	
+clean_all
+
 for CFG in $CFG_LIST; do
-	if [[ "$CFG" == *"_initramfs"* ]]; then
-		INITRAMFS_COUNT=$(( INITRAMFS_COUNT + 1 ))
-	fi
+   build_config $CFG
 done
 
-if [ $INITRAMFS_COUNT = 0 ] && [ $BUILD_ONLY_INITRAMFS = true ]; then
-	echo "ERROR: Cannot found initramfs configs!"
-	exit 1
-fi
-
-if [ $INITRAMFS_COUNT -gt 0 ] && [ $BUILD_SKIP_INITRAMFS != true ]; then
-	echo "Start make initramfs configs!"
-	clean_all
-	for CFG in $CFG_LIST; do
-	   [[ "$CFG" != *"_initramfs"* ]] && continue  # process only initramfs configs
-	   build_config $CFG
-	done
-fi
-
-if [ $BUILD_ONLY_INITRAMFS != true ]; then
-	echo "Start make non initramfs configs!"
-	clean_all
-	for CFG in $CFG_LIST; do
-		[[ "$CFG" == *"_initramfs"* ]] && continue  # skip initramfs configs
-		build_config $CFG
-	done
-fi
-
 echo "All targets was builded!" 
-

xupdate.sh

@@ -4,8 +4,8 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 export XDIR=$SCRIPT_DIR
 export XADDONSDIR=$XDIR/package/addons
 FEEDSDIR=$XDIR/package/feeds
-ADDONSCFG=$XDIR/_addons.config
-ADDONSNSS=$XDIR/_addons_nss.config
+ADDONSCFG=$XDIR/_cfginc/_addons.config
+ADDONSNSS=$XDIR/_cfginc/_addons_nss.config
 
 . ./xcommon.sh