use regular kernel not backports for mac80211
the kernel on most devices is now newer than the version that the backported drivers were backported from
This commit is contained in:
parent
79926c6fe7
commit
65479e206b
7 changed files with 78 additions and 29 deletions
|
@ -149,6 +149,13 @@
|
||||||
WATCHDOG = "y";
|
WATCHDOG = "y";
|
||||||
MEDIATEK_WATCHDOG = "y";
|
MEDIATEK_WATCHDOG = "y";
|
||||||
};
|
};
|
||||||
|
conditionalConfig = {
|
||||||
|
WLAN= {
|
||||||
|
MT7615E = "m";
|
||||||
|
MT7622_WMAC = "y";
|
||||||
|
MT7915E = "m";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
boot = {
|
boot = {
|
||||||
commandLine = [ "console=ttyS0,115200" ];
|
commandLine = [ "console=ttyS0,115200" ];
|
||||||
|
@ -169,12 +176,9 @@
|
||||||
hardware =
|
hardware =
|
||||||
let
|
let
|
||||||
openwrt = pkgs.openwrt;
|
openwrt = pkgs.openwrt;
|
||||||
mac80211 = pkgs.mac80211.override {
|
mac80211 = pkgs.kmodloader.override {
|
||||||
drivers = [
|
targets = ["mt7615e" "mt7915e"];
|
||||||
"mt7615e"
|
inherit (config.system.outputs) kernel;
|
||||||
"mt7915e"
|
|
||||||
];
|
|
||||||
klibBuild = config.system.outputs.kernel.modulesupport;
|
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
ubi = {
|
ubi = {
|
||||||
|
|
|
@ -71,9 +71,9 @@
|
||||||
cp $blobdir/board.bin $out/ath10k/QCA9887/hw1.0/
|
cp $blobdir/board.bin $out/ath10k/QCA9887/hw1.0/
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
mac80211 = pkgs.mac80211.override {
|
mac80211 = pkgs.kmodloader.override {
|
||||||
drivers = ["ath9k" "ath10k_pci"];
|
targets = ["ath9k" "ath10k_pci"];
|
||||||
klibBuild = config.system.outputs.kernel.modulesupport;
|
inherit (config.system.outputs) kernel;
|
||||||
};
|
};
|
||||||
ath10k_cal_data =
|
ath10k_cal_data =
|
||||||
let
|
let
|
||||||
|
@ -211,14 +211,21 @@
|
||||||
WATCHDOG = "y";
|
WATCHDOG = "y";
|
||||||
ATH79_WDT = "y"; # watchdog timer
|
ATH79_WDT = "y"; # watchdog timer
|
||||||
|
|
||||||
# this is all copied from nixwrt ath79 config. Clearly not all
|
|
||||||
# of it is device config, some of it is wifi config or
|
|
||||||
# installation method config or ...
|
|
||||||
|
|
||||||
EARLY_PRINTK = "y";
|
EARLY_PRINTK = "y";
|
||||||
|
|
||||||
PRINTK_TIME = "y";
|
PRINTK_TIME = "y";
|
||||||
};
|
};
|
||||||
|
conditionalConfig = {
|
||||||
|
WLAN = {
|
||||||
|
WLAN_VENDOR_ATH = "y";
|
||||||
|
ATH_COMMON = "m";
|
||||||
|
ATH9K = "m";
|
||||||
|
ATH9K_AHB = "y";
|
||||||
|
ATH10K = "m";
|
||||||
|
ATH10K_PCI = "y";
|
||||||
|
ATH10K_DEBUG = "y";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,9 +47,9 @@
|
||||||
let
|
let
|
||||||
inherit (pkgs.liminix.networking) interface;
|
inherit (pkgs.liminix.networking) interface;
|
||||||
inherit (pkgs) openwrt;
|
inherit (pkgs) openwrt;
|
||||||
mac80211 = pkgs.mac80211.override {
|
mac80211 = pkgs.kmodloader.override {
|
||||||
drivers = ["rt2800soc"];
|
targets = ["rt2800soc"];
|
||||||
klibBuild = config.system.outputs.kernel.modulesupport;
|
inherit (config.system.outputs) kernel;
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -178,6 +178,14 @@
|
||||||
} // lib.optionalAttrs (config.system.service ? vlan) {
|
} // lib.optionalAttrs (config.system.service ? vlan) {
|
||||||
SWCONFIG = "y";
|
SWCONFIG = "y";
|
||||||
};
|
};
|
||||||
|
conditionalConfig = {
|
||||||
|
WLAN = {
|
||||||
|
WLAN_VENDOR_RALINK = "y";
|
||||||
|
RT2800SOC = "m";
|
||||||
|
RT2X00 = "m";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,9 +43,9 @@
|
||||||
inherit (pkgs.pseudofile) dir symlink;
|
inherit (pkgs.pseudofile) dir symlink;
|
||||||
inherit (pkgs) openwrt;
|
inherit (pkgs) openwrt;
|
||||||
|
|
||||||
mac80211 = pkgs.mac80211.override {
|
mac80211 = pkgs.kmodloader.override {
|
||||||
drivers = ["mt7603e"];
|
targets = ["mt7603e"];
|
||||||
klibBuild = config.system.outputs.kernel.modulesupport;
|
inherit (config.system.outputs) kernel;
|
||||||
};
|
};
|
||||||
wlan_firmware = pkgs.fetchurl {
|
wlan_firmware = pkgs.fetchurl {
|
||||||
url = "https://github.com/openwrt/mt76/raw/f24b56f935392ca1d35fae5fd6e56ef9deda4aad/firmware/mt7628_e2.bin";
|
url = "https://github.com/openwrt/mt76/raw/f24b56f935392ca1d35fae5fd6e56ef9deda4aad/firmware/mt7628_e2.bin";
|
||||||
|
@ -185,6 +185,15 @@
|
||||||
RALINK_WDT = "y"; # watchdog
|
RALINK_WDT = "y"; # watchdog
|
||||||
MT7621_WDT = "y"; # or it might be this one
|
MT7621_WDT = "y"; # or it might be this one
|
||||||
};
|
};
|
||||||
|
conditionalConfig = {
|
||||||
|
WLAN = {
|
||||||
|
WLAN_VENDOR_RALINK = "y";
|
||||||
|
WLAN_VENDOR_MEDIATEK = "y";
|
||||||
|
MT7603E = "m";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -325,6 +325,11 @@
|
||||||
RALINK_WDT = "y"; # watchdog
|
RALINK_WDT = "y"; # watchdog
|
||||||
MT7621_WDT = "y"; # or it might be this one
|
MT7621_WDT = "y"; # or it might be this one
|
||||||
};
|
};
|
||||||
|
conditionalConfig = {
|
||||||
|
WLAN = {
|
||||||
|
MT7915E = "m";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
tplink-safeloader.board = "ARCHER-AX23-V1";
|
tplink-safeloader.board = "ARCHER-AX23-V1";
|
||||||
boot = {
|
boot = {
|
||||||
|
@ -353,11 +358,11 @@
|
||||||
hardware =
|
hardware =
|
||||||
let
|
let
|
||||||
openwrt = pkgs.openwrt;
|
openwrt = pkgs.openwrt;
|
||||||
mac80211 = pkgs.mac80211.override {
|
mac80211 = pkgs.kmodloader.override {
|
||||||
drivers = [
|
targets = [
|
||||||
"mt7915e"
|
"mt7915e"
|
||||||
];
|
];
|
||||||
klibBuild = config.system.outputs.kernel.modulesupport;
|
inherit (config.system.outputs) kernel;
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
# from OEM bootlog (openwrt wiki):
|
# from OEM bootlog (openwrt wiki):
|
||||||
|
|
|
@ -286,9 +286,17 @@
|
||||||
USB_XHCI_MVEBU = "y";
|
USB_XHCI_MVEBU = "y";
|
||||||
USB_XHCI_HCD = "y";
|
USB_XHCI_HCD = "y";
|
||||||
};
|
};
|
||||||
|
WLAN = {
|
||||||
|
WLAN_VENDOR_ATH = "y";
|
||||||
|
ATH_COMMON = "m";
|
||||||
|
ATH9K = "m";
|
||||||
|
ATH9K_PCI = "y";
|
||||||
|
ATH10K = "m";
|
||||||
|
ATH10K_PCI = "m";
|
||||||
|
ATH10K_DEBUG = "y";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
commandLine = [
|
commandLine = [
|
||||||
"console=ttyS0,115200"
|
"console=ttyS0,115200"
|
||||||
|
@ -328,9 +336,9 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware = let
|
hardware = let
|
||||||
mac80211 = pkgs.mac80211.override {
|
mac80211 = pkgs.kmodloader.override {
|
||||||
drivers = ["ath9k_pci" "ath10k_pci"];
|
inherit (config.system.outputs) kernel;
|
||||||
klibBuild = config.system.outputs.kernel.modulesupport;
|
targets = ["ath9k" "ath10k_pci"];
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
defaultOutput = "mtdimage";
|
defaultOutput = "mtdimage";
|
||||||
|
|
|
@ -46,6 +46,14 @@ in {
|
||||||
CRYPTO_SHA1 = "y";
|
CRYPTO_SHA1 = "y";
|
||||||
ENCRYPTED_KEYS = "y";
|
ENCRYPTED_KEYS = "y";
|
||||||
KEYS = "y";
|
KEYS = "y";
|
||||||
|
|
||||||
|
WLAN = "y";
|
||||||
|
CFG80211 = "m";
|
||||||
|
MAC80211 = "m";
|
||||||
|
EXPERT = "y";
|
||||||
|
CFG80211_CERTIFICATION_ONUS = "y";
|
||||||
|
CFG80211_REQUIRE_SIGNED_REGDB = "n"; # depends on ONUS
|
||||||
|
CFG80211_CRDA_SUPPORT = "n";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue