add 6.6, clean up old code
This commit is contained in:
parent
cbfaf9b9d9
commit
a661f9d183
7 changed files with 28 additions and 153 deletions
|
|
@ -1,5 +1,5 @@
|
|||
{ pkgs, modulesPath, ... }: {
|
||||
imports = [ (modulesPath + "/profiles/minimal.nix") ];
|
||||
imports = [(modulesPath + "/profiles/minimal.nix")];
|
||||
|
||||
ps4.enable = true;
|
||||
|
||||
|
|
@ -14,5 +14,7 @@
|
|||
users.defaultUserShell = pkgs.fish;
|
||||
programs.fish.enable = true;
|
||||
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
system.stateVersion = "25.05";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchFromGitHub, linuxManualConfig, runCommand, linux-firmware, gcc8Stdenv, ... }:
|
||||
{ fetchFromGitHub, linuxManualConfig, runCommand, linux-firmware, ... }:
|
||||
(linuxManualConfig rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nomkid";
|
||||
|
|
@ -15,8 +15,6 @@
|
|||
echo "CONFIG_EXTRA_FIRMWARE_DIR=\"${linux-firmware}/lib/firmware\"" >> $out
|
||||
'';
|
||||
allowImportFromDerivation = true;
|
||||
# }).override {
|
||||
# stdenv = gcc8Stdenv;
|
||||
}).overrideAttrs {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-redundant-decls -Wno-use-after-free";
|
||||
}
|
||||
19
kernel/6.6.nix
Normal file
19
kernel/6.6.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ fetchFromGitHub, linuxManualConfig, runCommand, linux-firmware, ... }:
|
||||
(linuxManualConfig rec {
|
||||
# TODO convert from a fork to just patchfiles
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nomkid";
|
||||
repo = "linux";
|
||||
rev = "refs/heads/ps4-linux-6.6.y";
|
||||
hash = "sha256-/RM6r+k0GXcCAE73KgOissRboI5WZaB4x4tCjGGEYMA=";
|
||||
};
|
||||
|
||||
version = "6.6.70-PS4";
|
||||
modDirVersion = "6.6.70";
|
||||
|
||||
configfile = runCommand "concat-config" {} ''
|
||||
cat "${src}/config" > $out
|
||||
echo "CONFIG_EXTRA_FIRMWARE_DIR=\"${linux-firmware}/lib/firmware\"" >> $out
|
||||
'';
|
||||
allowImportFromDerivation = true;
|
||||
})
|
||||
|
|
@ -1,3 +1,2 @@
|
|||
{ pkgs ? import <nixpkgs> {} }:
|
||||
# pkgs.callPackage ./kernel-aeolia.nix {}
|
||||
pkgs.callPackage ./kernel-aeolia-5.3.nix {}
|
||||
pkgs.callPackage ./6.6.nix {}
|
||||
|
|
|
|||
|
|
@ -1,66 +0,0 @@
|
|||
{ lib, stdenvNoCC, runCommand, fetchurl, fetchFromGitHub, ... }:
|
||||
let
|
||||
src = fetchFromGitHub {
|
||||
owner = "ps4boot";
|
||||
repo = "ps4-linux";
|
||||
rev = "refs/heads/aeolia";
|
||||
hash = "sha256-urNDgnoGC76WYvzAlypCJ+w8IIsPcN2kQMzlYF/h+mo=";
|
||||
};
|
||||
|
||||
bzImage = fetchurl {
|
||||
url = "https://github.com/ps4boot/ps4-linux/releases/download/v1/bzImageAeolia";
|
||||
hash = "sha256-0P02KJe8OCuliHjjkJqlPXQBHDuEGLUIp78lWa5hYdw=";
|
||||
};
|
||||
|
||||
# parse the configfile into a nix attrset
|
||||
# from https://github.com/NixOS/nixpkgs/blob/a253c2d94cbf75cfd0f7eea242d8385214332dda/pkgs/os-specific/linux/kernel/manual-config.nix#L11
|
||||
parseConfig = configfile: import (runCommand "config.nix" {} ''
|
||||
echo "{" > "$out"
|
||||
while IFS='=' read key val; do
|
||||
[ "x''${key#CONFIG_}" != "x$key" ] || continue
|
||||
no_firstquote="''${val#\"}";
|
||||
echo ' "'"$key"'" = "'"''${no_firstquote%\"}"'";' >> "$out"
|
||||
done < "${configfile}"
|
||||
echo "}" >> $out
|
||||
'').outPath;
|
||||
|
||||
# make a hacky wrapper around the bzImage so it's
|
||||
# compatible with the nixos module system
|
||||
# kernelFn = { ... }:
|
||||
# runCommand "kernel-aeolia-prebuilt" {
|
||||
# version = "5.3.18";
|
||||
# config = parseConfig "${src}/config";
|
||||
# } ''
|
||||
# mkdir $out
|
||||
# cp ${bzImage} $out/bzImage
|
||||
# '';
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "kernel-aeolia-prebuilt";
|
||||
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp ${bzImage} $out/bzImage
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
version = "5.3.18";
|
||||
|
||||
# functions for checking config options
|
||||
# from https://github.com/NixOS/nixpkgs/blob/a253c2d94cbf75cfd0f7eea242d8385214332dda/pkgs/os-specific/linux/kernel/manual-config.nix#L98
|
||||
config = let
|
||||
config = parseConfig "${src}/config";
|
||||
attrName = attr: "CONFIG_" + attr;
|
||||
in rec {
|
||||
isSet = attr: builtins.hasAttr (attrName attr) config;
|
||||
getValue = attr: if isSet attr then builtins.getAttr (attrName attr) config else null;
|
||||
isYes = attr: (getValue attr) == "y";
|
||||
isNo = attr: (getValue attr) == "n";
|
||||
isModule = attr: (getValue attr) == "m";
|
||||
isEnabled = attr: (isModule attr) || (isYes attr);
|
||||
isDisabled = attr: (!(isSet attr)) || (isNo attr);
|
||||
} // config;
|
||||
};
|
||||
}
|
||||
# lib.makeOverridable kernelFn {}
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
{ lib, fetchgit, buildLinux, linuxManualConfig, linux-firmware, runCommand, ... }:
|
||||
(linuxManualConfig {
|
||||
src = fetchgit {
|
||||
url = "https://git.jeevio.xyz/jeeves/linux-ps4";
|
||||
rev = "refs/heads/5.4.y-aeolia";
|
||||
hash = "";
|
||||
};
|
||||
|
||||
version = "5.4.286-PS4";
|
||||
modDirVersion = "5.4.286";
|
||||
|
||||
# we need to tell Kconfig where the firmware files are
|
||||
configfile = runCommand "concat-config" {} ''
|
||||
cat "${./config-aeolia}" > $out
|
||||
echo "CONFIG_EXTRA_FIRMWARE_DIR=\"${linux-firmware}/lib/firmware\"" >> $out
|
||||
'';
|
||||
allowImportFromDerivation = true;
|
||||
})
|
||||
# buildLinux {
|
||||
# src = fetchgit {
|
||||
# url = "https://git.jeevio.xyz/jeeves/linux-ps4";
|
||||
# rev = "refs/heads/5.4.y-aeolia";
|
||||
# hash = "sha256-e73eslMQAwSFgpmQZfYezKDdldUGi3JlR+Ip5vc3Af8=";
|
||||
# };
|
||||
# version = "5.4.286";
|
||||
|
||||
# ignoreConfigErrors = true;
|
||||
# autoModules = false;
|
||||
# kernelPreferBuiltin = true;
|
||||
|
||||
# structuredExtraConfig = with lib; {
|
||||
# X86_PS4 = kernel.yes;
|
||||
|
||||
# CPU_SUP_AMD = kernel.yes;
|
||||
# MICROCODE_AMD = kernel.yes;
|
||||
# MICROCODE_OLD_INTERFACE = kernel.yes;
|
||||
|
||||
# AMD_IOMMU = kernel.yes;
|
||||
# DMAR_TABLE = kernel.yes;
|
||||
# IRQ_REMAP = kernel.yes;
|
||||
|
||||
# DRM_NOUVEAU = mkForce kernel.no;
|
||||
# DRM_I915 = mkForce kernel.no;
|
||||
|
||||
# AGP = kernel.yes;
|
||||
# AGP_AMD64 = kernel.yes;
|
||||
# VGA_ARB = kernel.yes;
|
||||
# VGA_ARB_MAX_GPUS = kernel.freeform "2";
|
||||
|
||||
# DRM = kernel.yes;
|
||||
# DRM_KMS_HELPER = kernel.yes;
|
||||
# DRM_KMS_FB_HELPER = kernel.yes;
|
||||
# DRM_FBDEV_EMULATION = kernel.yes;
|
||||
# DRM_LOAD_EDID_FIRMWARE = kernel.yes;
|
||||
# DRM_TTM = kernel.yes;
|
||||
# DRM_SCHED = kernel.yes;
|
||||
|
||||
# DRM_AMDGPU = kernel.yes;
|
||||
# DRM_AMDGPU_CIK = kernel.yes;
|
||||
|
||||
# DRM_AMD_DC = kernel.yes;
|
||||
# DRM_AMD_DC_DCN1_0 = kernel.yes;
|
||||
|
||||
# SQUASHFS = kernel.yes;
|
||||
# # USB_UAS = kernel.yes;
|
||||
# OVERLAY_FS = kernel.yes;
|
||||
# # SATA_NV = kernel.yes; # why is this required??? how can i make it not? the PS4 has no nvidia
|
||||
# # SATA_VIA = kernel.yes;
|
||||
# # SATA_SIS = kernel.yes;
|
||||
# # SATA_ULI = kernel.yes;
|
||||
# PATA_MARVELL = kernel.yes;
|
||||
# # NVMEM = kernel.yes;
|
||||
|
||||
# # VIRT_DRIVERS = mkForce kernel.no;
|
||||
# };
|
||||
# }
|
||||
|
|
@ -21,7 +21,6 @@
|
|||
description = "Compress the resulting image with zstd.";
|
||||
};
|
||||
|
||||
# TODO this is unnecessary. just make the partition big enough to fit the boot files automatically.
|
||||
bootPartitionSize = mkOption {
|
||||
type = types.int;
|
||||
default = 64;
|
||||
|
|
@ -65,8 +64,8 @@
|
|||
})
|
||||
];
|
||||
|
||||
# TODO write definitions for the other southbridges
|
||||
boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (pkgs.callPackage ../kernel/kernel-aeolia-5.3.nix {}));
|
||||
# TODO write definitions for the other southbridges and kernel versions
|
||||
boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (pkgs.callPackage ../kernel/6.6.nix {}));
|
||||
|
||||
fileSystems = {
|
||||
"/boot" = {
|
||||
|
|
@ -81,7 +80,7 @@
|
|||
};
|
||||
|
||||
boot.loader.grub.enable = lib.mkForce false;
|
||||
boot.loader.initScript.enable = lib.mkForce true;
|
||||
boot.loader.generationsDir.enable = lib.mkForce true;
|
||||
|
||||
# from https://github.com/NixOS/nixpkgs/blob/e405f30513169feedb64b5c25e7b00242010af58/nixos/modules/installer/sd-card/sd-image.nix#L267
|
||||
boot.postBootCommands = let
|
||||
|
|
@ -164,7 +163,7 @@
|
|||
|
||||
# Copy the files that the PS4 Linux Loader payload expects to the boot partition
|
||||
mcopy -i boot.img ${config.system.build.kernel}/bzImage ::/bzImage
|
||||
mcopy -i boot.img ${config.system.build.initialRamdisk}/initrd.gz ::/initramfs.cpio.gz
|
||||
mcopy -i boot.img ${config.system.build.initialRamdisk}/initrd ::/initramfs.cpio.gz
|
||||
|
||||
# Verify the boot partition before copying it
|
||||
fsck.vfat -vn boot.img
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue