diff --git a/OLVASSEL.md b/OLVASSEL.md index c87f8a9..a1116ab 100644 --- a/OLVASSEL.md +++ b/OLVASSEL.md @@ -14,7 +14,7 @@ Előre lefordított binárisok mellékelve, egyből használhatók. 3. *aarch64-rpi* ARMv8 betöltő Raspberry Pi 3-hoz, 4-hez [bootboot.img](https://gitlab.com/bztsrc/bootboot/raw/master/dist/bootboot.img) (34k) -4. *mykernel* egy példa BOOTBOOT [kompatíbilis kernel](https://gitlab.com/bztsrc/bootboot/tree/binaries/mykernel) (forrás elérhető [C](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel)-ben, [Pascal](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel-pas)-ban, [Rust](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel-rust)-ban és [Go](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel-go)-ban), ami vonalakat húz meg színes dobozokat rajzol +4. *mykernel* egy példa BOOTBOOT [kompatíbilis kernel](https://gitlab.com/bztsrc/bootboot/tree/binaries/mykernel) (forrás elérhető [C](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel/c)-ben, [Pascal](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel/pas)-ban, [Rust](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel/rust)-ban és [Go](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel/go)-ban), ami vonalakat húz meg színes dobozokat rajzol 5. *mkbootimg* minden az egyben, multiplatform [bootolható lemezkép készítő](https://gitlab.com/bztsrc/bootboot/tree/binaries) (Windows, MacOSX, Linux). @@ -100,7 +100,7 @@ tinflate: Joergen Ibsen raspbootcom: (GPL) Goswin von Brederlow -mykernel-rust: Vinay Chandra +mykernel/rust: Vinay Chandra BOOTBOOT, FS/Z: bzt diff --git a/README.md b/README.md index 4cf0849..7e32a14 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ I provide pre-compiled images ready for use. 3. *aarch64-rpi* ARMv8 boot loader for Raspberry Pi 3, 4 [bootboot.img](https://gitlab.com/bztsrc/bootboot/raw/master/dist/bootboot.img) (34k) -4. *mykernel* an example BOOTBOOT [compatible kernel](https://gitlab.com/bztsrc/bootboot/tree/binaries/mykernel) (source available in [C](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel), [Pascal](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel-pas), [Rust](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel-rust) and [Go](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel-go)) which draws lines and boxes +4. *mykernel* an example BOOTBOOT [compatible kernel](https://gitlab.com/bztsrc/bootboot/tree/binaries/mykernel) (source available in [C](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel/c), [Pascal](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel/pas), [Rust](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel/rust) and [Go](https://gitlab.com/bztsrc/bootboot/tree/master/mykernel/go)) which draws lines and boxes 5. *mkbootimg* an all-in-one multiplatform [bootable disk image creator](https://gitlab.com/bztsrc/bootboot/tree/binaries/) (Windows, MacOSX, Linux). @@ -101,7 +101,7 @@ tinflate: Joergen Ibsen raspbootcom: (GPL) Goswin von Brederlow -mykernel-rust: Vinay Chandra +mykernel/rust: Vinay Chandra BOOTBOOT, FS/Z: bzt diff --git a/mykernel/OLVASSEL.md b/mykernel/OLVASSEL.md new file mode 100644 index 0000000..19ed6e9 --- /dev/null +++ b/mykernel/OLVASSEL.md @@ -0,0 +1,17 @@ +BOOTBOOT Minta Kernelek +======================= + +Általános leírásért lásd a [BOOTBOOT Protokoll](https://gitlab.com/bztsrc/bootboot)t. + +Ezek példa "Hello Világ" kernelek különböző programozási nyelveken írva. Bináris verzió +elérhető [itt](https://gitlab.com/bztsrc/bootboot/tree/binaries/mykernel). Sikeres indítás +után egy ilyen képernyőt kell látnod: + +Screenshot + +Fordítás +-------- + +Az adott nyelv mappájában csak futtasd a `make` parancsot. Kelleni fog a `gcc`, `fpc` (FreePascal Compiler), +`cargo` + `rust`, és a `gccgo` (GNU go-lang fordító, NEM a hivatalos go-lang fordító!). + diff --git a/mykernel/README.md b/mykernel/README.md new file mode 100644 index 0000000..d505f01 --- /dev/null +++ b/mykernel/README.md @@ -0,0 +1,16 @@ +BOOTBOOT Example Kernels +======================== + +See [BOOTBOOT Protocol](https://gitlab.com/bztsrc/bootboot) for common details. + +These are sample "Hello World" kernels written in different system languages. Binary +versions [here](https://gitlab.com/bztsrc/bootboot/tree/binaries/mykernel). They all +should output a screen like this after a successful boot: + +Screenshot + +Compilation +----------- + +In the language's directory, just run `make`. You'll need `gcc`, `fpc` (FreePascal Compiler), +`cargo` + `rust`, and `gccgo` (GNU go-lang compiler, NOT the official go-lang compiler!). diff --git a/mykernel/Makefile b/mykernel/c/Makefile similarity index 97% rename from mykernel/Makefile rename to mykernel/c/Makefile index 7542911..f0ef0e6 100644 --- a/mykernel/Makefile +++ b/mykernel/c/Makefile @@ -1,5 +1,5 @@ # -# mykernel/Makefile +# mykernel/c/Makefile # # Copyright (C) 2017 - 2021 bzt (bztsrc@gitlab) # @@ -28,7 +28,7 @@ # # -CFLAGS = -Wall -fpic -ffreestanding -fno-stack-protector -nostdinc -nostdlib -I../dist/ +CFLAGS = -Wall -fpic -ffreestanding -fno-stack-protector -nostdinc -nostdlib -I../../dist/ all: mykernel.x86_64.elf mykernel.aarch64.elf diff --git a/mykernel-pas/font.psf b/mykernel/c/font.psf similarity index 100% rename from mykernel-pas/font.psf rename to mykernel/c/font.psf diff --git a/mykernel/kernel.c b/mykernel/c/kernel.c similarity index 99% rename from mykernel/kernel.c rename to mykernel/c/kernel.c index 1b33447..4f12564 100644 --- a/mykernel/kernel.c +++ b/mykernel/c/kernel.c @@ -1,5 +1,5 @@ /* - * mykernel/kernel.c + * mykernel/c/kernel.c * * Copyright (C) 2017 - 2021 bzt (bztsrc@gitlab) * diff --git a/mykernel/link.ld b/mykernel/c/link.ld similarity index 98% rename from mykernel/link.ld rename to mykernel/c/link.ld index cd1412e..ee06e7f 100644 --- a/mykernel/link.ld +++ b/mykernel/c/link.ld @@ -1,5 +1,5 @@ /* - * mykernel/link.ld + * mykernel/c/link.ld * * Copyright (C) 2017 - 2021 bzt (bztsrc@gitlab) * diff --git a/mykernel-go/Makefile b/mykernel/go/Makefile similarity index 98% rename from mykernel-go/Makefile rename to mykernel/go/Makefile index 5681366..20b1ec5 100644 --- a/mykernel-go/Makefile +++ b/mykernel/go/Makefile @@ -1,5 +1,5 @@ # -# mykernel-go/Makefile +# mykernel/go/Makefile # # Copyright (C) 2017 - 2021 bzt (bztsrc@gitlab) # diff --git a/mykernel-go/go_rt0.s b/mykernel/go/go_rt0.s similarity index 98% rename from mykernel-go/go_rt0.s rename to mykernel/go/go_rt0.s index 99f3c33..d328870 100644 --- a/mykernel-go/go_rt0.s +++ b/mykernel/go/go_rt0.s @@ -1,5 +1,5 @@ /* - * mykernel-go/go_rt0.s + * mykernel/go/go_rt0.s * * Copyright (C) 2017 - 2021 bzt (bztsrc@gitlab) * diff --git a/mykernel-go/kernel.go b/mykernel/go/kernel.go similarity index 99% rename from mykernel-go/kernel.go rename to mykernel/go/kernel.go index a6813bb..6703845 100644 --- a/mykernel-go/kernel.go +++ b/mykernel/go/kernel.go @@ -1,5 +1,5 @@ /* - * mykernel-go/kernel.go + * mykernel/go/kernel.go * * Copyright (C) 2017 - 2021 bzt (bztsrc@gitlab) * diff --git a/mykernel-go/link.ld b/mykernel/go/link.ld similarity index 98% rename from mykernel-go/link.ld rename to mykernel/go/link.ld index ee55788..558fcfd 100644 --- a/mykernel-go/link.ld +++ b/mykernel/go/link.ld @@ -1,5 +1,5 @@ /* - * mykernel-go/link.ld + * mykernel/go/link.ld * * Copyright (C) 2017 - 2021 bzt (bztsrc@gitlab) * diff --git a/mykernel-pas/Makefile b/mykernel/pas/Makefile similarity index 98% rename from mykernel-pas/Makefile rename to mykernel/pas/Makefile index 5f23640..17167c7 100644 --- a/mykernel-pas/Makefile +++ b/mykernel/pas/Makefile @@ -1,5 +1,5 @@ # -# mykernel-pas/Makefile +# mykernel/pas/Makefile # # Copyright (C) 2017 - 2021 bzt (bztsrc@gitlab) # diff --git a/mykernel-pas/bootboot.inc b/mykernel/pas/bootboot.inc similarity index 99% rename from mykernel-pas/bootboot.inc rename to mykernel/pas/bootboot.inc index eec0285..46bfa88 100644 --- a/mykernel-pas/bootboot.inc +++ b/mykernel/pas/bootboot.inc @@ -1,5 +1,5 @@ {* - * mykernel-pas/bootboot.inc + * mykernel/pas/bootboot.inc * * Copyright (C) 2017 - 2021 bzt (bztsrc@gitlab) * diff --git a/mykernel-rust/font.psf b/mykernel/pas/font.psf similarity index 100% rename from mykernel-rust/font.psf rename to mykernel/pas/font.psf diff --git a/mykernel-pas/kernel.pas b/mykernel/pas/kernel.pas similarity index 99% rename from mykernel-pas/kernel.pas rename to mykernel/pas/kernel.pas index 9ef4f6e..91e442b 100644 --- a/mykernel-pas/kernel.pas +++ b/mykernel/pas/kernel.pas @@ -1,5 +1,5 @@ {* - * mykernel-pas/kernel.pas + * mykernel/pas/kernel.pas * * Copyright (C) 2017 - 2021 bzt (bztsrc@gitlab) * diff --git a/mykernel-pas/link.ld b/mykernel/pas/link.ld similarity index 98% rename from mykernel-pas/link.ld rename to mykernel/pas/link.ld index 072045b..97a046c 100644 --- a/mykernel-pas/link.ld +++ b/mykernel/pas/link.ld @@ -1,5 +1,5 @@ /* - * mykernel-pas/link.ld + * mykernel/pas/link.ld * * Copyright (C) 2017 - 2021 bzt (bztsrc@gitlab) * diff --git a/mykernel-pas/system.pas b/mykernel/pas/system.pas similarity index 98% rename from mykernel-pas/system.pas rename to mykernel/pas/system.pas index 7488aa8..f449f63 100644 --- a/mykernel-pas/system.pas +++ b/mykernel/pas/system.pas @@ -1,5 +1,5 @@ {* - * mykernel-pas/system.pas + * mykernel/pas/system.pas * * Copyright (C) 2017 - 2021 bzt (bztsrc@gitlab) * diff --git a/mykernel-rust/Cargo.toml b/mykernel/rust/Cargo.toml similarity index 100% rename from mykernel-rust/Cargo.toml rename to mykernel/rust/Cargo.toml diff --git a/mykernel-rust/Makefile b/mykernel/rust/Makefile similarity index 100% rename from mykernel-rust/Makefile rename to mykernel/rust/Makefile diff --git a/mykernel/font.psf b/mykernel/rust/font.psf similarity index 100% rename from mykernel/font.psf rename to mykernel/rust/font.psf diff --git a/mykernel-rust/rust-toolchain b/mykernel/rust/rust-toolchain similarity index 100% rename from mykernel-rust/rust-toolchain rename to mykernel/rust/rust-toolchain diff --git a/mykernel-rust/src/bootboot.rs b/mykernel/rust/src/bootboot.rs similarity index 100% rename from mykernel-rust/src/bootboot.rs rename to mykernel/rust/src/bootboot.rs diff --git a/mykernel-rust/src/main.rs b/mykernel/rust/src/main.rs similarity index 100% rename from mykernel-rust/src/main.rs rename to mykernel/rust/src/main.rs diff --git a/mykernel-rust/triplets/mykernel-x86.json b/mykernel/rust/triplets/mykernel-x86.json similarity index 100% rename from mykernel-rust/triplets/mykernel-x86.json rename to mykernel/rust/triplets/mykernel-x86.json diff --git a/mykernel-rust/triplets/mykernel.ld b/mykernel/rust/triplets/mykernel.ld similarity index 100% rename from mykernel-rust/triplets/mykernel.ld rename to mykernel/rust/triplets/mykernel.ld