From 6adeb863f0d14c7a61e7e459de91a75a1eed728c Mon Sep 17 00:00:00 2001 From: Julian Barathieu Date: Fri, 21 Dec 2018 12:37:02 +0000 Subject: [PATCH 1/5] Delete ChangeLog~ --- src/ChangeLog~ | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/ChangeLog~ diff --git a/src/ChangeLog~ b/src/ChangeLog~ deleted file mode 100644 index 0f5b213..0000000 --- a/src/ChangeLog~ +++ /dev/null @@ -1,17 +0,0 @@ -//----------------------------------------------------------------------------// -// GNU GPL OS/K // -// // -// Authors: spectral` // -// NeoX // -// // -// Desc: ChangeLog #1 // -// From: 2018/12/06 // -// UpTo: current // -//----------------------------------------------------------------------------// - -2018/10/?? - Started talking about making our own OS -2018/11/?? - Name decided & creation of gnu-os-k.eu -2018/12/06 - Actually started project, began MBR, decided directories organization, created this file and others -2018/12/08 - MBR actually supports Long Mode Compatibility Verification - - Added A20 line Enabling to MBR - From 9c6843658284623fe39213416fed2b076eb41db0 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Fri, 21 Dec 2018 13:49:22 +0100 Subject: [PATCH 2/5] Delete Makefile~ --- src/Makefile~ | 109 -------------------------------------------------- 1 file changed, 109 deletions(-) delete mode 100644 src/Makefile~ diff --git a/src/Makefile~ b/src/Makefile~ deleted file mode 100644 index 032c57b..0000000 --- a/src/Makefile~ +++ /dev/null @@ -1,109 +0,0 @@ -#----------------------------------------------------------------------------# -# GNU GPL OS/K # -# # -# Authors: spectral` # -# NeoX # -# # -# Desc: Project Makefile # -#----------------------------------------------------------------------------# - -CC_NAME="../toolchains/x86_64-elf-7.3.0-Linux-x86_64/bin/x86_64-elf-gcc" -CWARNS=-Wall -Wextra -Werr -CFLAGS=-nostdlib -ffreestanding -mcmodel=large -mno-red-zone -mno-mmx -mno-sse -mno-sse2 -CDEFINES=-DNDEBUG -CINCLUDES=-I./kaleid - -CC=$(CC_NAME) $(CWARNS) $(CFLAGS) $(CDEFINES) $(CINCLUDES) - -ASM=nasm -ASMFLAGS= -BOOTFLAGS=-f bin - -BINDIR=../bin -OBJDIR=../obj - -BOOTDIR=boot -COMMDIR=kaleid/common -KERNDIR=kaleid/kernel -SYSTDIR=kaleid/system - -all: bootloader - -boot.mbr.s: $(BOOTDIR)/mbr.s - $(ASM) $(BOOTFLAGS) $(BOOTDIR)/mbr.s -o $(OBJDIR)/boot/mbr.bin - -boot.loader.s: $(BOOTDIR)/loader.s - $(ASM) $(BOOTFLAGS) $(BOOTDIR)/loader.s -o $(OBJDIR)/boot/loader.bin - -bootloader: boot.mbr.s boot.loader.s - dd if=/dev/zero of=$(BINDIR)/disk.img bs=1024 count=0 seek=1048576 - su -c "mkfs.vfat $(BINDIR)/disk.img -F 32 -r 112 -S 512 -v" - dd if=$(OBJDIR)/boot/mbr.bin of=$(BINDIR)/disk.img count=1 - su -c "mkdir /mnt/disk && mount -o loop $(BINDIR)/disk.img /mnt/disk" - cp $(OBJDIR)/boot/loader.bin /mnt/disk/loader.bin - -#----------------------------------------------------------------------------# -# TESTING MAKEFILE - -pseudo_kern: - $(ASM) $(BOOTFLAGS) $(BOOTDIR)/pseudo_kernel.s -o $(OBJDIR)/boot/pkernel.bin - -testing: bootloader pseudo_kern - cat $(BINDIR)/bootloader.bin $(OBJDIR)/boot/pkernel.bin > $(BINDIR)/boot.bin - -#----------------------------------------------------------------------------# -# COMMON MAKEFILE - -COMM_DEPS=$(COMMDIR)/common.h $(COMMDIR)/assert.h $(COMMDIR)/atomic.h $(COMMDIR)/config.h \ - $(COMMDIR)/status.h $(COMMDIR)/string.h $(COMMDIR)/types.h - -common.lib.string.c: $(COMMDIR)/lib/string.c $(COMM_DEPS) - $(CC) -c $(COMMDIR)/lib/string.c -o ../obj/$(COMMDIR)/lib/string.o - -#----------------------------------------------------------------------------# -# KERNEL MAKEFILE - -KERN_DEPS=$(COMM_DEPS) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 1cb0452fdb58115d99e318bd9d34e5d812db7028 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Fri, 21 Dec 2018 13:49:36 +0100 Subject: [PATCH 3/5] Delete making.sh~ --- src/making.sh~ | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 src/making.sh~ diff --git a/src/making.sh~ b/src/making.sh~ deleted file mode 100644 index 75f1fff..0000000 --- a/src/making.sh~ +++ /dev/null @@ -1,2 +0,0 @@ -make -dd if=/dev/zero of=../bin/disk.img bs=1024 count=0 seek=$[1024*1024] From 9a523b512333ad70aee6514015895273ab35f6bd Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Fri, 21 Dec 2018 13:49:49 +0100 Subject: [PATCH 4/5] Delete neox.sh~ --- src/neox.sh~ | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 src/neox.sh~ diff --git a/src/neox.sh~ b/src/neox.sh~ deleted file mode 100644 index 9934e8f..0000000 --- a/src/neox.sh~ +++ /dev/null @@ -1,12 +0,0 @@ -src = $PWD - -scp -Rv ./src/ "/home/neox/Documents/GNU OSK" -cd "/home/neox/Documents/GNU OSK/src/" -make -cd $src -scp -Rv "/home/neox/Documents/GNU OSK/obj" .. -scp -Rv "/home/neox/Documents/GNU OSK/bin" .. - - -qemu-system-x86_64 -drive file="/home/neox/Documents/GNU OSK/bin/bootloader.bin",index=0,media=disk,format=raw -boot a -d cpu_reset -qemu-system-i386 -drive file="/home/neox/Documents/GNU OSK/bin/bootloader.bin",index=0,media=disk,format=raw -boot a -no-reboot -no-shutdown -d cpu_reset From 36bc857cbba1aa41d5bbe5a3219984acb27e72c0 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Fri, 21 Dec 2018 13:50:01 +0100 Subject: [PATCH 5/5] Delete script.sh~ --- src/script.sh~ | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 src/script.sh~ diff --git a/src/script.sh~ b/src/script.sh~ deleted file mode 100644 index 832eec3..0000000 --- a/src/script.sh~ +++ /dev/null @@ -1,4 +0,0 @@ -make && cp ../bin/bootloader.bin "~/Documents/GNU OSK/bin/bootloader.bin" - -qemu-system-x86_64 -hda "~/Documents/GNU OSK/bin/bootloader.bin" -qemu-system-i386 -hda "~/Documents/GNU OSK/bin/bootloader.bin"