Changeset c9ed176 in mainline

Timestamp:

2005-09-25T16:51:17Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a58db280

Parents:

48a02ef

Message:

Move kernel build files one level up the directory tree.
Fix paths in your testing environment!

Files:

• Makefile (added)
• Makefile.config (moved) (moved from src/Makefile.config ) (1 diff)
• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/amd64/boot/Makefile (modified) (1 diff)
• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia32/boot/Makefile (modified) (1 diff)
• arch/ia64/Makefile.inc (modified) (1 diff)
• arch/ia64/boot/Makefile (modified) (1 diff)
• arch/mips32/Makefile.inc (modified) (1 diff)
• arch/mips32/boot/Makefile (modified) (1 diff)
• arch/ppc32/Makefile.inc (modified) (1 diff)
• arch/ppc32/boot/Makefile (modified) (1 diff)
• build.amd64 (moved) (moved from src/build.amd64 ) (1 diff)
• build.ia32 (moved) (moved from src/build.ia32 )
• build.ia64 (moved) (moved from src/build.ia64 )
• build.mips32 (moved) (moved from src/build.mips32 ) (1 diff)
• build.ppc32 (moved) (moved from src/build.ppc32 )
• clean.amd64 (added)
• clean.ia32 (moved) (moved from src/clean.ia32 ) (1 diff)
• clean.ia64 (moved) (moved from src/clean.ia64 )
• clean.mips32 (added)
• clean.ppc32 (moved) (moved from src/clean.ppc32 )
• contrib/conf/SPMIPS.simics (modified) (1 diff)
• contrib/conf/dot.bochsrc (modified) (1 diff)
• contrib/conf/ski.conf (modified) (1 diff)
• src/Makefile (deleted)
• src/clean.amd64 (deleted)
• src/clean.mips32 (deleted)

Makefile.config

@@ -36 +36 @@
 #TEST_DIR=synch/semaphore1/
 #TEST_DIR=synch/semaphore2/
-#TEST_DIR=fpu/fpu1
-#TEST_DIR=fpu/sse1
-#TEST_DIR=fpu/mips1
-#TEST_DIR=print/print1
-#TEST_DIR=thread/thread1
+#TEST_DIR=fpu/fpu1/
+#TEST_DIR=fpu/sse1/
+#TEST_DIR=fpu/mips1/
+#TEST_DIR=print/print1/
+#TEST_DIR=thread/thread1/

arch/amd64/Makefile.inc

@@ -25 +25 @@
 LFLAGS=-M 
 
-../arch/$(ARCH)/_link.ld: ../arch/$(ARCH)/_link.ld.in
+arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
         $(CC) $(CFLAGS) -C -E -x c $< | grep -v "^\#" > $@
 
-arch_sources = arch/dummy.s \
-        arch/fpu_context.c \
-        arch/boot/boot.S \
-        arch/boot/memmap.S \
-        arch/pm.c \
-        arch/context.S \
-        arch/drivers/ega.c \
-        arch/drivers/i8042.c \
-        arch/drivers/i8254.c \
-        arch/drivers/i8259.c \
-        arch/supplib.c \
-        arch/delay.S \
-        arch/amd64.c \
-        arch/bios/bios.c \
-        arch/interrupt.c \
-        arch/mm/frame.c \
-        arch/mm/page.c \
-        arch/mm/tlb.c \
-        arch/asm_utils.S \
-        arch/fmath.c \
-        arch/mm/memory_init.c \
-        arch/cpu/cpu.c \
-        arch/proc/scheduler.c \
-        arch/userspace.c \
-        arch/acpi/acpi.c \
-        arch/acpi/madt.c
+arch_sources = \
+        src/arch/dummy.s \
+        src/arch/fpu_context.c \
+        src/arch/boot/boot.S \
+        src/arch/boot/memmap.S \
+        src/arch/pm.c \
+        src/arch/context.S \
+        src/arch/drivers/ega.c \
+        src/arch/drivers/i8042.c \
+        src/arch/drivers/i8254.c \
+        src/arch/drivers/i8259.c \
+        src/arch/supplib.c \
+        src/arch/delay.S \
+        src/arch/amd64.c \
+        src/arch/bios/bios.c \
+        src/arch/interrupt.c \
+        src/arch/mm/frame.c \
+        src/arch/mm/page.c \
+        src/arch/mm/tlb.c \
+        src/arch/asm_utils.S \
+        src/arch/fmath.c \
+        src/arch/mm/memory_init.c \
+        src/arch/cpu/cpu.c \
+        src/arch/proc/scheduler.c \
+        src/arch/userspace.c \
+        src/arch/acpi/acpi.c \
+        src/arch/acpi/madt.c
 
 ifdef SMP
-arch_sources += arch/smp/ap.S \
-                arch/smp/apic.c \
-                arch/smp/ipi.c \
-                arch/smp/mps.c \
-                arch/smp/smp.c
+arch_sources += src/arch/smp/ap.S \
+                src/arch/smp/apic.c \
+                src/arch/smp/ipi.c \
+                src/arch/smp/mps.c \
+                src/arch/smp/smp.c
 endif

arch/amd64/boot/Makefile

@@ -4 +4 @@
 
 build: boot.bin
-        dd if=boot.bin of=../../../src/image.bin bs=512 conv=sync
-        -cat ../../../src/kernel.bin >>../../../src/image.bin
-        dd if=/dev/zero of=../../../src/image.bin bs=1 seek=1474559 count=1
+        dd if=boot.bin of=../../../image.bin bs=512 conv=sync
+        -cat ../../../kernel.bin >>../../../image.bin
+        dd if=/dev/zero of=../../../image.bin bs=1 seek=1474559 count=1
 
 boot.bin: boot.o

arch/ia32/Makefile.inc

@@ -31 +31 @@
 endif
 
-CPPFLAGS=$(DEFS) -nostdinc -I../include
+CPPFLAGS=$(DEFS) -nostdinc -Iinclude/
 CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3
 LFLAGS=-M
 
-../arch/$(ARCH)/_link.ld: ../arch/$(ARCH)/_link.ld.in
+arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
         $(CC) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
 
 arch_sources= \
-        arch/context.s \
-        arch/debug/panic.s \
-        arch/cpuid.s \
-        arch/delay.s \
-        arch/asm.S \
-        arch/proc/scheduler.c \
-        arch/acpi/acpi.c \
-        arch/acpi/madt.c \
-        arch/bios/bios.c \
-        arch/smp/ap.S \
-        arch/smp/apic.c \
-        arch/smp/mps.c \
-        arch/smp/smp.c \
-        arch/atomic.S \
-        arch/smp/ipi.c \
-        arch/ia32.c \
-        arch/interrupt.c \
-        arch/pm.c \
-        arch/userspace.c \
-        arch/cpu/cpu.c \
-        arch/mm/frame.c \
-        arch/mm/memory_init.c \
-        arch/mm/page.c \
-        arch/mm/tlb.c \
-        arch/drivers/i8042.c \
-        arch/drivers/i8254.c \
-        arch/drivers/i8259.c \
-        arch/drivers/ega.c \
-        arch/boot/boot.S \
-        arch/boot/memmap.S\
-        arch/fpu_context.c\
-        arch/fmath.c
+        src/arch/context.s \
+        src/arch/debug/panic.s \
+        src/arch/cpuid.s \
+        src/arch/delay.s \
+        src/arch/asm.S \
+        src/arch/proc/scheduler.c \
+        src/arch/acpi/acpi.c \
+        src/arch/acpi/madt.c \
+        src/arch/bios/bios.c \
+        src/arch/smp/ap.S \
+        src/arch/smp/apic.c \
+        src/arch/smp/mps.c \
+        src/arch/smp/smp.c \
+        src/arch/atomic.S \
+        src/arch/smp/ipi.c \
+        src/arch/ia32.c \
+        src/arch/interrupt.c \
+        src/arch/pm.c \
+        src/arch/userspace.c \
+        src/arch/cpu/cpu.c \
+        src/arch/mm/frame.c \
+        src/arch/mm/memory_init.c \
+        src/arch/mm/page.c \
+        src/arch/mm/tlb.c \
+        src/arch/drivers/i8042.c \
+        src/arch/drivers/i8254.c \
+        src/arch/drivers/i8259.c \
+        src/arch/drivers/ega.c \
+        src/arch/boot/boot.S \
+        src/arch/boot/memmap.S\
+        src/arch/fpu_context.c\
+        src/arch/fmath.c

arch/ia32/boot/Makefile

@@ -4 +4 @@
 
 build: boot.bin
-        dd if=boot.bin of=../../../src/image.bin bs=512 conv=sync
-        -cat ../../../src/kernel.bin >>../../../src/image.bin
-        dd if=/dev/zero of=../../../src/image.bin bs=1 seek=1474559 count=1
+        dd if=boot.bin of=../../../image.bin bs=512 conv=sync
+        -cat ../../../kernel.bin >>../../../image.bin
+        dd if=/dev/zero of=../../../image.bin bs=1 seek=1474559 count=1
 
 boot.bin: boot.o

arch/ia64/Makefile.inc

@@ -22 +22 @@
 
 arch_sources= \
-        arch/start.S \
-        arch/asm.S \
-        arch/dummy.s \
-        arch/putchar.c \
-        arch/ia64.c \
-        arch/fpu_context.c \
-        arch/context.S \
-        arch/ski/ski.c \
-        arch/cpu/cpu.c \
-        arch/ivt.S \
-        arch/interrupt_handler.c \
-        arch/fmath.c \
-        arch/mm/frame.c
+        src/arch/start.S \
+        src/arch/asm.S \
+        src/arch/dummy.s \
+        src/arch/putchar.c \
+        src/arch/ia64.c \
+        src/arch/fpu_context.c \
+        src/arch/context.S \
+        src/arch/ski/ski.c \
+        src/arch/cpu/cpu.c \
+        src/arch/ivt.S \
+        src/arch/interrupt_handler.c \
+        src/arch/fmath.c \
+        src/arch/mm/frame.c

arch/ia64/boot/Makefile

@@ -7 +7 @@
 
 build: boot.bin
-        cp boot.bin ../../../src/load.bin
+        cp boot.bin ../../../load.bin
 
 AS=$(IA-64_BINUTILS_DIR)/$(IA-64_TARGET)-as

arch/mips32/Makefile.inc

@@ -72 +72 @@
 endif
 
-../arch/$(ARCH)/_link.ld: ../arch/$(ARCH)/_link.ld.in
+arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
         $(CC) $(CFLAGS) -C -DBFD=${BFD} -E -x c $< | grep -v "^\#" > $@
 
 arch_sources= \
-        arch/start.S \
-        arch/context.S \
-        arch/panic.S \
-        arch/mips32.c \
-        arch/dummy.S \
-        arch/console.c \
-        arch/asm.S \
-        arch/exception.c \
-        arch/interrupt.c \
-        arch/cache.c \
-        arch/cpu/cpu.c \
-        arch/mm/frame.c \
-        arch/mm/page.c \
-        arch/mm/tlb.c \
-        arch/fpu_context.c \
-        arch/fmath.c \
-        arch/drivers/arc.c
+        src/arch/start.S \
+        src/arch/context.S \
+        src/arch/panic.S \
+        src/arch/mips32.c \
+        src/arch/dummy.S \
+        src/arch/console.c \
+        src/arch/asm.S \
+        src/arch/exception.c \
+        src/arch/interrupt.c \
+        src/arch/cache.c \
+        src/arch/cpu/cpu.c \
+        src/arch/mm/frame.c \
+        src/arch/mm/page.c \
+        src/arch/mm/tlb.c \
+        src/arch/fpu_context.c \
+        src/arch/fmath.c \
+        src/arch/drivers/arc.c

arch/mips32/boot/Makefile

@@ -7 +7 @@
 
 build: boot.bin
-        cp boot.bin ../../../src/load.bin
+        cp boot.bin ../../../load.bin
 
 AS=$(MIPS_BINUTILS_DIR)/$(MIPS_TARGET)-as

arch/ppc32/Makefile.inc

@@ -19 +19 @@
 
 arch_sources= \
-        arch/context.S \
-        arch/debug/panic.s \
-        arch/fpu_context.c \
-        arch/ppc32.c \
-        arch/dummy.s \
-        arch/start.S \
-        arch/asm.S \
-        arch/cpu/cpu.c \
-        arch/mm/frame.c \
-        arch/mm/memory_init.c \
-        arch/mm/page.c \
-        arch/drivers/ofw.c \
-        arch/fmath.c
+        src/arch/context.S \
+        src/arch/debug/panic.s \
+        src/arch/fpu_context.c \
+        src/arch/ppc32.c \
+        src/arch/dummy.s \
+        src/arch/start.S \
+        src/arch/asm.S \
+        src/arch/cpu/cpu.c \
+        src/arch/mm/frame.c \
+        src/arch/mm/memory_init.c \
+        src/arch/mm/page.c \
+        src/arch/drivers/ofw.c \
+        src/arch/fmath.c

arch/ppc32/boot/Makefile

@@ -7 +7 @@
 
 build: boot.bin
-        cp boot.bin ../../../src/load.bin
+        cp boot.bin ../../../load.bin
 
 CC=$(PPC_BINUTILS_DIR)/$(PPC_TARGET)-gcc

build.amd64

@@ -3 +3 @@
 set -e
 # Generate context_offset.h
-(cd ../tools/amd64/;make gencontext;./gencontext)
+(cd tools/amd64/;make gencontext;./gencontext)
 # Create links to ia32 architecture
 
 (
 set -e
-cd ../arch
+cd arch
 for a in drivers bios fmath.c mm/frame.c mm/tlb.c mm/memory_init.c boot/memmap.S smp/apic.c smp/ipi.c smp/mps.c smp/smp.c acpi; do
   if [ \! -e amd64/src/$a ]; then

build.mips32

@@ -9 +9 @@
 
 # Generate context_offset.h
-(cd ../tools/mips32/;make gencontext;./gencontext)
-rm ../arch/mips32/_link.ld
+(cd tools/mips32/;make gencontext;./gencontext)
 
 make all ARCH=mips32 MACHINE=$MACHINE

clean.ia32

@@ -3 +3 @@
 make dist-clean ARCH=ia32
 
-rm ../arch/ia32/_link.ld
+rm arch/ia32/_link.ld

contrib/conf/SPMIPS.simics

@@ -4 +4 @@
 read-configuration spmips.conf
 
-set-pc (cpu0.load-binary ../../../SPARTAN/src/kernel.bin)
+set-pc (cpu0.load-binary ../../../SPARTAN/kernel.bin)
 
 # Setup uart to use 8 bits

contrib/conf/dot.bochsrc

@@ -131 +131 @@
 # supported on Windows 95 and 98.
 #=======================================================================
-floppya: 1_44=SPARTAN/src/image.bin, status=inserted
+floppya: 1_44=SPARTAN/image.bin, status=inserted
 #floppya: 1_44=/dev/fd0, status=inserted
 

contrib/conf/ski.conf

@@ -1 @@
-load SPARTAN/src/kernel.bin
-load SPARTAN/src/load.bin
+load SPARTAN/kernel.bin
+load SPARTAN/load.bin