Skip to content

Commit

Permalink
linux_jovian: sync kconfig with vendor -2
Browse files Browse the repository at this point in the history
  • Loading branch information
K900 committed Aug 11, 2024
1 parent 3b711ac commit 9117806
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions pkgs/linux-jovian/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ buildLinux (args // rec {
# Disable simple-framebuffer to fix logo regression
SYSFB_SIMPLEFB = lib.mkForce no;

# Disable call depth tracking speculative execution vulnerability mitigation
CALL_DEPTH_TRACKING = no;

# Jovian: fix fallout from the vendor-set options
DRM_AMD_DC_SI = lib.mkForce (option no);
DRM_AMD_DC_DCN = lib.mkForce (option no);
Expand Down
2 changes: 1 addition & 1 deletion support/manifest/mappings.toml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ linux-neptune.ignore = true
linux-neptune-61.ignore = true

# new kernel
linux-neptune-65 = { map = "linux_jovian", pkgrel = 1 }
linux-neptune-65 = { map = "linux_jovian", pkgrel = 2 }

# debug kernels
linux-neptune-65-kasan.ignore = true
Expand Down

0 comments on commit 9117806

Please sign in to comment.