mirror of
https://github.com/tailix/kernel.git
synced 2024-11-27 11:24:34 -05:00
Rename "arch/" to "arch/x86/"
This commit is contained in:
parent
9ea8f106eb
commit
fca1b839ff
46 changed files with 8 additions and 5 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
/config.mk
|
/config.mk
|
||||||
|
|
||||||
/arch/kernel
|
/arch/x86/kernel
|
||||||
/libk/libk.a
|
/libk/libk.a
|
||||||
/iso/image.iso
|
/iso/image.iso
|
||||||
/iso/rootfs/boot/kernelmq
|
/iso/rootfs/boot/kernelmq
|
||||||
|
|
6
Makefile
6
Makefile
|
@ -1,7 +1,7 @@
|
||||||
include config.mk
|
include config.mk
|
||||||
|
|
||||||
export INCLUDE = $(shell pwd)/include
|
export INCLUDE = $(shell pwd)/include
|
||||||
export KERNEL = $(shell pwd)/arch/kernel
|
export KERNEL = $(shell pwd)/arch/$(ARCH)/kernel
|
||||||
export LIBK = $(shell pwd)/libk/libk.a
|
export LIBK = $(shell pwd)/libk/libk.a
|
||||||
export MODULES = $(addprefix $(shell pwd)/modules/, dummy1.bin dummy2.bin)
|
export MODULES = $(addprefix $(shell pwd)/modules/, dummy1.bin dummy2.bin)
|
||||||
|
|
||||||
|
@ -17,10 +17,10 @@ test: run-test
|
||||||
##########
|
##########
|
||||||
|
|
||||||
all-kernel: all-libk
|
all-kernel: all-libk
|
||||||
make all -C arch
|
make all -C arch/$(ARCH)
|
||||||
|
|
||||||
clean-kernel:
|
clean-kernel:
|
||||||
make clean -C arch
|
make clean -C arch/$(ARCH)
|
||||||
|
|
||||||
#######
|
#######
|
||||||
# ISO #
|
# ISO #
|
||||||
|
|
1
arch/none/Makefile
Normal file
1
arch/none/Makefile
Normal file
|
@ -0,0 +1 @@
|
||||||
|
clean:
|
|
@ -10,7 +10,7 @@ OBJS += pfa.c.o
|
||||||
OBJS += paging.c.o paging.asm.cpp.o
|
OBJS += paging.c.o paging.asm.cpp.o
|
||||||
|
|
||||||
# Architecture-independent
|
# Architecture-independent
|
||||||
OBJS += ../src/info.c.o
|
OBJS += ../../src/info.c.o
|
||||||
OBJS += main.c.o
|
OBJS += main.c.o
|
||||||
|
|
||||||
# Built-in drivers
|
# Built-in drivers
|
1
env/build-x86.mk
vendored
1
env/build-x86.mk
vendored
|
@ -1 +1,2 @@
|
||||||
export CCPREFIX = i686-elf-
|
export CCPREFIX = i686-elf-
|
||||||
|
export ARCH = x86
|
||||||
|
|
1
env/test-host.mk
vendored
1
env/test-host.mk
vendored
|
@ -1 +1,2 @@
|
||||||
export CCPREFIX =
|
export CCPREFIX =
|
||||||
|
export ARCH = none
|
||||||
|
|
Loading…
Reference in a new issue