/trunk/boot/tools/config.py |
---|
File deleted |
Property changes: |
Deleted: svn:executable |
-* |
\ No newline at end of property |
/trunk/boot/boot.config |
---|
11,24 → 11,11 |
@ "xen32" Xen 32-bit |
! ARCH (choice) |
# PPC32 Compiler |
# Compiler |
@ "cross" Cross-compiler |
@ "native" Native |
! [ARCH=ppc32] PPC32_COMPILER (choice) |
% [ARCH=ppc32] SAVEAS PPC32_COMPILER COMPILER |
! COMPILER (choice) |
# PPC64 Compiler |
@ "cross" Cross-compiler |
@ "native" Native |
! [ARCH=ppc64] PPC64_COMPILER (choice) |
% [ARCH=ppc64] SAVEAS PPC64_COMPILER COMPILER |
# MIPS32 Compiler |
@ "cross" Cross-compiler |
@ "native" Native |
! [ARCH=mips32] MIPS32_COMPILER (choice) |
% [ARCH=mips32] SAVEAS MIPS32_COMPILER COMPILER |
# Debug bootloader |
! [ARCH=ppc32] CONFIG_DEBUG (n/y) |
38,4 → 25,4 |
# Target image |
@ "binary" Binary image (MSIM) |
@ "ecoff" Ecoff image (GXEmul) |
! [ARCH=mips32] CONFIG_IMAGE (choice) |
! [ARCH=mips32] IMAGE (choice) |
/trunk/boot/Makefile |
---|
29,9 → 29,10 |
## Include configuration |
# |
-include ../version |
-include Makefile.config |
## Common flags |
## Paths |
# |
BASE = .. |
38,17 → 39,6 |
KERNELDIR = $(BASE)/kernel |
USPACEDIR = $(BASE)/uspace |
## Setup arch configuration |
# |
-include arch/$(ARCH)/Makefile.inc |
ifeq ($(ARCH),xen32) |
UARCH = ia32 |
else |
UARCH = $(ARCH) |
endif |
ifeq ($(CONFIG_DEBUG),y) |
DEFS += -DCONFIG_DEBUG |
endif |
57,35 → 47,19 |
DEFS += -DCONFIG_BAT |
endif |
.PHONY: all build config distclean arch_distclean clean kernel uspace clean_kernel clean_uspace distclean_kernel distclean_uspace |
.PHONY: all build config distclean clean generic_clean |
all: |
tools/config.py default |
$(MAKE) -C . build $(ARCH) |
../tools/config.py boot.config default $(ARCH) $(COMPILER) $(CONFIG_DEBUG) $(IMAGE) |
$(MAKE) -C . build |
-include arch/$(ARCH)/Makefile.inc |
config: |
tools/config.py |
../tools/config.py boot.config |
distclean: clean arch_distclean |
distclean: clean |
-rm Makefile.config |
kernel: |
$(MAKE) -C $(KERNELDIR) NARCH=$(ARCH) |
uspace: |
$(MAKE) -C $(USPACEDIR) NARCH=$(UARCH) |
clean_kernel: |
$(MAKE) -C $(KERNELDIR) clean ARCH=$(ARCH) |
clean_uspace: |
$(MAKE) -C $(USPACEDIR) clean ARCH=$(UARCH) |
clean_boot_gen: |
generic_clean: |
-rm generic/*.o genarch/*.o |
distclean_kernel: |
$(MAKE) -C $(KERNELDIR) distclean ARCH=$(ARCH) |
distclean_uspace: |
$(MAKE) -C $(USPACEDIR) distclean ARCH=$(UARCH) |
/trunk/boot/arch/xen32/Makefile.inc |
---|
26,27 → 26,30 |
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
# |
build: image.iso |
TASKS = \ |
$(USPACEDIR)/init/init \ |
$(USPACEDIR)/ns/ns \ |
$(USPACEDIR)/pci/pci \ |
$(USPACEDIR)/fb/fb \ |
$(USPACEDIR)/kbd/kbd \ |
$(USPACEDIR)/console/console \ |
$(USPACEDIR)/tetris/tetris \ |
$(USPACEDIR)/ipcc/ipcc \ |
$(USPACEDIR)/klog/klog |
image.iso: kernel uspace |
build: $(BASE)/image.iso |
$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/grub/xen.gz $(KERNELDIR)/kernel.bin $(TASKS) |
mkdir -p arch/$(ARCH)/iso/boot/grub |
cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ |
cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/ |
cp arch/$(ARCH)/grub/xen.gz arch/$(ARCH)/iso/boot/ |
cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/init/init arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/ns/ns arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/pci/pci arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/fb/fb arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/kbd/kbd arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/console/console arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/tetris/tetris arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/ipcc/ipcc arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/klog/klog arch/$(ARCH)/iso/boot/ |
mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o image.iso arch/$(ARCH)/iso/ |
for task in $(TASKS) ; do \ |
cp $$task arch/$(ARCH)/iso/boot/ ; \ |
done |
mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/ |
clean: clean_kernel clean_uspace |
clean: |
-rm -fr arch/$(ARCH)/iso |
-rm -f image.iso |
arch_distclean: distclean_kernel distclean_uspace |
-rm -f $(BASE)/image.iso |
/trunk/boot/arch/sparc64/Makefile.inc |
---|
28,20 → 28,23 |
TMP=distroot |
build: image.iso |
build: $(BASE)/image.iso |
image.iso: kernel |
make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(CONFIG_IMAGE) |
$(BASE)/image.iso: depend arch/$(ARCH)/loader/image.boot |
mkdir -p $(TMP)/boot |
mkdir -p $(TMP)/HelenOS |
cat arch/$(ARCH)/silo/silo.tar.gz | (cd $(TMP)/boot; tar xvfz -) |
cp arch/$(ARCH)/silo/README arch/$(ARCH)/silo/COPYING arch/$(ARCH)/silo/silo.conf $(TMP)/boot |
cp arch/$(ARCH)/loader/image.boot $(TMP)/HelenOS/image.boot |
mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o image.iso $(TMP)/ |
mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $(BASE)/image.iso $(TMP)/ |
clean: clean_boot_gen clean_kernel |
make -C arch/$(ARCH)/loader clean |
depend: |
-rm arch/$(ARCH)/loader/image.boot |
arch/$(ARCH)/loader/image.boot: |
make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) |
clean: generic_clean |
make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) |
-rm -fr $(TMP) |
-rm -f image.iso |
arch_distclean: distclean_kernel |
-rm -f $(BASE)/image.iso |
/trunk/boot/arch/ia64/Makefile.inc |
---|
26,18 → 26,16 |
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
# |
VMAXLMA_SRC=$(KERNELDIR)/contrib/arch/ia64/vmaxlma.c |
VMAXLMA_SRC = tools/ia64/vmaxlma.c |
build: kernel.bin |
build: $(BASE)/kernel.bin |
kernel.bin: kernel uspace vmaxlma |
cp $(KERNELDIR)/kernel.bin . |
./vmaxlma kernel.bin |
$(BASE)/kernel.bin: $(KERNELDIR)/kernel.bin vmaxlma |
cp $(KERNELDIR)/kernel.bin $(BASE)/kernel.bin |
./vmaxlma $(BASE)/kernel.bin |
vmaxlma: $(VMAXLMA_SRC) |
gcc $(VMAXLMA_SRC) -o $@ |
$(CC) $(VMAXLMA_SRC) -o $@ |
clean: clean_kernel clean_uspace |
-rm -f kernel.bin vmaxlma |
arch_distclean: distclean_kernel distclean_uspace |
clean: |
-rm -f $(BASE)/kernel.bin vmaxlma |
/trunk/boot/arch/ppc32/Makefile.inc |
---|
26,14 → 26,17 |
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
# |
build: image.boot |
build: $(BASE)/image.boot |
image.boot: kernel uspace |
$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot |
cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot |
depend: |
-rm arch/$(ARCH)/loader/image.boot |
arch/$(ARCH)/loader/image.boot: |
make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)" |
cp arch/$(ARCH)/loader/image.boot image.boot |
clean: clean_boot_gen clean_kernel clean_uspace |
make -C arch/$(ARCH)/loader clean KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) |
-rm -f image.boot |
arch_distclean: distclean_kernel distclean_uspace |
clean: generic_clean |
make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)" |
-rm -f $(BASE)/image.boot |
/trunk/boot/arch/amd64/Makefile.inc |
---|
26,26 → 26,29 |
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
# |
build: image.iso |
TASKS = \ |
$(USPACEDIR)/init/init \ |
$(USPACEDIR)/ns/ns \ |
$(USPACEDIR)/pci/pci \ |
$(USPACEDIR)/fb/fb \ |
$(USPACEDIR)/kbd/kbd \ |
$(USPACEDIR)/console/console \ |
$(USPACEDIR)/tetris/tetris \ |
$(USPACEDIR)/ipcc/ipcc \ |
$(USPACEDIR)/klog/klog |
image.iso: kernel uspace |
build: $(BASE)/image.iso |
$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(TASKS) |
mkdir -p arch/$(ARCH)/iso/boot/grub |
cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ |
cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/ |
cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/init/init arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/ns/ns arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/pci/pci arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/fb/fb arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/kbd/kbd arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/console/console arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/tetris/tetris arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/ipcc/ipcc arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/klog/klog arch/$(ARCH)/iso/boot/ |
mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o image.iso arch/$(ARCH)/iso/ |
for task in $(TASKS) ; do \ |
cp $$task arch/$(ARCH)/iso/boot/ ; \ |
done |
mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/ |
clean: clean_kernel clean_uspace |
clean: |
-rm -fr arch/$(ARCH)/iso |
-rm -f image.iso |
arch_distclean: distclean_kernel distclean_uspace |
-rm -f $(BASE)/image.iso |
/trunk/boot/arch/ppc64/Makefile.inc |
---|
26,14 → 26,17 |
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
# |
build: image.boot |
build: $(BASE)/image.boot |
image.boot: kernel uspace |
$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot |
cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot |
depend: |
-rm arch/$(ARCH)/loader/image.boot |
arch/$(ARCH)/loader/image.boot: |
make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) |
cp arch/$(ARCH)/loader/image.boot image.boot |
clean: clean_boot_gen clean_kernel clean_uspace |
make -C arch/$(ARCH)/loader clean KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) |
-rm -f image.boot |
arch_distclean: distclean_kernel distclean_uspace |
clean: generic_clean |
make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) |
-rm -f $(BASE)/image.boot |
/trunk/boot/arch/mips32/Makefile.inc |
---|
26,14 → 26,17 |
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
# |
build: image.boot |
build: $(BASE)/image.boot |
image.boot: kernel uspace |
make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(CONFIG_IMAGE) |
cp arch/$(ARCH)/loader/image.boot image.boot |
$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot |
cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot |
clean: clean_boot_gen clean_kernel clean_uspace |
make -C arch/$(ARCH)/loader clean |
-rm -f image.boot |
depend: |
-rm arch/$(ARCH)/loader/image.boot |
arch_distclean: distclean_kernel distclean_uspace |
arch/$(ARCH)/loader/image.boot: |
make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE) |
clean: |
make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE) |
-rm -f $(BASE)/image.boot |
/trunk/boot/arch/ia32/Makefile.inc |
---|
26,26 → 26,29 |
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
# |
build: image.iso |
TASKS = \ |
$(USPACEDIR)/init/init \ |
$(USPACEDIR)/ns/ns \ |
$(USPACEDIR)/pci/pci \ |
$(USPACEDIR)/fb/fb \ |
$(USPACEDIR)/kbd/kbd \ |
$(USPACEDIR)/console/console \ |
$(USPACEDIR)/tetris/tetris \ |
$(USPACEDIR)/ipcc/ipcc \ |
$(USPACEDIR)/klog/klog |
image.iso: kernel uspace |
build: $(BASE)/image.iso |
$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(TASKS) |
mkdir -p arch/$(ARCH)/iso/boot/grub |
cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ |
cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/ |
cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/init/init arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/ns/ns arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/pci/pci arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/fb/fb arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/kbd/kbd arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/console/console arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/tetris/tetris arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/ipcc/ipcc arch/$(ARCH)/iso/boot/ |
cp $(USPACEDIR)/klog/klog arch/$(ARCH)/iso/boot/ |
mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o image.iso arch/$(ARCH)/iso/ |
for task in $(TASKS) ; do \ |
cp $$task arch/$(ARCH)/iso/boot/ ; \ |
done |
mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/ |
clean: clean_kernel clean_uspace |
clean: |
-rm -fr arch/$(ARCH)/iso |
-rm -f image.iso |
arch_distclean: distclean_kernel distclean_uspace |
-rm -f $(BASE)/image.iso |