nortega/colonel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change of name.

Browse Source
This commit is contained in:
Nicolás Ortega Froysa 2018-03-11 17:47:43 +01:00
parent 06aa177eef
commit f51e10870b
No known key found for this signature in database
GPG Key ID: FEC70E3BAE2E69BF
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -32,7 +32,7 @@ LIBS=-lgcc
# Binary variables # Binary variables
OBJS=src/kernel/arch/$(ARCH)/boot.o src/kernel/kernel.o src/kernel/arch/$(ARCH)/tty.o OBJS=src/kernel/arch/$(ARCH)/boot.o src/kernel/kernel.o src/kernel/arch/$(ARCH)/tty.o
untrue.bin: $(OBJS) colonel.bin: $(OBJS)
$(CC) -T src/kernel/arch/$(ARCH)/linker.ld -o $@ $(LDFLAGS) $^ $(LIBS) $(CC) -T src/kernel/arch/$(ARCH)/linker.ld -o $@ $(LDFLAGS) $^ $(LIBS)
%.o: %.c %.o: %.c
@ -42,9 +42,9 @@ untrue.bin: $(OBJS)
$(AS) $(AFLAGS) $< -o $@ $(AS) $(AFLAGS) $< -o $@
.PHONY: all build-iso clean clean-all .PHONY: all build-iso clean clean-all
all: untrue.bin all: colonel.bin
build-iso: untrue.iso build-iso: colonel.iso
clean: clean:
rm -f $(OBJS) rm -f $(OBJS)
@ -53,7 +53,7 @@ clean:
clean-all: clean clean-all: clean
rm -f *.iso *.bin rm -f *.iso *.bin
untrue.iso: untrue.bin colonel.iso: colonel.bin
mkdir -p isodir/boot/grub/ mkdir -p isodir/boot/grub/
cp configs/grub.cfg isodir/boot/grub/ cp configs/grub.cfg isodir/boot/grub/
cp $< isodir/boot/ cp $< isodir/boot/

6
README.md
View File

@ -1,5 +1,5 @@
UntrueOS Colonel
======== =======
This is a small OS project I'm working on. It's slow progress and probably shouldn't be run anywhere except in an emulator. It currently supports the following architectures: This is a small OS project I'm working on. It's slow progress and probably shouldn't be run anywhere except in an emulator. It currently supports the following architectures:
- x86 - x86
@ -7,7 +7,7 @@ Compiling
--------- ---------
You'll want to setup a cross-compilation toolchain with [GCC](https://gcc.gnu.org/) for your target architecture, along with [GNU Make](https://www.gnu.org/software/make/) (I'll switch to the GNU autotools as soon as I can get them to work properly). You'll want to setup a cross-compilation toolchain with [GCC](https://gcc.gnu.org/) for your target architecture, along with [GNU Make](https://www.gnu.org/software/make/) (I'll switch to the GNU autotools as soon as I can get them to work properly).
To compile a full image you can run `make build-iso`, which will use [GNU GRUB](https://www.gnu.org/software/grub/) as the bootloader. Else, just run `make` and it will build the kernel into a file called `untrue.bin`. You can run the latter with [QEMU](https://www.qemu.org/) by using the `-kernel` option. To compile a full image you can run `make build-iso`, which will use [GNU GRUB](https://www.gnu.org/software/grub/) as the bootloader. Else, just run `make` and it will build the kernel into a file called `colonel.bin`. You can run the latter with [QEMU](https://www.qemu.org/) by using the `-kernel` option.
License License
------- -------

4
configs/grub.cfg
View File

@ -1,3 +1,3 @@
menuentry "UntrueOS" { menuentry "ColonelOS" {
multiboot /boot/untrue.bin multiboot /boot/colonel.bin
} }