From 84c496805c505e03c6aa1c1f9b714eb49e0c7463 Mon Sep 17 00:00:00 2001 From: kurogeek Date: Wed, 29 Jul 2026 10:26:10 +0700 Subject: [PATCH] mob next [ci-skip] [ci skip] [skip ci] lastFile:flake.lock --- flake.lock | 21 -------------- flake.nix | 4 --- machines/anser/configuration.nix | 1 - .../anser/patches/aic8800-gpio-power.patch | 29 ------------------- 4 files changed, 55 deletions(-) delete mode 100644 machines/anser/patches/aic8800-gpio-power.patch diff --git a/flake.lock b/flake.lock index ef80359..d145db5 100644 --- a/flake.lock +++ b/flake.lock @@ -667,26 +667,6 @@ "type": "github" } }, - "nixos-hardware": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1784723954, - "narHash": "sha256-1CfD8ZUjCkTgjsneLZ/lxCHhgDfqxxE7/GX0MmsgiqA=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "a017f5b72210026af5b3ac5949f08d94380a6fbd", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixos-hardware", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1712920918, @@ -813,7 +793,6 @@ "home-manager": "home-manager", "import-tree": "import-tree", "liminix": "liminix", - "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "plasma-manager": "plasma-manager", "treefmt-nix": "treefmt-nix" diff --git a/flake.nix b/flake.nix index 7ec827e..0722b41 100644 --- a/flake.nix +++ b/flake.nix @@ -45,10 +45,6 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.devshell.follows = "devshell"; }; - nixos-hardware = { - url = "github:NixOS/nixos-hardware"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { diff --git a/machines/anser/configuration.nix b/machines/anser/configuration.nix index e3cbeed..43891a8 100644 --- a/machines/anser/configuration.nix +++ b/machines/anser/configuration.nix @@ -14,7 +14,6 @@ in clan.core.settings.name = "anser"; clan.core.settings.machine.description = ""; - # imports = [ inputs.nixos-hardware ]; boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; diff --git a/machines/anser/patches/aic8800-gpio-power.patch b/machines/anser/patches/aic8800-gpio-power.patch deleted file mode 100644 index 9b4a315..0000000 --- a/machines/anser/patches/aic8800-gpio-power.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/SDIO/driver_fw/driver/aic8800/aic8800_bsp/aicsdio.c -+++ b/src/SDIO/driver_fw/driver/aic8800/aic8800_bsp/aicsdio.c -@@ -28,6 +28,14 @@ - #include "aic_bsp_driver.h" - #include "aicsdio_txrxif.h" - -+#ifdef CONFIG_PLATFORM_UBUNTU -+#include -+#include -+static bool skip_power_wait = true; -+module_param(skip_power_wait, bool, 0644); -+MODULE_PARM_DESC(skip_power_wait, "Skip power sequence wait (card already enumerated by DT)"); -+#endif -+ - #ifdef CONFIG_PLATFORM_ALLWINNER - extern int sunxi_wlan_get_bus_index(void); - extern void sunxi_wlan_set_power(int on); -@@ -515,6 +523,11 @@ static int aicbsp_platform_power_on(void) - rockchip_wifi_set_carddetect(1); - #endif /*CONFIG_PLATFORM_ROCKCHIP2*/ - -+#ifdef CONFIG_PLATFORM_UBUNTU -+ if (skip_power_wait) -+ return 0; -+#endif -+ - sema_init(&aic_chipup_sem, 0); - ret = aicbsp_reg_sdio_notify(&aic_chipup_sem); - if (ret) {