From bf94bc76f752443cd1f749c5aee172e04a5cc2fd Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <dpawlik@redhat.com>
Date: Sun, 24 Mar 2024 21:23:53 +0100
Subject: [PATCH] Move common parameters to common config

---
 configs/common/snapshot           | 15 +++++++++++++++
 configs/mediatek/mt7622/dumb_ap   | 15 ---------------
 configs/mediatek/mt7622/extended  | 19 -------------------
 configs/mediatek/mt7988a/extended |  1 +
 4 files changed, 16 insertions(+), 34 deletions(-)
 create mode 100644 configs/common/snapshot

diff --git a/configs/common/snapshot b/configs/common/snapshot
new file mode 100644
index 0000000..439cb50
--- /dev/null
+++ b/configs/common/snapshot
@@ -0,0 +1,15 @@
+### Additional configs to be more "compatible" with OpenWRT build bots.
+### https://downloads.openwrt.org/snapshots/targets/<your model>/config.buildinfo
+CONFIG_ALL_KMODS=y
+CONFIG_ALL_NONSHARED=y
+CONFIG_BPF_TOOLCHAIN_BUILD_LLVM=y
+# CONFIG_BPF_TOOLCHAIN_NONE is not set
+CONFIG_COLLECT_KERNEL_DEBUG=y
+CONFIG_HAS_BPF_TOOLCHAIN=y
+CONFIG_IB=y
+CONFIG_SDK=y
+CONFIG_SDK_LLVM_BPF=y
+CONFIG_USE_LLVM_BUILD=y
+CONFIG_DEVEL=y
+CONFIG_JSON_CYCLONEDX_SBOM=y
+CONFIG_MAKE_TOOLCHAIN=y
diff --git a/configs/mediatek/mt7622/dumb_ap b/configs/mediatek/mt7622/dumb_ap
index 71cdc06..3711f6f 100644
--- a/configs/mediatek/mt7622/dumb_ap
+++ b/configs/mediatek/mt7622/dumb_ap
@@ -102,21 +102,6 @@ CONFIG_PACKAGE_wpad-openssl=y
 ## CONFIG_PACKAGE_wpad-mbedtls is not set
 ## CONFIG_PACKAGE_wpad-basic-mbedtls is not set
 ## CONFIG_PACKAGE_wpad-basic-openssl is not set
-#
-# REMEMBER TO CHERRY-PICK CHANGE: da317cc840260b854936d4fc63fea4ffb6d0e93f
-# from repo: https://github.com/danpawlik/openwrt to extend kernel partition size,
-# otherwise set CONFIG_ALL_KMODS=n.
-# More: https://github.com/openwrt/openwrt/commit/dadad6bb731ff1025125c619da7ccc196ad6ea01
-CONFIG_ALL_KMODS=y
-#
-CONFIG_ALL_NONSHARED=y
-CONFIG_BPF_TOOLCHAIN_BUILD_LLVM=y
-CONFIG_COLLECT_KERNEL_DEBUG=y
-CONFIG_HAS_BPF_TOOLCHAIN=y
-CONFIG_IB=y
-CONFIG_SDK=y
-CONFIG_SDK_LLVM_BPF=y
-CONFIG_USE_LLVM_BUILD=y
 
 # temporary workaround for kernel 6.6
 # CONFIG_PACKAGE_kmod-usb-serial-dmx_usb_module is not set
diff --git a/configs/mediatek/mt7622/extended b/configs/mediatek/mt7622/extended
index 72b8a8f..99bb58c 100644
--- a/configs/mediatek/mt7622/extended
+++ b/configs/mediatek/mt7622/extended
@@ -126,25 +126,6 @@ CONFIG_PACKAGE_wpad-basic-mbedtls=m
 ## CONFIG_PACKAGE_wpad-basic-mbedtls is not set
 ## CONFIG_PACKAGE_wpad-basic-openssl is not set
 
-# REMEMBER TO CHERRY-PICK CHANGE: da317cc840260b854936d4fc63fea4ffb6d0e93f
-# from repo: https://github.com/danpawlik/openwrt to extend kernel partition size,
-# otherwise set CONFIG_ALL_KMODS=n.
-# More: https://github.com/openwrt/openwrt/commit/dadad6bb731ff1025125c619da7ccc196ad6ea01
-CONFIG_ALL_KMODS=y
-#
-CONFIG_ALL_NONSHARED=y
-CONFIG_BPF_TOOLCHAIN_BUILD_LLVM=y
-# CONFIG_BPF_TOOLCHAIN_NONE is not set
-CONFIG_COLLECT_KERNEL_DEBUG=y
-CONFIG_HAS_BPF_TOOLCHAIN=y
-CONFIG_IB=y
-CONFIG_SDK=y
-CONFIG_SDK_LLVM_BPF=y
-CONFIG_USE_LLVM_BUILD=y
-CONFIG_DEVEL=y
-CONFIG_JSON_CYCLONEDX_SBOM=y
-CONFIG_MAKE_TOOLCHAIN=y
-
 # temporary workaround for kernel 6.6
 # CONFIG_PACKAGE_kmod-usb-serial-dmx_usb_module is not set
 # CONFIG_PACKAGE_kmod-pf-ring is not set
diff --git a/configs/mediatek/mt7988a/extended b/configs/mediatek/mt7988a/extended
index 78626e1..7b7d61c 100644
--- a/configs/mediatek/mt7988a/extended
+++ b/configs/mediatek/mt7988a/extended
@@ -136,6 +136,7 @@ CONFIG_PACKAGE_kmod-mt7921e=y
 
 # Intel BE200
 CONFIG_PACKAGE_kmod-iwlwifi=y
+CONFIG_PACKAGE_IWLWIFI_DEBUG=y
 CONFIG_PACKAGE_iwlwifi-firmware-be200=y
 
 ## debuging