M-Labs
/
nix-servo
3
1
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert to mainline kernel 

Signed-off-by: Florian Agbuya <fa@m-labs.ph>
This commit is contained in:
Florian Agbuya 2023-11-14 11:44:55 +08:00
parent 9f00247e8f
commit abac1cc5b0
3 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -10,6 +10,7 @@
extraModules = [ extraModules = [
./zynq_image.nix ./zynq_image.nix
]; ];
platform = system: platforms.armv7l-hf-multiplatform;
system = "x86_64-linux"; system = "x86_64-linux";
crossSystem.system = "armv7l-linux"; crossSystem.system = "armv7l-linux";
inherit (not-os.inputs) nixpkgs; inherit (not-os.inputs) nixpkgs;

19
linux_zynq.nix
View File

@ -1,19 +0,0 @@
{ stdenv, lib, fetchFromGitHub, buildLinux, ... } @ args:
let
modDirVersion = "6.1.0-xilinx";
in
lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}";
inherit modDirVersion;
src = fetchFromGitHub {
owner = "Xilinx";
repo = "linux-xlnx";
rev = "c8b3583bc86352009c6ac61e2ced0e12118f8ebb";
sha256 = "09vfh2p7iszzjqp25fnwpzy52h07v4n161salsia0jyr2g5kxrfr";
};
defconfig = "xilinx_zynq_defconfig";
} // (args.argsOverride or {}))) (oldAttrs: {})

28
zynq_image.nix
View File

@ -6,22 +6,9 @@ let
# dont use overlays for the qemu, it causes a lot of wasted time on recompiles # dont use overlays for the qemu, it causes a lot of wasted time on recompiles
x86pkgs = import pkgs.path { system = "x86_64-linux"; }; x86pkgs = import pkgs.path { system = "x86_64-linux"; };
# armv7l cross-compile and boot fixes # armv7l cross-compile and boot fixes
customKernel = pkgs.linux_zynq.override { customKernel = pkgs.linux.override {
extraConfig = '' extraConfig = ''
OVERLAY_FS y OVERLAY_FS y
DRM_XLNX_HDCP n
DRM_XLNX_DPTX n
DRM_XLNX_HDMITX n
VIDEO_XILINX_HDCP2X_RX n
VIDEO_XILINX_DPRXSS n
DRM_XLNX n
USB_XHCI_PLATFORM n
USB_XHCI_HCD n
SENSORS_TPS544 n
XLNX_TSMUX n
USB_BRCMSTB n
MEDIA_SUPPORT n
SOUND n
''; '';
}; };
customKernelPackages = pkgs.linuxPackagesFor customKernel; customKernelPackages = pkgs.linuxPackagesFor customKernel;
@ -80,20 +67,11 @@ in {
''; '';
environment.etc."pam.d/other".text = ""; environment.etc."pam.d/other".text = "";
nixpkgs.config.packageOverrides = pkgs: {
linux_zynq = pkgs.callPackage ./linux_zynq.nix {};
};
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
# armv7l cross-compile fixes # armv7l cross-compile fixes
libuv = super.libuv.overrideAttrs (old: { libuv = super.libuv.overrideAttrs (old: { doCheck = false;});
doCheck = false; elfutils = super.elfutils.overrideAttrs (old: { doCheck = false; doInstallCheck = false;});
});
elfutils = super.elfutils.overrideAttrs (old: {
doCheck = false;
doInstallCheck = false;
});
systemd = super.systemd.override { withEfi = false; }; systemd = super.systemd.override { withEfi = false; };
procps = super.procps.override { withSystemd = false; }; procps = super.procps.override { withSystemd = false; };
nix = super.nix.override { enableDocumentation = false; }; nix = super.nix.override { enableDocumentation = false; };