vanten-s/geos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed log and added VGA text driver #1

Closed
vanten-s wants to merge 12 commits from dev into main
pull from: dev
merge into: vanten-s:main
Conversation 0 Commits 12 Files changed 750 +1 -7
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e108f8bd97 - Show all commits

1
Makefile
View file

@ -4,7 +4,6 @@ all: build
build: build:
rm -rf build rm -rf build
rm -rf kernel/target
mkdir build mkdir build
i686-elf-as -o build/boot.o boot.s i686-elf-as -o build/boot.o boot.s
cd kernel; cargo build cd kernel; cargo build

3
kernel/.cargo/config.toml
View file

@ -4,6 +4,3 @@ target = "i686-unknown-bare.json"
[unstable] [unstable]
build-std-features = ["compiler-builtins-mem"] build-std-features = ["compiler-builtins-mem"]
build-std = ["core", "compiler_builtins"] build-std = ["core", "compiler_builtins"]
[target."i686-unknown-bare"]
linker = "i686-elf-gcc"

4
shell.nix
View file

@ -1,8 +1,6 @@
{ pkgs ? import <nixpkgs> {} }: { pkgs ? import <nixpkgs> {} }:
let pkgs.mkShell rec {
crossPkgs = pkgs.pkgsCross.aarch64-multiplatform;
in pkgs.mkShell rec {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
clang clang
llvmPackages_17.bintools llvmPackages_17.bintools