Skip to content

Commit cdd5f39

Browse files
committed
Remove "shared" folder structure & join in kernel directory
1 parent 6b0f13e commit cdd5f39

File tree

117 files changed

+915
-1347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+915
-1347
lines changed

kernel/build.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ with TARGET "all"
1212
#
1313
# Source directories
1414
#
15-
INC=inc
1615
BIN=bin
1716
SRC=src
1817
SRC_KERNEL=$SRC/kernel
19-
SRC_SHARED=$SRC/shared
2018

2119
#
2220
# Compiler flags
@@ -27,7 +25,6 @@ CFLAGS="-mcmodel=large -mno-sse -mno-sse2 -mno-mmx -mno-avx -mno-red-zone -std=c
2725
#
2826
# Object output folders
2927
#
30-
OBJ_SHARED=$BIN/obj-shared
3128
OBJ_KERNEL=$BIN/obj-kernel
3229

3330

@@ -57,7 +54,6 @@ target_clean() {
5754
headline "cleaning"
5855
remove $ARTIFACT_KERNEL
5956
cleanDirectory $BIN
60-
cleanDirectory $OBJ_SHARED
6157
cleanDirectory $OBJ_KERNEL
6258
changes --clear
6359
}
@@ -86,7 +82,7 @@ target_compile() {
8682

8783
# check if headers have changed
8884
headers_have_changed=0
89-
for file in $(find "$INC" -iname "*.hpp" -o -iname "*.h"); do
85+
for file in $(find "$srcdir" -iname "*.hpp" -o -iname "*.h"); do
9086
changes -c $file
9187
if [ $? -eq 1 ]; then
9288
headers_have_changed=1
@@ -143,9 +139,8 @@ target_link() {
143139
#
144140
target_all() {
145141
target_compile_ap_startup
146-
target_compile $SRC_SHARED $OBJ_SHARED "-I$INC -I$SRC"
147-
target_compile $SRC_KERNEL $OBJ_KERNEL "-I$INC -I$SRC"
148-
target_link $ARTIFACT_KERNEL $LINKSCRIPT_KERNEL "$OBJ_KERNEL/* $OBJ_SHARED/*"
142+
target_compile $SRC_KERNEL $OBJ_KERNEL "-I$SRC"
143+
target_link $ARTIFACT_KERNEL $LINKSCRIPT_KERNEL "$OBJ_KERNEL/*"
149144
}
150145

151146

kernel/inc/shared/debug/debug_interface.hpp

Lines changed: 0 additions & 50 deletions
This file was deleted.

kernel/inc/shared/memory/memory.hpp

Lines changed: 0 additions & 63 deletions
This file was deleted.

kernel/inc/shared/memory/paging.hpp

Lines changed: 0 additions & 112 deletions
This file was deleted.

kernel/inc/shared/setup_information.hpp

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)