Hojun-Cho/bootloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change btld_conf.h

Browse Source 
remove inclde u.h
This commit is contained in:
Hojun-Cho 2024-12-05 15:31:56 +09:00
parent dce27c5d22
commit 7466f0ff8c
6 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot/Makefile
View File

@ -10,7 +10,7 @@ OBJS += $(ESRCS:.c=.o)
include $(SDIR)/Makefile.inc include $(SDIR)/Makefile.inc
CFLAGS += -no-pie CFLAGS += -no-pie -g
CPPFLAGS += -DLOADADDR=$(LOADADDR) -DLINKADDR=$(LINKADDR) -DBOOTMAGIC=$(BOOTMAGIC) -DBOOTSTACKOFF=$(BOOTSTACKOFF) CPPFLAGS += -DLOADADDR=$(LOADADDR) -DLINKADDR=$(LINKADDR) -DBOOTMAGIC=$(BOOTMAGIC) -DBOOTSTACKOFF=$(BOOTSTACKOFF)
CPPFLAGS += -I $(SDIR) CPPFLAGS += -I $(SDIR)
LDFLAGS += -s -Ttext=$(LINKADDR) -T ld.script --no-omagic -M LDFLAGS += -s -Ttext=$(LINKADDR) -T ld.script --no-omagic -M

10
btld_conf.h
View File

@ -1,3 +1,6 @@
#define elem(x) ((int)(sizeof(x)/sizeof((x)[0])))
#define nil ((void*)0)
#define FAT16_MAX (0x40000) #define FAT16_MAX (0x40000)
#define DOSPTYP_UNUSED 0x00 #define DOSPTYP_UNUSED 0x00
#define DOSPTYP_FAT16 0x06 #define DOSPTYP_FAT16 0x06
@ -9,4 +12,9 @@
#define BOOT_MAGIC 0xf1abde3f #define BOOT_MAGIC 0xf1abde3f
#define DOSMBR_SIGNATURE_OFF 0x1fe #define DOSMBR_SIGNATURE_OFF 0x1fe
#define PARTSZ 16 #define PARTSZ 16
#define u8 unsigned char
#define u16 unsigned short
#define u32 unsigned int
#define u64 unsigned long long

4
installboot/Makefile
View File

@ -6,12 +6,12 @@ SRCS = installboot.c
OBJS = installboot.o OBJS = installboot.o
CFLAGS = -g -Wall -Werror CFLAGS = -g -Wall -Werror
CPPFLAGS = -I $(SDIR) CPPFLAGS = -I $(SDIR)
${PROG}: $(OBJS) ${PROG}: $(OBJS)
$(CC) $(CFLAGS) -o $(BDIR)/$(PROG) $(OBJS) $(CC) $(CFLAGS) -o $(BDIR)/$(PROG) $(OBJS)
$(OBJS): $(SDIR)/u.h $(SDIR)/btld_conf.h $(SDIR)/btld_disk.h elf32.h $(OBJS): $(SDIR)/btld_conf.h $(SDIR)/btld_disk.h elf32.h
clean: clean:
rm -rf $(PROG) $(OBJS) rm -rf $(PROG) $(OBJS)

1
installboot/installboot.c
View File

@ -10,7 +10,6 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include <u.h>
#include "btld_conf.h" #include "btld_conf.h"
#include "btld_disk.h" #include "btld_disk.h"
#include "elf32.h" #include "elf32.h"

2
installmbr/Makefile
View File

@ -11,7 +11,7 @@ CPPFLAGS = -I $(SDIR)
${PROG}: $(OBJS) ${PROG}: $(OBJS)
$(CC) $(CFLAGS) -o $(BDIR)/$(PROG) $(OBJS) $(CC) $(CFLAGS) -o $(BDIR)/$(PROG) $(OBJS)
$(OBJS): $(SDIR)/u.h $(SDIR)/btld_conf.h $(SDIR)/btld_disk.h $(OBJS): $(SDIR)/btld_conf.h $(SDIR)/btld_disk.h
clean: clean:
rm -f $(PROG) $(OBJS) rm -f $(PROG) $(OBJS)

1
installmbr/installmbr.c
View File

@ -10,7 +10,6 @@
#include <endian.h> #include <endian.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <u.h>
#include "btld_conf.h" #include "btld_conf.h"
#include "btld_disk.h" #include "btld_disk.h"