From 98aeca00670e28115f51b932d99aee68347fecee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 25 Jun 2023 16:58:48 +0100 Subject: [PATCH] fix kernels --- linux/bcachefs/default.nix | 11 +-- linux/vf2/default.nix | 154 +++++++++++++++++-------------------- update.sh | 5 ++ 3 files changed, 79 insertions(+), 91 deletions(-) create mode 100755 update.sh diff --git a/linux/bcachefs/default.nix b/linux/bcachefs/default.nix index 40828ea..600cc82 100644 --- a/linux/bcachefs/default.nix +++ b/linux/bcachefs/default.nix @@ -7,7 +7,7 @@ modDirVersion = "6.3.0"; source = builtins.fromJSON (builtins.readFile ./source.json); in - (buildLinux (args + buildLinux (args // { inherit modDirVersion; version = "6.3.0+${source.rev}"; @@ -25,11 +25,4 @@ in DYNAMIC_FTRACE = yes; FTRACE = yes; }; - })) - .overrideAttrs (_: { - passthru.updateScript = [ - ../../scripts/update-git.sh - "https://github.com/koverstreet/bcachefs" - "linux/bcachefs/source.json" - ]; - }) + }) diff --git a/linux/vf2/default.nix b/linux/vf2/default.nix index 684d3fa..047911c 100644 --- a/linux/vf2/default.nix +++ b/linux/vf2/default.nix @@ -9,94 +9,84 @@ modDirVersion = "6.4.0-rc6"; source = builtins.fromJSON (builtins.readFile ./source.json); in - ( - buildLinux (args - // { - inherit modDirVersion; - version = "${modDirVersion}-vf2"; + buildLinux (args + // { + inherit modDirVersion; + version = "${modDirVersion}-vf2"; - src = fetchFromGitHub { - owner = "starfive-tech"; - repo = "linux"; - inherit (source) rev sha256; - }; + src = fetchFromGitHub { + owner = "starfive-tech"; + repo = "linux"; + inherit (source) rev sha256; + }; - kernelPatches = [ - # https://lore.kernel.org/all/20230524000012.15028-1-andre.przywara@arm.com/ - rec { - name = "axp15060-1.patch"; - patch = fetchpatch { - inherit name; - url = "https://lore.kernel.org/all/20230524000012.15028-2-andre.przywara@arm.com/raw"; - hash = "sha256-kj4vQaT4CV29EHv8MtuTgM/semIPDdv2dmveo/X27vU="; - }; - } - rec { - name = "axp15060-2.patch"; - patch = fetchpatch { - inherit name; - url = "https://lore.kernel.org/all/20230524000012.15028-3-andre.przywara@arm.com/raw"; - hash = "sha256-QCPQyKqoapMtqEDB9QgAuXA7n8e1OtG+YlIgeSQBxXM="; - }; - } - rec { - name = "axp15060-3.patch"; - patch = fetchpatch { - inherit name; - url = "https://lore.kernel.org/all/20230524000012.15028-4-andre.przywara@arm.com/raw"; - hash = "sha256-SpKDm4PXR6qs7kX5SGVpFF/EPBijMhX1NsFUHrlCynM="; - }; - } - ]; + kernelPatches = [ + # https://lore.kernel.org/all/20230524000012.15028-1-andre.przywara@arm.com/ + rec { + name = "axp15060-1.patch"; + patch = fetchpatch { + inherit name; + url = "https://lore.kernel.org/all/20230524000012.15028-2-andre.przywara@arm.com/raw"; + hash = "sha256-kj4vQaT4CV29EHv8MtuTgM/semIPDdv2dmveo/X27vU="; + }; + } + rec { + name = "axp15060-2.patch"; + patch = fetchpatch { + inherit name; + url = "https://lore.kernel.org/all/20230524000012.15028-3-andre.przywara@arm.com/raw"; + hash = "sha256-QCPQyKqoapMtqEDB9QgAuXA7n8e1OtG+YlIgeSQBxXM="; + }; + } + rec { + name = "axp15060-3.patch"; + patch = fetchpatch { + inherit name; + url = "https://lore.kernel.org/all/20230524000012.15028-4-andre.przywara@arm.com/raw"; + hash = "sha256-SpKDm4PXR6qs7kX5SGVpFF/EPBijMhX1NsFUHrlCynM="; + }; + } + ]; - 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; + 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; + RTC_DRV_STARFIVE = yes; + SPI_PL022 = yes; + SPI_PL022_STARFIVE = yes; - I2C = yes; - MFD_AXP20X = yes; - MFD_AXP20X_I2C = yes; - REGULATOR_AXP20X = yes; + I2C = yes; + MFD_AXP20X = yes; + MFD_AXP20X_I2C = yes; + REGULATOR_AXP20X = yes; - # FATAL: modpost: drivers/gpu/drm/verisilicon/vs_drm: struct of_device_id is not terminated with a NULL entry! - DRM_VERISILICON = no; + # FATAL: modpost: drivers/gpu/drm/verisilicon/vs_drm: struct of_device_id is not terminated with a NULL entry! + DRM_VERISILICON = no; - PL330_DMA = no; - }; + PL330_DMA = no; + }; - preferBuiltin = true; + preferBuiltin = true; - extraMeta = { - branch = "JH7110_VisionFive2_upstream"; - description = "Linux kernel for StarFive's VisionFive2"; - platforms = ["riscv64-linux"]; - }; - } - // (args.argsOverride or {})) - ) - .overrideAttrs (_: { - passthru.updateScript = [ - ../../scripts/update-git.sh - "https://github.com/starfive-tech/linux" - "linux/bcachefs/source.json" - "--rev refs/heads/JH7110_VisionFive2_upstream" - ]; - }) + extraMeta = { + branch = "JH7110_VisionFive2_upstream"; + description = "Linux kernel for StarFive's VisionFive2"; + platforms = ["riscv64-linux"]; + }; + } + // (args.argsOverride or {})) diff --git a/update.sh b/update.sh new file mode 100755 index 0000000..a574a35 --- /dev/null +++ b/update.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +./scripts/update-git.sh https://github.com/starfive-tech/linux linux/vf2/source.json "--rev refs/heads/JH7110_VisionFive2_upstream" +./scripts/update-git.sh https://github.com/koverstreet/bcachefs linux/bcachefs/source.json +nix-shell ./scripts/update.sh