fix(qemu): give it a NAND on MIPS #34

Open
rlahfa wants to merge 2 commits from give-it-a-nand into main
3 changed files with 39 additions and 1 deletions

View file

@ -52,7 +52,7 @@ let
borderVmConf borderVmConf
]; ];
}).config.system; }).config.system;
in { in rec {
inherit evalModules; inherit evalModules;
outputs = config.system.outputs // { outputs = config.system.outputs // {
@ -90,4 +90,16 @@ in {
lua lua
]; ];
}; };
try-nand = pkgs.pkgsBuildBuild.writeShellScriptBin "try-nand.sh" ''
rootfs=$(mktemp)
cp ${outputs.default}/rootfs $rootfs
${pkgs.pkgsBuildBuild.qemuLim}/bin/qemu-system-mips \
-M malta -echr 16 -m 272 \
-device nand,chip_id=0x59,id=nand -drive format=raw,file=''${rootfs},if=mtd,id=nand \
-serial mon:stdio -kernel ${outputs.default}/vmlinux \
-append "root=/dev/mtdblock0 console=ttyS0,115200 panic=10 oops=panic init=/bin/init loglevel=8 root=/dev/mtdblock0 rootfstype=squashfs fw_devlink=off mem=256M liminix mtdparts=phram0:16M(rootfs) phram.phram=phram0,0x90000000,16Mi,65536" \
-display none
rm $rootfs
'';
} }

View file

@ -254,6 +254,7 @@ extraPkgs // {
qemuLim = let q = prev.qemu.overrideAttrs (o: { qemuLim = let q = prev.qemu.overrideAttrs (o: {
patches = o.patches ++ [ patches = o.patches ++ [
./pkgs/qemu/arm-image-friendly-load-addr.patch ./pkgs/qemu/arm-image-friendly-load-addr.patch
./pkgs/qemu/mips-with-nand.patch
]; ];
}); in q.override { nixosTestRunner = true; sdlSupport = false; }; }); in q.override { nixosTestRunner = true; sdlSupport = false; };

View file

@ -0,0 +1,25 @@
From 875b1f312b6a5b432e020723007a374d82a797f1 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Mon, 7 Oct 2024 13:05:06 +0200
Subject: [PATCH] feat: support NAND devices for MIPS
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
hw/mips/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
index 692bede538..60738ac659 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -10,6 +10,7 @@ config MALTA
select MIPS_CPS
select PIIX
select PFLASH_CFI01
+ select NAND
select SERIAL
select SMBUS_EEPROM
--
2.46.0