downgrade to kernel 4.4 - it works

telent · Jan 5, 2018 · 1e5bba9 · 1e5bba9
1 parent 46fd243
commit 1e5bba9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/README.nixwrt.md b/README.nixwrt.md
@@ -122,7 +122,7 @@ Once you have the `ar7240>` prompt, run
     setenv rootaddr 1178000
     setenv rootaddr_useg 0x$rootaddr
     setenv rootaddr_ks0 0x8$rootaddr
-    setenv bootargs keep_bootcon console=ttyATH0,250000 panic=10 oops=panic init=/bin/sh phram.phram=rootfs,$rootaddr_ks0,9Mi root=/dev/mtdblock0 memmap=10M\$$rootaddr_useg ath79-wdt.from_boot=y ath79-wdt.timeout=10
+    setenv bootargs  console=ttyATH0,115200 panic=10 oops=panic init=/bin/sh phram.phram=rootfs,$rootaddr_ks0,9Mi root=/dev/mtdblock0 memmap=10M\$$rootaddr_useg ath79-wdt.from_boot=n ath79-wdt.timeout=10
     setenv bootn " tftp $rootaddr_ks0 /tftp/rootfs.image; tftp $kernaddr /tftp/kernel.image ; bootm  $kernaddr"
     run bootn
 
@@ -136,4 +136,3 @@ on memory addresses are as follows
 
 
 
-
diff --git a/nixwrt.nix b/nixwrt.nix
@@ -48,8 +48,10 @@ in with onTheHost; rec {
   kernel = stdenv.mkDerivation rec {
     name = "nixwrt_kernel";
     src = onTheBuild.fetchurl {
-      url = "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.1.tar.xz";
+      url = "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.4.110.tar.xz";
-      sha256 = "1rsdrdapjw8lhm8dyckwxfihykirbkincm5k0lwwx1pr09qgdfbg";
+      # "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.1.tar.xz";
+      sha256 = "0n6v872ahny9j29lh60c7ha5fa1as9pdag7jsb5fcy2nmid1g6fh";
+      # "2rsdrdapjw8lhm8dyckwxfihykirbkincm5k0lwwx1pr09qgdfbg";
     };
     patches = [ ./kernel-ar933x-uart-rate.patch
                 ./kernel-ath79-wdt-at-boot.patch ];
@@ -71,15 +73,13 @@ in with onTheHost; rec {
       "MTD_AR7_PARTS"
       "MTD_CMDLINE_PART"
       "MTD_PHRAM"
-      "NFS_FS"
-      "ROOT_NFS"
       "SQUASHFS"
       "SQUASHFS_XZ"      
       ]);
     configurePhase = ''
       substituteInPlace scripts/ld-version.sh --replace /usr/bin/awk ${onTheBuild.pkgs.gawk}/bin/awk
       make V=1 mrproper
-      ( cat arch/mips/configs/${targetPlatform.baseConfig} && echo "CONFIG_CPU_${lib.strings.toUpper targetPlatform.endian}_ENDIAN=y" && echo "$enableKconfig" ) > .config
+      ( grep -v CONFIG_BLK_DEV_INITRD arch/mips/configs/${targetPlatform.baseConfig} && echo "CONFIG_CPU_${lib.strings.toUpper targetPlatform.endian}_ENDIAN=y" && echo "$enableKconfig" ) > .config
       make V=1 olddefconfig 
     '';
     # we need to invoke the lzma command with a filename (not stdin),