Compare commits

...

5 Commits

Author SHA1 Message Date
Jeremy Soller
3f154e09e2
Update bootloader and kernel 2022-02-14 12:28:07 -07:00
Jeremy Soller
72ba48fee5
Temporarily remove usb-tablet device from qemu 2022-02-14 10:40:27 -07:00
Jeremy Soller
7bfb223b74
Re-enable xhcid and drivers, update kernel 2022-02-14 10:29:33 -07:00
Jeremy Soller
2b8585274e
Move logd to initfs, update kernel 2022-02-14 09:58:22 -07:00
Jeremy Soller
b59c88bd60
Update kernel 2022-02-14 08:49:49 -07:00
13 changed files with 9 additions and 21 deletions

@ -1 +1 @@
Subproject commit 1dfe98efd52639589fc98d636f9b1ca4c8c67088
Subproject commit 0874fabe02d9a7d77a611c250a48dcfd568d36c6

View File

@ -11,7 +11,6 @@ acid = {}
coreutils = {}
ion = {}
ipcd = {}
logd = {}
ptyd = {}
# User settings
@ -30,7 +29,6 @@ password = ""
path = "/etc/init.d/00_base"
data = """
ipcd
logd
ptyd
"""

View File

@ -74,7 +74,6 @@ ipcd = {}
#libpng = {}
#libsodium = {}
#llvm = {}
#logd = {}
#lua = {}
#mdp = {}
#mesa = {}
@ -179,7 +178,6 @@ password = ""
path = "/etc/init.d/00_base"
data = """
ipcd
#logd
ptyd
#pcid /etc/pcid.d/
"""

View File

@ -21,7 +21,6 @@ gnu-make = {}
installer = {}
ion = {}
ipcd = {}
logd = {}
netdb = {}
netstack = {}
netsurf = {}
@ -56,7 +55,6 @@ password = ""
path = "/etc/init.d/00_base"
data = """
ipcd
logd
ptyd
pcid /etc/pcid.d/
"""

View File

@ -67,7 +67,6 @@ libsodium = {}
libvorbis = {}
libxml2 = {}
llvm = {}
logd = {}
mesa = {}
mesa_glu = {}
nasm = {}
@ -106,6 +105,7 @@ resist = {}
ripgrep = {}
rodioplay = {}
rs-nes = {}
rust = {}
rust64 = {}
rust-cairo = {}
rust-cairo-demo = {}
@ -156,7 +156,6 @@ password = ""
path = "/etc/init.d/00_base"
data = """
ipcd
logd
ptyd
pcid /etc/pcid.d/
"""

View File

@ -82,7 +82,7 @@ libsodium = {}
libvorbis = {}
libxml2 = {}
llvm = {}
logd = {}
#logd = {}
#lua = {}
#mdp = {}
mesa = {}
@ -200,7 +200,6 @@ password = ""
path = "/etc/init.d/00_base"
data = """
ipcd
logd
ptyd
pcid /etc/pcid.d/
"""

View File

@ -74,7 +74,6 @@ ipcd = {}
#libpng = {}
#libsodium = {}
#llvm = {}
logd = {}
#lua = {}
#mdp = {}
#mesa = {}
@ -176,7 +175,6 @@ password = ""
path = "/etc/init.d/00_base"
data = """
ipcd
logd
ptyd
"""

View File

@ -17,7 +17,6 @@ gcc = {}
gnu-binutils = {}
gnu-make = {}
ipcd = {}
logd = {}
netdb = {}
netstack = {}
netutils = {}
@ -42,7 +41,6 @@ password = ""
path = "/etc/init.d/00_base"
data = """
ipcd
logd
ptyd
pcid /etc/pcid.d/
"""

View File

@ -19,7 +19,6 @@ gnu-make = {}
installer = {}
ion = {}
ipcd = {}
logd = {}
netdb = {}
netstack = {}
netutils = {}
@ -47,7 +46,6 @@ password = ""
path = "/etc/init.d/00_base"
data = """
ipcd
logd
ptyd
pcid /etc/pcid.d/
"""

View File

@ -9,6 +9,7 @@ prompt = false
[packages]
drivers = {}
init = {}
logd = {}
nulld = {}
#pciids = {}
ramfs = {}
@ -25,7 +26,8 @@ nulld
zerod
randd
vesad T T G
stdio display:1
logd debug: display:1
stdio log:
ps2d us
ramfs logging
acpid

2
kernel

@ -1 +1 @@
Subproject commit 1aae949fc488b5a25f7a1204ddb958ff015eb290
Subproject commit 81e700708d901d6552c2cef242df505d93efbf4f

View File

@ -1,4 +1,4 @@
INITFS_RM_BINS=alxd e1000d ihdad ixgbed pcspkrd redoxfs-ar redoxfs-mkfs rtl8168d usbctl usbhidd usbscsid xhcid
INITFS_RM_BINS=alxd e1000d ihdad ixgbed pcspkrd redoxfs-ar redoxfs-mkfs rtl8168d usbctl
build/initfs.tag: initfs.toml prefix
cargo build --manifest-path cookbook/Cargo.toml --release

View File

@ -36,7 +36,7 @@ ifeq ($(vga),no)
QEMUFLAGS+=-nographic -vga none
endif
ifneq ($(usb),no)
QEMUFLAGS+=-device nec-usb-xhci,id=xhci -device usb-tablet,bus=xhci.0
QEMUFLAGS+=-device nec-usb-xhci,id=xhci
endif
ifeq ($(gdb),yes)
QEMUFLAGS+=-s