Compare commits

..

No commits in common. "d70738eea6e5949ccc459030617f6b45692ddfc2" and "b1c3dfc5d6019dafac50f8de6ad2b0d8d5bbb059" have entirely different histories.

32 changed files with 96 additions and 74 deletions

View file

@ -1,7 +1,7 @@
CFILES = $(wildcard *.c) CFILES = $(wildcard *.c)
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -mstrict-align GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles
GCCPATH = ../../arm-gnu-toolchain-13.2.Rel1-darwin-arm64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

View file

@ -19,8 +19,8 @@ enum {
enum { enum {
Pull_None = 0, Pull_None = 0,
Pull_Down = 2, Pull_Down = 1, // Are down and up the right way around?
Pull_Up = 1 Pull_Up = 2
}; };
void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; } void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; }

View file

@ -1,7 +1,7 @@
extern unsigned long spin_cpu0; extern unsigned int spin_cpu0;
extern unsigned long spin_cpu1; extern unsigned int spin_cpu1;
extern unsigned long spin_cpu2; extern unsigned int spin_cpu2;
extern unsigned long spin_cpu3; extern unsigned int spin_cpu3;
void start_core1(void (*func)(void)); void start_core1(void (*func)(void));
void start_core2(void (*func)(void)); void start_core2(void (*func)(void));

View file

@ -1,7 +1,7 @@
CFILES = $(wildcard *.c lib/*.c) CFILES = $(wildcard *.c lib/*.c)
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -mstrict-align GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles
GCCPATH = ../../arm-gnu-toolchain-13.2.Rel1-darwin-arm64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

View file

@ -1,7 +1,7 @@
extern unsigned long spin_cpu0; extern unsigned int spin_cpu0;
extern unsigned long spin_cpu1; extern unsigned int spin_cpu1;
extern unsigned long spin_cpu2; extern unsigned int spin_cpu2;
extern unsigned long spin_cpu3; extern unsigned int spin_cpu3;
void start_core1(void (*func)(void)); void start_core1(void (*func)(void));
void start_core2(void (*func)(void)); void start_core2(void (*func)(void));

View file

@ -19,8 +19,8 @@ enum {
enum { enum {
Pull_None = 0, Pull_None = 0,
Pull_Down = 2, Pull_Down = 1, // Are down and up the right way around?
Pull_Up = 1 Pull_Up = 2
}; };
void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; } void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; }

View file

@ -1,7 +1,7 @@
extern unsigned long spin_cpu0; extern unsigned int spin_cpu0;
extern unsigned long spin_cpu1; extern unsigned int spin_cpu1;
extern unsigned long spin_cpu2; extern unsigned int spin_cpu2;
extern unsigned long spin_cpu3; extern unsigned int spin_cpu3;
void start_core1(void (*func)(void)); void start_core1(void (*func)(void));
void start_core2(void (*func)(void)); void start_core2(void (*func)(void));

View file

@ -19,8 +19,8 @@ enum {
enum { enum {
Pull_None = 0, Pull_None = 0,
Pull_Down = 2, Pull_Down = 1, // Are down and up the right way around?
Pull_Up = 1 Pull_Up = 2
}; };
void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; } void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; }

View file

@ -1,8 +1,8 @@
CFILES = $(wildcard *.c lib/*.c kernel/*.c) CFILES = $(wildcard *.c lib/*.c kernel/*.c)
SFILES = $(wildcard boot/*.S lib/*.S kernel/*.S) SFILES = $(wildcard boot/*.S lib/*.S kernel/*.S)
OFILES = $(CFILES:.c=.o) $(SFILES:.S=.o) OFILES = $(CFILES:.c=.o) $(SFILES:.S=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -mstrict-align GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles
GCCPATH = ../../arm-gnu-toolchain-13.2.Rel1-darwin-arm64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

View file

@ -1,7 +1,7 @@
extern unsigned long spin_cpu0; extern unsigned int spin_cpu0;
extern unsigned long spin_cpu1; extern unsigned int spin_cpu1;
extern unsigned long spin_cpu2; extern unsigned int spin_cpu2;
extern unsigned long spin_cpu3; extern unsigned int spin_cpu3;
void start_core1(void (*func)(void)); void start_core1(void (*func)(void));
void start_core2(void (*func)(void)); void start_core2(void (*func)(void));

View file

@ -19,8 +19,8 @@ enum {
enum { enum {
Pull_None = 0, Pull_None = 0,
Pull_Down = 2, Pull_Down = 1, // Are down and up the right way around?
Pull_Up = 1 Pull_Up = 2
}; };
void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; } void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; }

View file

@ -1,8 +1,8 @@
CFILES = $(wildcard *.c lib/*.c kernel/*.c net/*.c) CFILES = $(wildcard *.c lib/*.c kernel/*.c net/*.c)
SFILES = $(wildcard boot/*.S lib/*.S kernel/*.S) SFILES = $(wildcard boot/*.S lib/*.S kernel/*.S)
OFILES = $(CFILES:.c=.o) $(SFILES:.S=.o) OFILES = $(CFILES:.c=.o) $(SFILES:.S=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostartfiles -mstrict-align GCCFLAGS = -Wall -O0 -ffreestanding -nostdlib -nostartfiles
GCCPATH = ../../arm-gnu-toolchain-13.2.Rel1-darwin-arm64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

View file

@ -1,7 +1,7 @@
extern unsigned long spin_cpu0; extern unsigned int spin_cpu0;
extern unsigned long spin_cpu1; extern unsigned int spin_cpu1;
extern unsigned long spin_cpu2; extern unsigned int spin_cpu2;
extern unsigned long spin_cpu3; extern unsigned int spin_cpu3;
void start_core1(void (*func)(void)); void start_core1(void (*func)(void));
void start_core2(void (*func)(void)); void start_core2(void (*func)(void));

View file

@ -19,8 +19,8 @@ enum {
enum { enum {
Pull_None = 0, Pull_None = 0,
Pull_Down = 2, Pull_Down = 1, // Are down and up the right way around?
Pull_Up = 1 Pull_Up = 2
}; };
void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; } void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; }

View file

@ -1,8 +1,8 @@
CFILES = $(wildcard *.c lib/*.c kernel/*.c net/*.c tcpip/*.c) CFILES = $(wildcard *.c lib/*.c kernel/*.c net/*.c tcpip/*.c)
SFILES = $(wildcard boot/*.S lib/*.S kernel/*.S) SFILES = $(wildcard boot/*.S lib/*.S kernel/*.S)
OFILES = $(CFILES:.c=.o) $(SFILES:.S=.o) OFILES = $(CFILES:.c=.o) $(SFILES:.S=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostartfiles -mstrict-align GCCFLAGS = -Wall -O0 -ffreestanding -nostdlib -nostartfiles
GCCPATH = ../../arm-gnu-toolchain-13.2.Rel1-darwin-arm64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

View file

@ -1,7 +1,7 @@
extern unsigned long spin_cpu0; extern unsigned int spin_cpu0;
extern unsigned long spin_cpu1; extern unsigned int spin_cpu1;
extern unsigned long spin_cpu2; extern unsigned int spin_cpu2;
extern unsigned long spin_cpu3; extern unsigned int spin_cpu3;
void start_core1(void (*func)(void)); void start_core1(void (*func)(void));
void start_core2(void (*func)(void)); void start_core2(void (*func)(void));

View file

@ -19,8 +19,8 @@ enum {
enum { enum {
Pull_None = 0, Pull_None = 0,
Pull_Down = 2, Pull_Down = 1, // Are down and up the right way around?
Pull_Up = 1 Pull_Up = 2
}; };
void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; } void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; }

View file

@ -1,7 +1,7 @@
CFILES = $(wildcard *.c) CFILES = $(wildcard *.c)
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -mstrict-align GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles
GCCPATH = ../../arm-gnu-toolchain-13.2.Rel1-darwin-arm64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

View file

@ -1,7 +1,7 @@
CFILES = $(wildcard *.c) CFILES = $(wildcard *.c)
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -mstrict-align GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles
GCCPATH = ../../arm-gnu-toolchain-13.2.Rel1-darwin-arm64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

View file

@ -1,7 +1,7 @@
CFILES = $(wildcard *.c) CFILES = $(wildcard *.c)
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -mstrict-align GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles
GCCPATH = ../../arm-gnu-toolchain-13.2.Rel1-darwin-arm64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

View file

@ -17,8 +17,8 @@ enum {
enum { enum {
Pull_None = 0, Pull_None = 0,
Pull_Down = 2, Pull_Down = 1, // Are down and up the right way around?
Pull_Up = 1 Pull_Up = 2
}; };
void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; } void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; }

View file

@ -1,7 +1,7 @@
CFILES = $(wildcard *.c) CFILES = $(wildcard *.c)
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -mstrict-align GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles
GCCPATH = ../../arm-gnu-toolchain-13.2.Rel1-darwin-arm64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

View file

@ -18,8 +18,8 @@ enum {
enum { enum {
Pull_None = 0, Pull_None = 0,
Pull_Down = 2, Pull_Down = 1, // Are down and up the right way around?
Pull_Up = 1 Pull_Up = 2
}; };
void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; } void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; }

View file

@ -1,7 +1,7 @@
CFILES = $(wildcard *.c) CFILES = $(wildcard *.c)
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -mstrict-align GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles
GCCPATH = ../../arm-gnu-toolchain-13.2.Rel1-darwin-arm64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

View file

@ -18,8 +18,8 @@ enum {
enum { enum {
Pull_None = 0, Pull_None = 0,
Pull_Down = 2, Pull_Down = 1, // Are down and up the right way around?
Pull_Up = 1 Pull_Up = 2
}; };
void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; } void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; }

View file

@ -1,7 +1,7 @@
CFILES = $(wildcard *.c) CFILES = $(wildcard *.c)
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -mstrict-align GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles
GCCPATH = ../../arm-gnu-toolchain-13.2.Rel1-darwin-arm64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

View file

@ -18,8 +18,8 @@ enum {
enum { enum {
Pull_None = 0, Pull_None = 0,
Pull_Down = 2, Pull_Down = 1, // Are down and up the right way around?
Pull_Up = 1 Pull_Up = 2
}; };
void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; } void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; }

View file

@ -1,7 +1,7 @@
CFILES = $(wildcard *.c) CFILES = $(wildcard *.c)
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -mstrict-align GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles
GCCPATH = ../../arm-gnu-toolchain-13.2.Rel1-darwin-arm64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

View file

@ -0,0 +1,22 @@
CFILES = $(wildcard *.c)
OFILES = $(CFILES:.c=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles
GCCPATH = ..\..\gcc-arm-10.2-2020.11-mingw-w64-i686-aarch64-none-elf\bin
all: clean kernel8.img
boot.o: boot.S
$(GCCPATH)\aarch64-none-elf-gcc $(GCCFLAGS) -c boot.S -o boot.o
BCM4345C0.o : BCM4345C0.hcd
$(GCCPATH)\aarch64-none-elf-objcopy -I binary -O elf64-littleaarch64 -B aarch64 $< $@
%.o: %.c
$(GCCPATH)\aarch64-none-elf-gcc $(GCCFLAGS) -c $< -o $@
kernel8.img: boot.o $(OFILES) BCM4345C0.o
$(GCCPATH)\aarch64-none-elf-ld -nostdlib boot.o $(OFILES) BCM4345C0.o -T link.ld -o kernel8.elf
$(GCCPATH)\aarch64-none-elf-objcopy -O binary kernel8.elf kernel8.img
clean:
del kernel8.elf *.o *.img

View file

@ -18,8 +18,8 @@ enum {
enum { enum {
Pull_None = 0, Pull_None = 0,
Pull_Down = 2, Pull_Down = 1, // Are down and up the right way around?
Pull_Up = 1 Pull_Up = 2
}; };
void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; } void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; }

View file

@ -1,7 +1,7 @@
CFILES = $(wildcard *.c) CFILES = $(wildcard *.c)
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles -mstrict-align GCCFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles
GCCPATH = ../../arm-gnu-toolchain-13.2.Rel1-darwin-arm64-aarch64-none-elf/bin GCCPATH = ../../gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin
all: clean kernel8.img all: clean kernel8.img

View file

@ -19,8 +19,8 @@ enum {
enum { enum {
Pull_None = 0, Pull_None = 0,
Pull_Down = 2, Pull_Down = 1, // Are down and up the right way around?
Pull_Up = 1 Pull_Up = 2
}; };
void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; } void mmio_write(long reg, unsigned int val) { *(volatile unsigned int *)reg = val; }