diff --git a/configuration.nix b/configuration.nix index 25897cd..cd718c4 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_vf2; + boot.kernelPackages = pkgs.linuxPackages_testing; boot.kernelParams = [ "console=tty0" "console=ttyS0,115200" diff --git a/flake.nix b/flake.nix index d4dd52d..6f305c1 100644 --- a/flake.nix +++ b/flake.nix @@ -8,12 +8,6 @@ inputs.nixpkgs-native.url = "github:NickCao/nixpkgs/riscv"; outputs = inputs: { - overlays.default = self: super: { - linuxPackages_vf2 = self.linuxPackagesFor (self.callPackage ./linux-vf2.nix { - kernelPatches = [ ]; - }); - }; - overlays.native-fixes = self: super: { cryptsetup = super.cryptsetup.overrideAttrs (old: { doCheck = false; @@ -159,7 +153,6 @@ modules = [ ({ lib, config, pkgs, modulesPath, ... }: { nixpkgs = { - overlays = [ inputs.self.overlays.default ]; localSystem.config = "x86_64-linux"; crossSystem.config = "riscv64-linux"; }; @@ -173,7 +166,6 @@ modules = [ ({ lib, config, pkgs, modulesPath, ... }: { nixpkgs = { - overlays = [ inputs.self.overlays.default ]; localSystem.config = "x86_64-linux"; crossSystem.config = "riscv64-linux"; }; @@ -188,7 +180,6 @@ modules = [ ({ lib, config, pkgs, modulesPath, ... }: { nixpkgs = { - overlays = [ inputs.self.overlays.default ]; localSystem.config = "x86_64-linux"; crossSystem.config = "riscv64-linux"; }; @@ -204,7 +195,6 @@ ({ lib, config, pkgs, modulesPath, ... }: { nixpkgs = { overlays = [ - inputs.self.overlays.default inputs.self.overlays.native-fixes ]; }; @@ -219,7 +209,6 @@ ({ lib, config, pkgs, modulesPath, ... }: { nixpkgs = { overlays = [ - inputs.self.overlays.default inputs.self.overlays.native-fixes ]; }; @@ -235,7 +224,6 @@ ({ lib, config, pkgs, modulesPath, ... }: { nixpkgs = { overlays = [ - inputs.self.overlays.default inputs.self.overlays.native-fixes ]; }; diff --git a/linux-vf2.nix b/linux-vf2.nix deleted file mode 100644 index fa9d6cd..0000000 --- a/linux-vf2.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, buildLinux -, fetchFromGitHub -, ... -} @ args: - -let - modDirVersion = "6.6.0"; -in -buildLinux (args // { - inherit modDirVersion; - version = "${modDirVersion}-vf2"; - - src = fetchFromGitHub { - owner = "starfive-tech"; - repo = "linux"; - rev = "076ede06c00a4069cd9f90d609eaf35bf1bdc68a"; - hash = "sha256-oI048iCkvghEIiuDHbxNHtJz/krPwXPB/HB85YUaxL8="; - }; - - structuredExtraConfig = with lib.kernel; { - CPU_FREQ = yes; - CPUFREQ_DT = yes; - CPUFREQ_DT_PLATDEV = yes; - DMADEVICES = yes; - GPIO_SYSFS = yes; - HIBERNATION = yes; - NO_HZ_IDLE = yes; - POWER_RESET_GPIO_RESTART = yes; - PROC_KCORE = yes; - PWM = yes; - PWM_STARFIVE_PTC = yes; - RD_GZIP = yes; - SENSORS_SFCTEMP = yes; - SERIAL_8250_DW = yes; - SIFIVE_CCACHE = yes; - SIFIVE_PLIC = yes; - - RTC_DRV_STARFIVE = yes; - SPI_PL022 = yes; - SPI_PL022_STARFIVE = yes; - - I2C = yes; - MFD_AXP20X = yes; - MFD_AXP20X_I2C = yes; - REGULATOR_AXP20X = yes; - - DRM = yes; - DRM_VERISILICON = yes; - STARFIVE_HDMI = yes; - - PL330_DMA = no; - - # Disable some drivers that we don't need to make the build leaner - NET_VENDOR_MELLANOX = no; - NET_VENDOR_MARVELL = no; - DRM_NOUVEAU = no; - DRM_INTEL = no; - }; - - preferBuiltin = true; - - extraMeta = { - branch = "visionfive2"; - maintainers = with lib.maintainers; [ misuzu ]; - description = "Linux kernel for StarFive's VisionFive2"; - platforms = [ "riscv64-linux" ]; - }; -} // (args.argsOverride or { }))