- Timestamp:
- 2006-07-17T00:53:53Z (19 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 231fcb2
- Parents:
- 41c4444
- Location:
- boot
- Files:
-
- 10 edited
-
Makefile (modified) (3 diffs)
-
arch/amd64/Makefile.inc (modified) (1 diff)
-
arch/ia32/Makefile.inc (modified) (1 diff)
-
arch/ia64/Makefile.inc (modified) (1 diff)
-
arch/mips32/Makefile.inc (modified) (1 diff)
-
arch/ppc32/Makefile.inc (modified) (1 diff)
-
arch/ppc64/Makefile.inc (modified) (1 diff)
-
arch/sparc64/Makefile.inc (modified) (2 diffs)
-
arch/xen32/Makefile.inc (modified) (2 diffs)
-
boot.config (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile
r41c4444 r41f7564 30 30 # 31 31 32 -include ../version 32 33 -include Makefile.config 33 34 34 ## Common flags35 ## Paths 35 36 # 36 37 … … 38 39 KERNELDIR = $(BASE)/kernel 39 40 USPACEDIR = $(BASE)/uspace 40 41 ## Setup arch configuration42 #43 44 -include arch/$(ARCH)/Makefile.inc45 46 ifeq ($(ARCH),xen32)47 UARCH = ia3248 else49 UARCH = $(ARCH)50 endif51 41 52 42 ifeq ($(CONFIG_DEBUG),y) … … 58 48 endif 59 49 60 .PHONY: all build config distclean arch_distclean clean kernel uspace clean_kernel clean_uspace distclean_kernel distclean_uspace50 .PHONY: all build config distclean clean generic_clean 61 51 62 52 all: 63 tools/config.py default 64 $(MAKE) -C . build $(ARCH) 53 ../tools/config.py boot.config default $(ARCH) $(COMPILER) $(CONFIG_DEBUG) $(IMAGE) 54 $(MAKE) -C . build 55 56 -include arch/$(ARCH)/Makefile.inc 65 57 66 58 config: 67 tools/config.py59 ../tools/config.py boot.config 68 60 69 distclean: clean arch_distclean61 distclean: clean 70 62 -rm Makefile.config 71 63 72 kernel: 73 $(MAKE) -C $(KERNELDIR) NARCH=$(ARCH) 74 75 uspace: 76 $(MAKE) -C $(USPACEDIR) NARCH=$(UARCH) 77 78 clean_kernel: 79 $(MAKE) -C $(KERNELDIR) clean ARCH=$(ARCH) 80 81 clean_uspace: 82 $(MAKE) -C $(USPACEDIR) clean ARCH=$(UARCH) 83 84 clean_boot_gen: 64 generic_clean: 85 65 -rm generic/*.o genarch/*.o 86 87 distclean_kernel:88 $(MAKE) -C $(KERNELDIR) distclean ARCH=$(ARCH)89 90 distclean_uspace:91 $(MAKE) -C $(USPACEDIR) distclean ARCH=$(UARCH) -
boot/arch/amd64/Makefile.inc
r41c4444 r41f7564 27 27 # 28 28 29 build: image.iso 29 TASKS = \ 30 $(USPACEDIR)/init/init \ 31 $(USPACEDIR)/ns/ns \ 32 $(USPACEDIR)/pci/pci \ 33 $(USPACEDIR)/fb/fb \ 34 $(USPACEDIR)/kbd/kbd \ 35 $(USPACEDIR)/console/console \ 36 $(USPACEDIR)/tetris/tetris \ 37 $(USPACEDIR)/ipcc/ipcc \ 38 $(USPACEDIR)/klog/klog 30 39 31 image.iso: kernel uspace 40 build: $(BASE)/image.iso 41 42 $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(TASKS) 32 43 mkdir -p arch/$(ARCH)/iso/boot/grub 33 44 cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ 34 45 cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/ 35 46 cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ 36 cp $(USPACEDIR)/init/init arch/$(ARCH)/iso/boot/ 37 cp $(USPACEDIR)/ns/ns arch/$(ARCH)/iso/boot/ 38 cp $(USPACEDIR)/pci/pci arch/$(ARCH)/iso/boot/ 39 cp $(USPACEDIR)/fb/fb arch/$(ARCH)/iso/boot/ 40 cp $(USPACEDIR)/kbd/kbd arch/$(ARCH)/iso/boot/ 41 cp $(USPACEDIR)/console/console arch/$(ARCH)/iso/boot/ 42 cp $(USPACEDIR)/tetris/tetris arch/$(ARCH)/iso/boot/ 43 cp $(USPACEDIR)/ipcc/ipcc arch/$(ARCH)/iso/boot/ 44 cp $(USPACEDIR)/klog/klog arch/$(ARCH)/iso/boot/ 45 mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o image.iso arch/$(ARCH)/iso/ 47 for task in $(TASKS) ; do \ 48 cp $$task arch/$(ARCH)/iso/boot/ ; \ 49 done 50 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/ 46 51 47 clean: clean_kernel clean_uspace52 clean: 48 53 -rm -fr arch/$(ARCH)/iso 49 -rm -f image.iso 50 51 arch_distclean: distclean_kernel distclean_uspace 54 -rm -f $(BASE)/image.iso -
boot/arch/ia32/Makefile.inc
r41c4444 r41f7564 27 27 # 28 28 29 build: image.iso 29 TASKS = \ 30 $(USPACEDIR)/init/init \ 31 $(USPACEDIR)/ns/ns \ 32 $(USPACEDIR)/pci/pci \ 33 $(USPACEDIR)/fb/fb \ 34 $(USPACEDIR)/kbd/kbd \ 35 $(USPACEDIR)/console/console \ 36 $(USPACEDIR)/tetris/tetris \ 37 $(USPACEDIR)/ipcc/ipcc \ 38 $(USPACEDIR)/klog/klog 30 39 31 image.iso: kernel uspace 40 build: $(BASE)/image.iso 41 42 $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(TASKS) 32 43 mkdir -p arch/$(ARCH)/iso/boot/grub 33 44 cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ 34 45 cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/ 35 46 cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ 36 cp $(USPACEDIR)/init/init arch/$(ARCH)/iso/boot/ 37 cp $(USPACEDIR)/ns/ns arch/$(ARCH)/iso/boot/ 38 cp $(USPACEDIR)/pci/pci arch/$(ARCH)/iso/boot/ 39 cp $(USPACEDIR)/fb/fb arch/$(ARCH)/iso/boot/ 40 cp $(USPACEDIR)/kbd/kbd arch/$(ARCH)/iso/boot/ 41 cp $(USPACEDIR)/console/console arch/$(ARCH)/iso/boot/ 42 cp $(USPACEDIR)/tetris/tetris arch/$(ARCH)/iso/boot/ 43 cp $(USPACEDIR)/ipcc/ipcc arch/$(ARCH)/iso/boot/ 44 cp $(USPACEDIR)/klog/klog arch/$(ARCH)/iso/boot/ 45 mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o image.iso arch/$(ARCH)/iso/ 47 for task in $(TASKS) ; do \ 48 cp $$task arch/$(ARCH)/iso/boot/ ; \ 49 done 50 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/ 46 51 47 clean: clean_kernel clean_uspace52 clean: 48 53 -rm -fr arch/$(ARCH)/iso 49 -rm -f image.iso 50 51 arch_distclean: distclean_kernel distclean_uspace 54 -rm -f $(BASE)/image.iso -
boot/arch/ia64/Makefile.inc
r41c4444 r41f7564 27 27 # 28 28 29 VMAXLMA_SRC =$(KERNELDIR)/contrib/arch/ia64/vmaxlma.c29 VMAXLMA_SRC = tools/ia64/vmaxlma.c 30 30 31 build: kernel.bin31 build: $(BASE)/kernel.bin 32 32 33 kernel.bin: kernel uspacevmaxlma34 cp $(KERNELDIR)/kernel.bin .35 ./vmaxlma kernel.bin33 $(BASE)/kernel.bin: $(KERNELDIR)/kernel.bin vmaxlma 34 cp $(KERNELDIR)/kernel.bin $(BASE)/kernel.bin 35 ./vmaxlma $(BASE)/kernel.bin 36 36 37 37 vmaxlma: $(VMAXLMA_SRC) 38 gcc$(VMAXLMA_SRC) -o $@38 $(CC) $(VMAXLMA_SRC) -o $@ 39 39 40 clean: clean_kernel clean_uspace 41 -rm -f kernel.bin vmaxlma 42 43 arch_distclean: distclean_kernel distclean_uspace 40 clean: 41 -rm -f $(BASE)/kernel.bin vmaxlma -
boot/arch/mips32/Makefile.inc
r41c4444 r41f7564 27 27 # 28 28 29 build: image.boot29 build: $(BASE)/image.boot 30 30 31 image.boot: kernel uspace 32 make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(CONFIG_IMAGE) 33 cp arch/$(ARCH)/loader/image.boot image.boot 31 $(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot 32 cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot 34 33 35 clean: clean_boot_gen clean_kernel clean_uspace 36 make -C arch/$(ARCH)/loader clean 37 -rm -f image.boot 34 depend: 35 -rm arch/$(ARCH)/loader/image.boot 38 36 39 arch_distclean: distclean_kernel distclean_uspace 37 arch/$(ARCH)/loader/image.boot: 38 make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE) 39 40 clean: 41 make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE) 42 -rm -f $(BASE)/image.boot -
boot/arch/ppc32/Makefile.inc
r41c4444 r41f7564 27 27 # 28 28 29 build: image.boot29 build: $(BASE)/image.boot 30 30 31 image.boot: kernel uspace 31 $(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot 32 cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot 33 34 depend: 35 -rm arch/$(ARCH)/loader/image.boot 36 37 arch/$(ARCH)/loader/image.boot: 32 38 make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)" 33 cp arch/$(ARCH)/loader/image.boot image.boot34 39 35 clean: clean_boot_gen clean_kernel clean_uspace 36 make -C arch/$(ARCH)/loader clean KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) 37 -rm -f image.boot 38 39 arch_distclean: distclean_kernel distclean_uspace 40 clean: generic_clean 41 make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)" 42 -rm -f $(BASE)/image.boot -
boot/arch/ppc64/Makefile.inc
r41c4444 r41f7564 27 27 # 28 28 29 build: image.boot29 build: $(BASE)/image.boot 30 30 31 image.boot: kernel uspace 31 $(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot 32 cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot 33 34 depend: 35 -rm arch/$(ARCH)/loader/image.boot 36 37 arch/$(ARCH)/loader/image.boot: 32 38 make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) 33 cp arch/$(ARCH)/loader/image.boot image.boot34 39 35 clean: clean_boot_gen clean_kernel clean_uspace 36 make -C arch/$(ARCH)/loader clean KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) 37 -rm -f image.boot 38 39 arch_distclean: distclean_kernel distclean_uspace 40 clean: generic_clean 41 make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) 42 -rm -f $(BASE)/image.boot -
boot/arch/sparc64/Makefile.inc
r41c4444 r41f7564 29 29 TMP=distroot 30 30 31 build: image.iso31 build: $(BASE)/image.iso 32 32 33 image.iso: kernel 34 make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(CONFIG_IMAGE) 33 $(BASE)/image.iso: depend arch/$(ARCH)/loader/image.boot 35 34 mkdir -p $(TMP)/boot 36 35 mkdir -p $(TMP)/HelenOS … … 38 37 cp arch/$(ARCH)/silo/README arch/$(ARCH)/silo/COPYING arch/$(ARCH)/silo/silo.conf $(TMP)/boot 39 38 cp arch/$(ARCH)/loader/image.boot $(TMP)/HelenOS/image.boot 40 mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o image.iso $(TMP)/39 mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $(BASE)/image.iso $(TMP)/ 41 40 42 clean: clean_boot_gen clean_kernel 43 make -C arch/$(ARCH)/loader clean 41 depend: 42 -rm arch/$(ARCH)/loader/image.boot 43 44 arch/$(ARCH)/loader/image.boot: 45 make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) 46 47 clean: generic_clean 48 make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) 44 49 -rm -fr $(TMP) 45 -rm -f image.iso 46 47 arch_distclean: distclean_kernel 50 -rm -f $(BASE)/image.iso -
boot/arch/xen32/Makefile.inc
r41c4444 r41f7564 27 27 # 28 28 29 build: image.iso 29 TASKS = \ 30 $(USPACEDIR)/init/init \ 31 $(USPACEDIR)/ns/ns \ 32 $(USPACEDIR)/pci/pci \ 33 $(USPACEDIR)/fb/fb \ 34 $(USPACEDIR)/kbd/kbd \ 35 $(USPACEDIR)/console/console \ 36 $(USPACEDIR)/tetris/tetris \ 37 $(USPACEDIR)/ipcc/ipcc \ 38 $(USPACEDIR)/klog/klog 30 39 31 image.iso: kernel uspace 40 build: $(BASE)/image.iso 41 42 $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/grub/xen.gz $(KERNELDIR)/kernel.bin $(TASKS) 32 43 mkdir -p arch/$(ARCH)/iso/boot/grub 33 44 cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ … … 35 46 cp arch/$(ARCH)/grub/xen.gz arch/$(ARCH)/iso/boot/ 36 47 cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ 37 cp $(USPACEDIR)/init/init arch/$(ARCH)/iso/boot/ 38 cp $(USPACEDIR)/ns/ns arch/$(ARCH)/iso/boot/ 39 cp $(USPACEDIR)/pci/pci arch/$(ARCH)/iso/boot/ 40 cp $(USPACEDIR)/fb/fb arch/$(ARCH)/iso/boot/ 41 cp $(USPACEDIR)/kbd/kbd arch/$(ARCH)/iso/boot/ 42 cp $(USPACEDIR)/console/console arch/$(ARCH)/iso/boot/ 43 cp $(USPACEDIR)/tetris/tetris arch/$(ARCH)/iso/boot/ 44 cp $(USPACEDIR)/ipcc/ipcc arch/$(ARCH)/iso/boot/ 45 cp $(USPACEDIR)/klog/klog arch/$(ARCH)/iso/boot/ 46 mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o image.iso arch/$(ARCH)/iso/ 48 for task in $(TASKS) ; do \ 49 cp $$task arch/$(ARCH)/iso/boot/ ; \ 50 done 51 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/ 47 52 48 clean: clean_kernel clean_uspace53 clean: 49 54 -rm -fr arch/$(ARCH)/iso 50 -rm -f image.iso 51 52 arch_distclean: distclean_kernel distclean_uspace 55 -rm -f $(BASE)/image.iso -
boot/boot.config
r41c4444 r41f7564 12 12 ! ARCH (choice) 13 13 14 # PPC32Compiler14 # Compiler 15 15 @ "cross" Cross-compiler 16 16 @ "native" Native 17 ! [ARCH=ppc32] PPC32_COMPILER (choice) 18 % [ARCH=ppc32] SAVEAS PPC32_COMPILER COMPILER 19 20 # PPC64 Compiler 21 @ "cross" Cross-compiler 22 @ "native" Native 23 ! [ARCH=ppc64] PPC64_COMPILER (choice) 24 % [ARCH=ppc64] SAVEAS PPC64_COMPILER COMPILER 25 26 # MIPS32 Compiler 27 @ "cross" Cross-compiler 28 @ "native" Native 29 ! [ARCH=mips32] MIPS32_COMPILER (choice) 30 % [ARCH=mips32] SAVEAS MIPS32_COMPILER COMPILER 17 ! COMPILER (choice) 31 18 32 19 # Debug bootloader … … 39 26 @ "binary" Binary image (MSIM) 40 27 @ "ecoff" Ecoff image (GXEmul) 41 ! [ARCH=mips32] CONFIG_IMAGE (choice)28 ! [ARCH=mips32] IMAGE (choice)
Note:
See TracChangeset
for help on using the changeset viewer.
