merge: nongiach#51

antifob · May 15, 2024 · 14bc212 · 14bc212
1 parent 28b056b
commit 14bc212
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/arm_now/config.py b/arm_now/config.py
@@ -17,29 +17,29 @@ class Config:
  "armv7-eabihf": ["arm", "-M vexpress-a9 -kernel {kernel} -sd {rootfs} -append 'root=/dev/mmcblk0 console=ttyAMA0 rw physmap.enabled=0 noapic'"], # check log
  # "bfin":, TODO
  # "m68k-68xxx":, TODO 
- "m68k-coldfire": ["m68k", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+ "m68k-coldfire": ["m68k", "-kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
  "microblazebe": ["microblaze", "-M petalogix-s3adsp1800 -kernel {kernel} -nographic"], # rootfs is inside the kernel file, but we also have a separated rootfs if needed
- "microblazeel": ["microblazeel", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=tty0 rw physmap.enabled=0 noapic'"], # check log
- "mips32": ["mips", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
- "mips32el": ["mipsel", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+ "microblazeel": ["microblazeel", "-kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/sda console=tty0 rw physmap.enabled=0 noapic'"], # check log
+ "mips32": ["mips", "-kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+ "mips32el": ["mipsel", "-kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
  "mips32r5el": ["mipsel", "-machine malta -cpu P5600 -kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/hda rw'"],
  "mips32r6el": ["mipsel", "-M malta -cpu mips32r6-generic -kernel {kernel} -drive file={rootfs},format=raw -append root=/dev/hda -net nic,model=pcnet -net user"],
- "mips64-n32": ["mips64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
- "mips64el-n32": ["mips64el", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+ "mips64-n32": ["mips64", "-kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+ "mips64el-n32": ["mips64el", "-kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
  # "mips64r6el-n32":, TODO check log
  # "mips64r6el-n32": ["mips64el", "-machine malta -kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/hda rw console=ttyS0,'"], # check log
- "nios2": ["nios2", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
- "powerpc64-e5500": ["ppc64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
- "powerpc64-power8": ["ppc64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
- "powerpc64le-power8": ["ppc64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
- "sh-sh4": ["sh4", "-M r2d -serial vc -kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+ "nios2": ["nios2", "-kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+ "powerpc64-e5500": ["ppc64", "-kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+ "powerpc64-power8": ["ppc64", "-kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+ "powerpc64le-power8": ["ppc64", "-kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+ "sh-sh4": ["sh4", "-M r2d -serial vc -kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
  # "sparc64":, TODO check log
  # "sparc64": ["sparc64", "-M sun4u -kernel {kernel} -append 'root=/dev/sda console=ttyS0,115200' -drive file={rootfs},format=raw -net nic,model=e1000 -net user"], # this causes kernel crash
  # ":sparcv8":, TODO, check log, 
  # "sparcv8": ["sparc", "-machine SS-10 -kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/sda console=ttyS0,115200' -net nic,model=lance -net user"], # error
- # "x86-64-core-i7":["x86_64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # old
+ # "x86-64-core-i7":["x86_64", "-kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # old
  "x86-64-core-i7" : ["x86_64", "-M pc -kernel {kernel} -drive file={rootfs},if=virtio,format=raw -append 'root=/dev/vda rw console=ttyS0' -net nic,model=virtio -net user"],
- # "x86-core2" : ["i386", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic -net nic,model=virtio -net user'"],
+ # "x86-core2" : ["i386", "-kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic -net nic,model=virtio -net user'"],
  "x86-core2": ["i386", "-M pc -kernel {kernel} -drive file={rootfs},if=virtio,format=raw -append 'root=/dev/vda rw console=ttyS0' -net nic,model=virtio -net user"], # fix opkg
  "x86-i686":["i386", "-M pc -kernel {kernel} -drive file={rootfs},if=virtio,format=raw -append 'root=/dev/vda rw console=ttyS0' -net nic,model=virtio -net user"],
  "xtensa-lx60": ["xtensa", "-M lx60 -cpu dc233c -monitor null -nographic -kernel {kernel} -monitor null"]