DGNum/liminix
14
0
Fork 2
Code Issues 15 Pull requests 7 Projects Releases Packages Wiki Activity Actions

turris omnia: upgrade to mainline 6.7.4 kernel

Browse source 
On this device we don't need the openwrt kernel or patches. The
newer kernel also fixes the weird one minute pause at boot when
it was doing something with either mmc or switch.
This commit is contained in:
Daniel Barlow 2024-02-12 20:42:07 +00:00
parent 65479e206b
commit c50423f689
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
devices/turris-omnia/default.nix
View file

@ -182,12 +182,10 @@
kernel = { kernel = {
src = pkgs.pkgsBuildBuild.fetchurl { src = pkgs.pkgsBuildBuild.fetchurl {
name = "linux.tar.gz"; name = "linux.tar.gz";
url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.137.tar.gz"; url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.4.tar.gz";
hash = "sha256-PkdzUKZ0IpBiWe/RS70J76JKnBFzRblWcKlaIFNxnHQ="; hash = "sha256-wIrmL0BS63nRwWfm4nw+dRNVPUzGh9M4X7LaHzAn5tU=";
}; };
extraPatchPhase = '' version = "6.7.4";
${pkgs.openwrt.applyPatches.mvebu}
'';
config = { config = {
PCI = "y"; PCI = "y";
OF = "y"; OF = "y";
@ -203,6 +201,10 @@
RTC_CLASS = "y"; RTC_CLASS = "y";
RTC_DRV_ARMADA38X = "y"; # this may be useful anyway? RTC_DRV_ARMADA38X = "y"; # this may be useful anyway?
EXPERT = "y";
ALLOW_DEV_COREDUMP = "n";
# dts has a compatible for this but dmesg is not # dts has a compatible for this but dmesg is not
# showing it # showing it
EEPROM_AT24 = "y"; # atmel,24c64 EEPROM_AT24 = "y"; # atmel,24c64
@ -213,9 +215,9 @@
MACH_ARMADA_38X = "y"; MACH_ARMADA_38X = "y";
SMP = "y"; SMP = "y";
# this is disabled for the moment because it relies on a GCC # this is disabled for the moment because it relies on a
# plugin that requires gmp.h to build, and I can't see right now # GCC plugin that requires gmp.h to build, and I can't see
# how to confgure it to find gmp # right now how to confgure it to find gmp
STACKPROTECTOR_PER_TASK = "n"; STACKPROTECTOR_PER_TASK = "n";
NR_CPUS = "4"; NR_CPUS = "4";
VFP = "y"; VFP = "y";
@ -227,7 +229,7 @@
PSTORE = "y"; PSTORE = "y";
PSTORE_RAM = "y"; PSTORE_RAM = "y";
PSTORE_CONSOLE = "y"; PSTORE_CONSOLE = "y";
PSTORE_DEFLATE_COMPRESS = "n"; # PSTORE_DEFLATE_COMPRESS = "n";
BLOCK = "y"; BLOCK = "y";
MMC="y"; MMC="y";
@ -347,9 +349,9 @@
rootDevice = "/dev/mmcblk0p1"; rootDevice = "/dev/mmcblk0p1";
dts = { dts = {
src = "${config.system.outputs.kernel.modulesupport}/arch/arm/boot/dts/armada-385-turris-omnia.dts"; src = "${config.system.outputs.kernel.modulesupport}/arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts";
includes = [ includes = [
"${config.system.outputs.kernel.modulesupport}/arch/arm/boot/dts/" "${config.system.outputs.kernel.modulesupport}/arch/arm/boot/dts/marvell/"
]; ];
}; };
flash.eraseBlockSize = 65536; # only used for tftpboot flash.eraseBlockSize = 65536; # only used for tftpboot