Compare commits

..

6 Commits

Author SHA1 Message Date
Jeremy Soller
03c66042b2
Update relibc 2021-01-19 11:37:20 -07:00
Jeremy Soller
18c98c79a3
Do not build ion for aarch64 2021-01-19 11:34:40 -07:00
Jeremy Soller
31b220359a
Move aarch64 config to separate file 2021-01-19 11:17:41 -07:00
Jeremy Soller
ce36451929
Update bootloader 2021-01-19 11:13:28 -07:00
Robin Randhawa
c2c27a2b97 aarch64: WIP basic initfs and filesystem build 2021-01-19 18:05:04 +00:00
Jeremy Soller
b8ee5cd117
Update kernel 2021-01-19 07:40:02 -07:00
7 changed files with 327 additions and 9 deletions

View File

@ -66,6 +66,7 @@ touch kernel
touch kernel/src/arch/aarch64/init/pre_kstart/early_init.S touch kernel/src/arch/aarch64/init/pre_kstart/early_init.S
make build/kernel make build/kernel
make build/initfs.tag make build/initfs.tag
make build/filesystem.bin
mkimage \ mkimage \
-A arm64 \ -A arm64 \

@ -1 +1 @@
Subproject commit 1d201c4435ebad73e0248d02c8b254783b75eca5 Subproject commit c96eb83d18ba15e758d896bfba3c35700416f669

311
config/aarch64.toml Normal file
View File

@ -0,0 +1,311 @@
# This is the default configuration file
# General settings
[general]
# Do not prompt if settings are not defined
prompt = false
# Package settings
[packages]
#acid = {}
# audiod = {}
#autoconf = {}
#automake = {}
#bash = {}
#binutils = {}
ca-certificates = {}
#cairo = {}
#cairodemo = {}
#cargo = {}
#cleye = {}
#cmatrix = {}
# contain = {}
# coreutils = {}
#cpal = {}
#curl = {}
# dash = {}
#diffutils = {}
#dosbox = {}
# drivers = {}
#drivers-041 = {}
#duktape = {}
#eduke32 = {}
#exampled = {}
#expat = {}
# extrautils = {}
#fd = {}
#ffmpeg = {}
# findutils = {}
#freeciv = {}
#freedoom = {}
#freeglut = {}
#freetype = {}
#friar = {} # mio patch
#game-2048 = {}
#games = {}
#gawk = {}
#gcc = {}
# gdbserver = {}
#gears = {}
#generaluser-gs = {}
#gettext = {}
#gigalomania = {}
#git = {}
#glib = {}
#glium = {}
#glutin = {}
#gnu-binutils = {}
#gnu-grep = {}
#gnu-make = {}
#gstreamer = {}
#harfbuzz = {}
#hematite = {}
#init = {}
# installer = {}
# ion = {}
ipcd = {}
#jansson = {}
#keyboard-sfx = {}
#lci = {}
#libc-bench = {}
#libffi = {}
#libiconv = {}
#libjpeg = {}
#liborbital = {}
#libpng = {}
#libsodium = {}
#llvm = {}
logd = {}
#lua = {}
#mdp = {}
#mesa = {}
#mesa_glu = {}
#miniserve = {}
#nasm = {}
#ncdu = {}
#ncurses = {}
#ncursesw = {}
# netdb = {}
# netstack = {}
# netsurf = {}
# netutils = {}
#neverball = {}
#newlib = {}
#newlibtest = {}
#nulld = {}
#openjazz = {}
#openssl = {}
#openttd = {}
#openttd-opengfx = {}
#openttd-openmsx = {}
#openttd-opensfx = {}
#orbclient = {}
# orbdata = {}
# orbital = {}
# orbterm = {}
# orbutils = {}
#osdemo = {}
#pastel = {}
#patch = {}
#pciids = {}
#pcre = {}
#periodictable = {}
#perl = {}
#pixelcannon = {}
#pixman = {}
# pkgutils = {}
#powerline = {}
#prboom = {}
ptyd = {}
#python = {}
#qemu = {}
#randd = {}
#readline = {} # ncurses
redoxfs = {}
#redox-fatfs = {}
#redox-ssh = {}
#relibc = {}
#relibc-tests = {}
#ripgrep = {}
#rodioplay = {}
#rs-nes = {}
#rust = {}
#rust64 = {}
#rust-cairo = {}
#rust-cairo-demo = {}
#rustual-boy = {}
#schismtracker = {}
#scummvm = {}
#sdl = {}
#sdl2 = {}
#sdl2_gears = {}
#sdl_gfx = {}
#sdl_image = {}
#sdl_mixer = {}
#sdl_ttf = {}
#sdl-player = {}
#sed = {}
#servo = {}
#shellstorm = {}
# smith = {}
#sodium = {}
#sopwith = {}
#ssh = {}
# strace = {}
#syobonaction = {}
#terminfo = {}
#termplay = {}
#timidity = {}
#ttf-hack = {}
# userutils = {}
# uutils = {}
#vim = {}
#vttest = {}
#webrender = {}
#winit = {}
#xz = {}
#zerod = {}
#zlib = {}
# User settings
[users.root]
password = "password"
uid = 0
gid = 0
name = "root"
home = "/root"
[users.user]
# Password is unset
password = ""
[[files]]
path = "/etc/init.d/00_base"
data = """
ipcd
logd
ptyd
# pcid /etc/pcid.d/
"""
[[files]]
path = "/etc/init.d/10_net"
data = """
# smolnetd
# dnsd
# dhcpd -b
"""
[[files]]
path = "/etc/init.d/20_orbital"
data = """
# audiod
# orbital display:3/activate orblogin launcher
"""
[[files]]
path = "/etc/init.d/30_console"
data = """
# getty display:2
getty debug: -J
"""
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]]
path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/group"
data = """
root;0;root
user;1000;user
sudo;1;user
"""
[[files]]
path = "/etc/hostname"
data = """
redox
"""
[[files]]
path = "/usr/bin"
data = "/bin"
symlink = true
[[files]]
path = "/usr/games"
data = "/games"
symlink = true
[[files]]
path = "/usr/include"
data = "/include"
symlink = true
[[files]]
path = "/usr/lib"
data = "/lib"
symlink = true
[[files]]
path = "/usr/share"
data = "/share"
symlink = true
[[files]]
path = "/tmp"
data = ""
directory= true
# 0o1777
mode = 1023
[[files]]
path = "/dev/null"
data = "null:"
symlink = true
[[files]]
path = "/dev/random"
data = "rand:"
symlink = true
[[files]]
path = "/dev/urandom"
data = "rand:"
symlink = true
[[files]]
path = "/dev/zero"
data = "zero:"
symlink = true

View File

@ -1 +1 @@
config/desktop.toml config/aarch64.toml

View File

@ -13,7 +13,7 @@ nulld = {}
#pciids = {} #pciids = {}
ramfs = {} ramfs = {}
randd = {} randd = {}
#redoxfs = {} redoxfs = {}
zerod = {} zerod = {}
[[files]] [[files]]
@ -21,15 +21,21 @@ path="/etc/init.rc"
data=""" data="""
export PATH /bin export PATH /bin
export TMPDIR /tmp export TMPDIR /tmp
stdio debug:
echo Post stdio!
nulld nulld
echo Post nulld!
zerod zerod
echo Post zerod!
randd randd
vesad T T G echo Post randd!
stdio display:1 # vesad T T G
ps2d us # ps2d us
ramfs logging ramfs logging
pcid /etc/pcid/initfs.toml echo Post ramfs!
# pcid /etc/pcid/initfs.toml
redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
echo Post redoxfs!
cd file: cd file:
export PATH file:/bin export PATH file:/bin
run.d /etc/init.d run.d /etc/init.d

2
kernel

@ -1 +1 @@
Subproject commit 17fd135017b67ad666ae987fe3d4fe90c46aeda1 Subproject commit d76298b3f8c5b19a6029e0f59af5b89cc2eaa191

2
relibc

@ -1 +1 @@
Subproject commit d94e445ae24b369d16a9708390a6a331c38fb44f Subproject commit a16f535ee8a3aadaa1dfa0b78dc64ade8f9bea93