Rename tools/ directory to scripts/ directory.
It's common for other projects (eg, QEMU, Linux) to put build scripts into a "scripts/" directory. There's no reason for SeaBIOS to be different, so rename the "tools/" directory to "scripts/". Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
parent
915f64aee3
commit
b942ce0a03
38
Makefile
38
Makefile
|
@ -87,7 +87,7 @@ vpath %.S src vgasrc
|
||||||
################ Common build rules
|
################ Common build rules
|
||||||
|
|
||||||
# Verify the build environment works.
|
# Verify the build environment works.
|
||||||
TESTGCC:=$(shell OUT="$(OUT)" CC="$(CC)" LD="$(LD)" IASL="$(IASL)" tools/test-build.sh)
|
TESTGCC:=$(shell OUT="$(OUT)" CC="$(CC)" LD="$(LD)" IASL="$(IASL)" scripts/test-build.sh)
|
||||||
ifeq "$(TESTGCC)" "-1"
|
ifeq "$(TESTGCC)" "-1"
|
||||||
$(error "Please upgrade the build environment")
|
$(error "Please upgrade the build environment")
|
||||||
endif
|
endif
|
||||||
|
@ -127,7 +127,7 @@ $(OUT)asm-offsets.s: $(OUT)autoconf.h
|
||||||
|
|
||||||
$(OUT)asm-offsets.h: $(OUT)asm-offsets.s
|
$(OUT)asm-offsets.h: $(OUT)asm-offsets.s
|
||||||
@echo " Generating offset file $@"
|
@echo " Generating offset file $@"
|
||||||
$(Q)./tools/gen-offsets.sh $< $@
|
$(Q)./scripts/gen-offsets.sh $< $@
|
||||||
|
|
||||||
$(OUT)ccode16.o: $(OUT)autoconf.h $(patsubst %.c, $(OUT)%.o,$(SRC16)) ; $(call whole-compile, $(CFLAGS16), $(addprefix src/, $(SRC16)),$@)
|
$(OUT)ccode16.o: $(OUT)autoconf.h $(patsubst %.c, $(OUT)%.o,$(SRC16)) ; $(call whole-compile, $(CFLAGS16), $(addprefix src/, $(SRC16)),$@)
|
||||||
|
|
||||||
|
@ -139,18 +139,18 @@ $(OUT)romlayout.o: romlayout.S $(OUT)asm-offsets.h
|
||||||
@echo " Compiling (16bit) $@"
|
@echo " Compiling (16bit) $@"
|
||||||
$(Q)$(CC) $(CFLAGS16) -c -D__ASSEMBLY__ $< -o $@
|
$(Q)$(CC) $(CFLAGS16) -c -D__ASSEMBLY__ $< -o $@
|
||||||
|
|
||||||
$(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)ccode16.o $(OUT)romlayout.o tools/layoutrom.py tools/buildversion.sh
|
$(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)ccode16.o $(OUT)romlayout.o scripts/layoutrom.py scripts/buildversion.sh
|
||||||
@echo " Building ld scripts"
|
@echo " Building ld scripts"
|
||||||
$(Q)./tools/buildversion.sh $(OUT)version.c
|
$(Q)./scripts/buildversion.sh $(OUT)version.c
|
||||||
$(Q)$(CC) $(CFLAGS32FLAT) -c $(OUT)version.c -o $(OUT)version.o
|
$(Q)$(CC) $(CFLAGS32FLAT) -c $(OUT)version.c -o $(OUT)version.o
|
||||||
$(Q)$(LD) -melf_i386 -r $(OUT)ccode32flat.o $(OUT)version.o -o $(OUT)code32flat.o
|
$(Q)$(LD) -melf_i386 -r $(OUT)ccode32flat.o $(OUT)version.o -o $(OUT)code32flat.o
|
||||||
$(Q)$(LD) -melf_i386 -r $(OUT)ccode16.o $(OUT)romlayout.o -o $(OUT)code16.o
|
$(Q)$(LD) -melf_i386 -r $(OUT)ccode16.o $(OUT)romlayout.o -o $(OUT)code16.o
|
||||||
$(Q)$(OBJDUMP) -thr $(OUT)code32flat.o > $(OUT)code32flat.o.objdump
|
$(Q)$(OBJDUMP) -thr $(OUT)code32flat.o > $(OUT)code32flat.o.objdump
|
||||||
$(Q)$(OBJDUMP) -thr $(OUT)code32seg.o > $(OUT)code32seg.o.objdump
|
$(Q)$(OBJDUMP) -thr $(OUT)code32seg.o > $(OUT)code32seg.o.objdump
|
||||||
$(Q)$(OBJDUMP) -thr $(OUT)code16.o > $(OUT)code16.o.objdump
|
$(Q)$(OBJDUMP) -thr $(OUT)code16.o > $(OUT)code16.o.objdump
|
||||||
$(Q)$(PYTHON) ./tools/layoutrom.py $(OUT)code16.o.objdump $(OUT)code32seg.o.objdump $(OUT)code32flat.o.objdump $(OUT)$(KCONFIG_AUTOHEADER) $(OUT)romlayout16.lds $(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds
|
$(Q)$(PYTHON) ./scripts/layoutrom.py $(OUT)code16.o.objdump $(OUT)code32seg.o.objdump $(OUT)code32flat.o.objdump $(OUT)$(KCONFIG_AUTOHEADER) $(OUT)romlayout16.lds $(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds
|
||||||
|
|
||||||
# These are actually built by tools/layoutrom.py above, but by pulling them
|
# These are actually built by scripts/layoutrom.py above, but by pulling them
|
||||||
# into an extra rule we prevent make -j from spawning layoutrom.py 4 times.
|
# into an extra rule we prevent make -j from spawning layoutrom.py 4 times.
|
||||||
$(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds $(OUT)code32flat.o $(OUT)code16.o: $(OUT)romlayout16.lds
|
$(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds $(OUT)code32flat.o $(OUT)code16.o: $(OUT)romlayout16.lds
|
||||||
|
|
||||||
|
@ -166,11 +166,11 @@ $(OUT)rom.o: $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o $(OUT
|
||||||
@echo " Linking $@"
|
@echo " Linking $@"
|
||||||
$(Q)$(LD) -T $(OUT)romlayout32flat.lds $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o -o $@
|
$(Q)$(LD) -T $(OUT)romlayout32flat.lds $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o -o $@
|
||||||
|
|
||||||
$(OUT)bios.bin.elf $(OUT)bios.bin: $(OUT)rom.o tools/checkrom.py
|
$(OUT)bios.bin.elf $(OUT)bios.bin: $(OUT)rom.o scripts/checkrom.py
|
||||||
@echo " Prepping $@"
|
@echo " Prepping $@"
|
||||||
$(Q)$(OBJDUMP) -thr $< > $<.objdump
|
$(Q)$(OBJDUMP) -thr $< > $<.objdump
|
||||||
$(Q)$(OBJCOPY) -O binary $< $(OUT)bios.bin.raw
|
$(Q)$(OBJCOPY) -O binary $< $(OUT)bios.bin.raw
|
||||||
$(Q)$(PYTHON) ./tools/checkrom.py $<.objdump $(OUT)bios.bin.raw $(OUT)bios.bin
|
$(Q)$(PYTHON) ./scripts/checkrom.py $<.objdump $(OUT)bios.bin.raw $(OUT)bios.bin
|
||||||
$(Q)$(STRIP) -R .comment $< -o $(OUT)bios.bin.elf
|
$(Q)$(STRIP) -R .comment $< -o $(OUT)bios.bin.elf
|
||||||
|
|
||||||
|
|
||||||
|
@ -186,18 +186,18 @@ CFLAGS16VGA = $(CFLAGS16INC) -Isrc
|
||||||
|
|
||||||
$(OUT)vgaccode16.raw.s: $(OUT)autoconf.h ; $(call whole-compile, $(CFLAGS16VGA) -S, $(SRCVGA),$@)
|
$(OUT)vgaccode16.raw.s: $(OUT)autoconf.h ; $(call whole-compile, $(CFLAGS16VGA) -S, $(SRCVGA),$@)
|
||||||
|
|
||||||
$(OUT)vgaccode16.o: $(OUT)vgaccode16.raw.s tools/vgafixup.py
|
$(OUT)vgaccode16.o: $(OUT)vgaccode16.raw.s scripts/vgafixup.py
|
||||||
@echo " Fixup VGA rom assembler"
|
@echo " Fixup VGA rom assembler"
|
||||||
$(Q)$(PYTHON) ./tools/vgafixup.py $< $(OUT)vgaccode16.s
|
$(Q)$(PYTHON) ./scripts/vgafixup.py $< $(OUT)vgaccode16.s
|
||||||
$(Q)$(AS) --32 src/code16gcc.s $(OUT)vgaccode16.s -o $@
|
$(Q)$(AS) --32 src/code16gcc.s $(OUT)vgaccode16.s -o $@
|
||||||
|
|
||||||
$(OUT)vgaentry.o: vgaentry.S $(OUT)autoconf.h
|
$(OUT)vgaentry.o: vgaentry.S $(OUT)autoconf.h
|
||||||
@echo " Compiling (16bit) $@"
|
@echo " Compiling (16bit) $@"
|
||||||
$(Q)$(CC) $(CFLAGS16VGA) -c -D__ASSEMBLY__ $< -o $@
|
$(Q)$(CC) $(CFLAGS16VGA) -c -D__ASSEMBLY__ $< -o $@
|
||||||
|
|
||||||
$(OUT)vgarom.o: $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgalayout.lds tools/buildversion.sh
|
$(OUT)vgarom.o: $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgalayout.lds scripts/buildversion.sh
|
||||||
@echo " Linking $@"
|
@echo " Linking $@"
|
||||||
$(Q)./tools/buildversion.sh $(OUT)vgaversion.c VAR16
|
$(Q)./scripts/buildversion.sh $(OUT)vgaversion.c VAR16
|
||||||
$(Q)$(CC) $(CFLAGS16VGA) -c $(OUT)vgaversion.c -o $(OUT)vgaversion.o
|
$(Q)$(CC) $(CFLAGS16VGA) -c $(OUT)vgaversion.c -o $(OUT)vgaversion.o
|
||||||
$(Q)$(LD) --gc-sections -T $(OUT)vgalayout.lds $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgaversion.o -o $@
|
$(Q)$(LD) --gc-sections -T $(OUT)vgalayout.lds $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgaversion.o -o $@
|
||||||
|
|
||||||
|
@ -205,9 +205,9 @@ $(OUT)vgabios.bin.raw: $(OUT)vgarom.o
|
||||||
@echo " Extracting binary $@"
|
@echo " Extracting binary $@"
|
||||||
$(Q)$(OBJCOPY) -O binary $< $@
|
$(Q)$(OBJCOPY) -O binary $< $@
|
||||||
|
|
||||||
$(OUT)vgabios.bin: $(OUT)vgabios.bin.raw tools/buildrom.py
|
$(OUT)vgabios.bin: $(OUT)vgabios.bin.raw scripts/buildrom.py
|
||||||
@echo " Finalizing rom $@"
|
@echo " Finalizing rom $@"
|
||||||
$(Q)$(PYTHON) ./tools/buildrom.py $< $@
|
$(Q)$(PYTHON) ./scripts/buildrom.py $< $@
|
||||||
|
|
||||||
|
|
||||||
################ DSDT build rules
|
################ DSDT build rules
|
||||||
|
@ -215,12 +215,12 @@ $(OUT)vgabios.bin: $(OUT)vgabios.bin.raw tools/buildrom.py
|
||||||
iasl-option=$(shell if test -z "`$(1) $(2) 2>&1 > /dev/null`" \
|
iasl-option=$(shell if test -z "`$(1) $(2) 2>&1 > /dev/null`" \
|
||||||
; then echo "$(2)"; else echo "$(3)"; fi ;)
|
; then echo "$(2)"; else echo "$(3)"; fi ;)
|
||||||
|
|
||||||
$(OUT)%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.py
|
$(OUT)%.hex: src/%.dsl ./scripts/acpi_extract_preprocess.py ./scripts/acpi_extract.py
|
||||||
@echo " Compiling IASL $@"
|
@echo " Compiling IASL $@"
|
||||||
$(Q)$(CPP) $(CPPFLAGS) $< -o $(OUT)$*.dsl.i.orig
|
$(Q)$(CPP) $(CPPFLAGS) $< -o $(OUT)$*.dsl.i.orig
|
||||||
$(Q)$(PYTHON) ./tools/acpi_extract_preprocess.py $(OUT)$*.dsl.i.orig > $(OUT)$*.dsl.i
|
$(Q)$(PYTHON) ./scripts/acpi_extract_preprocess.py $(OUT)$*.dsl.i.orig > $(OUT)$*.dsl.i
|
||||||
$(Q)$(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l -tc -p $(OUT)$* $(OUT)$*.dsl.i
|
$(Q)$(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l -tc -p $(OUT)$* $(OUT)$*.dsl.i
|
||||||
$(Q)$(PYTHON) ./tools/acpi_extract.py $(OUT)$*.lst > $(OUT)$*.off
|
$(Q)$(PYTHON) ./scripts/acpi_extract.py $(OUT)$*.lst > $(OUT)$*.off
|
||||||
$(Q)cat $(OUT)$*.off > $@
|
$(Q)cat $(OUT)$*.off > $@
|
||||||
|
|
||||||
$(OUT)acpi.o: $(OUT)acpi-dsdt.hex $(OUT)ssdt-proc.hex $(OUT)ssdt-pcihp.hex $(OUT)ssdt-misc.hex $(OUT)q35-acpi-dsdt.hex
|
$(OUT)acpi.o: $(OUT)acpi-dsdt.hex $(OUT)ssdt-proc.hex $(OUT)ssdt-pcihp.hex $(OUT)ssdt-misc.hex $(OUT)q35-acpi-dsdt.hex
|
||||||
|
@ -228,9 +228,9 @@ $(OUT)acpi.o: $(OUT)acpi-dsdt.hex $(OUT)ssdt-proc.hex $(OUT)ssdt-pcihp.hex $(OUT
|
||||||
################ Kconfig rules
|
################ Kconfig rules
|
||||||
|
|
||||||
define do-kconfig
|
define do-kconfig
|
||||||
$(Q)mkdir -p $(OUT)/tools/kconfig/lxdialog
|
$(Q)mkdir -p $(OUT)/scripts/kconfig/lxdialog
|
||||||
$(Q)mkdir -p $(OUT)/include/config
|
$(Q)mkdir -p $(OUT)/include/config
|
||||||
$(Q)$(MAKE) -C $(OUT) -f $(CURDIR)/tools/kconfig/Makefile srctree=$(CURDIR) src=tools/kconfig obj=tools/kconfig Q=$(Q) Kconfig=$(CURDIR)/src/Kconfig $1
|
$(Q)$(MAKE) -C $(OUT) -f $(CURDIR)/scripts/kconfig/Makefile srctree=$(CURDIR) src=scripts/kconfig obj=scripts/kconfig Q=$(Q) Kconfig=$(CURDIR)/src/Kconfig $1
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(OUT)autoconf.h : $(KCONFIG_CONFIG) ; $(call do-kconfig, silentoldconfig)
|
$(OUT)autoconf.h : $(KCONFIG_CONFIG) ; $(call do-kconfig, silentoldconfig)
|
||||||
|
|
|
@ -81,7 +81,7 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
|
||||||
$(Q)xgettext --default-domain=linux \
|
$(Q)xgettext --default-domain=linux \
|
||||||
--add-comments --keyword=_ --keyword=N_ \
|
--add-comments --keyword=_ --keyword=N_ \
|
||||||
--from-code=UTF-8 \
|
--from-code=UTF-8 \
|
||||||
--files-from=tools/kconfig/POTFILES.in \
|
--files-from=scripts/kconfig/POTFILES.in \
|
||||||
--output $(obj)/config.pot
|
--output $(obj)/config.pot
|
||||||
$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
|
$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
|
||||||
$(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
|
$(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
|
|
@ -0,0 +1,12 @@
|
||||||
|
scripts/kconfig/lxdialog/checklist.c
|
||||||
|
scripts/kconfig/lxdialog/inputbox.c
|
||||||
|
scripts/kconfig/lxdialog/menubox.c
|
||||||
|
scripts/kconfig/lxdialog/textbox.c
|
||||||
|
scripts/kconfig/lxdialog/util.c
|
||||||
|
scripts/kconfig/lxdialog/yesno.c
|
||||||
|
scripts/kconfig/mconf.c
|
||||||
|
scripts/kconfig/conf.c
|
||||||
|
scripts/kconfig/confdata.c
|
||||||
|
scripts/kconfig/gconf.c
|
||||||
|
scripts/kconfig/gconf.glade.h
|
||||||
|
scripts/kconfig/qconf.cc
|
|
@ -1521,7 +1521,7 @@ int main(int ac, char *av[])
|
||||||
/* Determine GUI path */
|
/* Determine GUI path */
|
||||||
env = getenv(SRCTREE);
|
env = getenv(SRCTREE);
|
||||||
if (env)
|
if (env)
|
||||||
glade_file = g_strconcat(env, "/tools/kconfig/gconf.glade", NULL);
|
glade_file = g_strconcat(env, "/scripts/kconfig/gconf.glade", NULL);
|
||||||
else if (av[0][0] == '/')
|
else if (av[0][0] == '/')
|
||||||
glade_file = g_strconcat(av[0], ".glade", NULL);
|
glade_file = g_strconcat(av[0], ".glade", NULL);
|
||||||
else
|
else
|
|
@ -15,7 +15,7 @@ void kconfig_load(void)
|
||||||
|
|
||||||
handle = dlopen("./libkconfig.so", RTLD_LAZY);
|
handle = dlopen("./libkconfig.so", RTLD_LAZY);
|
||||||
if (!handle) {
|
if (!handle) {
|
||||||
handle = dlopen("./tools/kconfig/libkconfig.so", RTLD_LAZY);
|
handle = dlopen("./scripts/kconfig/libkconfig.so", RTLD_LAZY);
|
||||||
if (!handle) {
|
if (!handle) {
|
||||||
fprintf(stderr, "%s\n", dlerror());
|
fprintf(stderr, "%s\n", dlerror());
|
||||||
exit(1);
|
exit(1);
|
|
@ -1,12 +0,0 @@
|
||||||
tools/kconfig/lxdialog/checklist.c
|
|
||||||
tools/kconfig/lxdialog/inputbox.c
|
|
||||||
tools/kconfig/lxdialog/menubox.c
|
|
||||||
tools/kconfig/lxdialog/textbox.c
|
|
||||||
tools/kconfig/lxdialog/util.c
|
|
||||||
tools/kconfig/lxdialog/yesno.c
|
|
||||||
tools/kconfig/mconf.c
|
|
||||||
tools/kconfig/conf.c
|
|
||||||
tools/kconfig/confdata.c
|
|
||||||
tools/kconfig/gconf.c
|
|
||||||
tools/kconfig/gconf.glade.h
|
|
||||||
tools/kconfig/qconf.cc
|
|
Loading…
Reference in New Issue