From 57d4d9f2f20fb2d47e7878d10f4ec49175ddac24 Mon Sep 17 00:00:00 2001
From: yuvraj1803 <ysakshith@gmail.com>
Date: Fri, 10 Nov 2023 16:52:55 +0000
Subject: [PATCH] cleaned up makefile output

---
 Makefile         |  20 ++++++++++++++++----
 core/main.c      |   1 +
 guests/.DS_Store | Bin 6148 -> 6148 bytes
 guests/deltaOS   |   2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 2a21170..1f9ce67 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 INC = ./include
 LIB = ./lib/include
-TOOLCHAIN=aarch64-linux-gnu-
+TOOLCHAIN=@aarch64-linux-gnu-
 CC = 		$(TOOLCHAIN)gcc
 AS = 		$(TOOLCHAIN)as
 LD = 		$(TOOLCHAIN)ld
@@ -45,35 +45,47 @@ OBJ += ./build/sse/sse.o
 all: sdcard kernel8.img
 
 ./build/core/%.o: ./core/%.c
+	@echo [compiling] $@
 	$(CC) $(CFLAGS) -c $< -o $@
 
 ./build/mm/%.o: ./mm/%.c
+	@echo [compiling] $@
 	$(CC) $(CFLAGS) -c $< -o $@
 
 ./build/boot/%.S.o: ./boot/%.S
+	@echo [compiling] $@
 	$(CC) $(ASMFLAGS) -c $< -o $@
 
 ./build/core/%.S.o : ./core/%.S
+	@echo [compiling] $@
 	$(CC) $(ASMFLAGS) -c $< -o $@
 
 ./build/mm/%.S.o: ./mm/%.S
+	@echo [compiling] $@
 	$(CC) $(ASMFLAGS) -c $< -o $@	
 
 ./build/drivers/%.o: ./drivers/%.c
+	@echo [compiling] $@
 	$(CC) $(CFLAGS) -c $< -o $@
 
 ./build/fs/%.o: ./fs/%.c
+	@echo [compiling] $@
 	$(CC) $(CFLAGS) -c $< -o $@
 
 ./build/lib/%.o: ./lib/src/%.c
+	@echo [compiling] $@
 	$(CC) $(CFLAGS) -c $< -o $@
+
 ./build/shell/%.o : ./shell/%.c
+	@echo [compiling] $@
 	$(CC) $(CFLAGS) -c $< -o $@
 
 ./build/debug/%.o : ./debug/%.c
+	@echo [compiling] $@
 	$(CC) $(CFLAGS) -c $< -o $@
 
 ./build/sse/%.o : ./sse/%.c
+	@echo [compiling] $@
 	$(CC) $(CFLAGS) -c $< -o $@
 
 
@@ -97,20 +109,20 @@ debug:	sdcard kernel8.img
 qemu: 
 	qemu-system-aarch64 -M raspi3b -nographic -serial null -serial mon:stdio -m 1024 -kernel ./kernel8.img -drive file=./sdcard.img,if=sd,format=raw
 
-.PHONY: sdcard
+.SILENT: sdcard
 sdcard:	deltaOS
 	sudo modprobe nbd max_part=8
 	qemu-img create sdcard.img 128m
 	sudo qemu-nbd -c /dev/nbd0 --format=raw sdcard.img 
 	(echo o; echo n; echo p; echo 1; echo ; echo ;echo w; echo q) | sudo fdisk /dev/nbd0
-	sudo mkfs.fat -F32 /dev/nbd0p1
+	@sudo mkfs.fat -F32 /dev/nbd0p1
 	mkdir temp || true
 	sudo mount -o user /dev/nbd0p1 temp/
 	sudo cp  -r ./guests temp/
 	sleep 1s
 	sudo umount temp/
 	rmdir temp/ || true
-	sudo qemu-nbd -d /dev/nbd0
+	@sudo qemu-nbd -d /dev/nbd0
 	(echo t; echo c; echo w; echo q) | sudo fdisk sdcard.img
 
 .PHONY: objdump
diff --git a/core/main.c b/core/main.c
index 1e0dbe1..9466dc7 100644
--- a/core/main.c
+++ b/core/main.c
@@ -37,6 +37,7 @@ void main(void){
 	
 	vm_init("/guests/deltaOS/kernel8.img", 0x0,0x80000,0x80000);
 	vm_init("/guests/deltaOS/kernel8.img", 0x0,0x80000,0x80000);
+
 	
 	sse_init();		// Secure Storage Enclave
 
diff --git a/guests/.DS_Store b/guests/.DS_Store
index e40a38c8dd2fb47248901badd5dbb4163fead3ff..caa3d43b8ef463af407c1b39527045ae7b92bc46 100644
GIT binary patch
delta 388
zcmZoMXfc=|#>B)qu~2NHo}wrV0|Nsi1A_nqLn4DeL$GH~esWUI#*fPx>p?Q?3@Hq$
z3^@!X$g=rKKpCJ021g*)`ws>{7KZAi^5TM|9I)ygNd-BX#U%y?*BF_YSy<WFIoLV4
zIbwq|^2>uu5=%;pof3<pLA;Rs{G22(yB^3%ObW|PEsqxvan8>xNzBYkEduMvOi2Z*
zi3!ilOUW;H$}i1JDF$l}hDdO5a&X2ANK{vw7+B~i7#djC>L^rO8X4#)m>8SY)^c))
zD(hPZ#b@W_=H+*R9nQcA3<5CVh0+WRx)4@3kU|TEvf!e;ocz3WpbSVG8$$*|`NRcc
m8z1dv+04$t&jAeFjUT@=Pv#df6aXn`fG7l8u{l6w3o`)I-(Z{o

delta 136
zcmZoMXfc=|#>CJ*u~2NHo}wrd0|Nsi1A_nqLlHv>Lq0<>gC0ZD#6tDS1|lq`JPc_-
z;Zz_*l4Qta$n(s}Pfp6oPXcNN>SS0C#Cre1fPrDN9`j9>%>~R^Oq<y`_&I=9ZBAtV
V&ODi4#E_9;vJH>)<`|I`%m8^?BBcNT

diff --git a/guests/deltaOS b/guests/deltaOS
index a327c3f..010a592 160000
--- a/guests/deltaOS
+++ b/guests/deltaOS
@@ -1 +1 @@
-Subproject commit a327c3fd8ba80aa92907a3334923c7d8d406608d
+Subproject commit 010a592f7b83facaa05746f63c3c987ef05fb84f