Changeset 7aaed09 in mainline for boot


Ignore:
Timestamp:
2011-12-18T14:02:30Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c868e2d
Parents:
3b71e84d (diff), 1761268 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
boot
Files:
557 added
1 deleted
10 edited
2 moved

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r3b71e84d r7aaed09  
    4040        $(PACK) $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) arch/$(KARCH) $(COMPONENTS)
    4141
    42 $(INITRD).img: $(INITRD).fs
    43         $(MKHORD) $(PAGE_SIZE) $< $@
    44 
    45 $(INITRD).fs: build_dist
     42$(INITRD).img: build_dist
    4643ifeq ($(RDFMT),tmpfs)
    4744        $(MKTMPFS) $(DIST_PATH) $@
    … …  
    9592
    9693clean_dist:
    97         rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
     94        rm -f $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
    9895        rm -f $(USPACE_PATH)/dist/srv/*
    9996        rm -rf $(USPACE_PATH)/dist/drv/*

  • boot/Makefile.common

    r3b71e84d r7aaed09  
    5353SANDBOX = pack
    5454PACK = $(TOOLS_PATH)/pack.py
    55 MKHORD = $(TOOLS_PATH)/mkhord.py
    5655MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
    5756MKFAT = $(TOOLS_PATH)/mkfat.py
    … …  
    124123        test/test3 \
    125124        nic/lo \
    126         nic/ne2k
     125        nic/ne2k \
     126        nic/e1k
    127127
    128128RD_DRV_CFG =
    … …  
    175175        $(USPACE_PATH)/app/nettest1/nettest1 \
    176176        $(USPACE_PATH)/app/nettest2/nettest2 \
     177        $(USPACE_PATH)/app/nettest3/nettest3 \
    177178        $(USPACE_PATH)/app/netecho/netecho \
    178179        $(USPACE_PATH)/app/ping/ping \
    … …  
    203204        $(USPACE_PATH)/srv/net/cfg/general \
    204205        $(USPACE_PATH)/srv/net/cfg/lo.nic \
    205         $(USPACE_PATH)/srv/net/cfg/ne2k.nic
     206        $(USPACE_PATH)/srv/net/cfg/ne2k.nic \
     207        $(USPACE_PATH)/srv/net/cfg/e1k.nic
    206208endif
    207209

  • boot/Makefile.grub

    r3b71e84d r7aaed09  
    3131include Makefile.common
    3232
    33 STAGE2 = grub/stage2_eltorito
    34 STAGE2_IN = boot/$(STAGE2)
     33GRUB = grub.$(GRUB_ARCH)
     34BOOT = $(DISTROOT)/boot
     35
     36ELTORITO = boot/grub/$(GRUB_ARCH).img
     37IMAGE = $(DISTROOT)/$(ELTORITO)
     38
     39ifeq ($(GRUB_ARCH),pc)
     40        BOOT_CONFIG = $(BOOT)/grub/i386-pc/grub.cfg
     41        MULTIBOOT_CMD = multiboot
     42        MODULE_CMD = module
     43endif
     44ifeq ($(GRUB_ARCH),efi)
     45        BOOT_CONFIG = $(BOOT)/grub/grub.cfg
     46        MULTIBOOT_CMD = multiboot2
     47        MODULE_CMD = module2
     48endif
    3549
    3650all: $(BOOT_OUTPUT)
    3751
    3852$(BOOT_OUTPUT): build_dist
    39         mkisofs -J -r -b $(STAGE2_IN) -no-emul-boot -boot-load-size 4 -boot-info-table -o $@ $(DISTROOT)/
     53ifeq ($(GRUB_ARCH),pc)
     54        mkisofs -J -r -input-charset utf-8 -V "HelenOS boot ISO" -eltorito-boot $(ELTORITO) -no-emul-boot -boot-load-size 64 -boot-info-table -o $@ $(DISTROOT)/
     55endif
     56ifeq ($(GRUB_ARCH),efi)
     57        mkisofs -J -r -input-charset utf-8 -V "HelenOS boot ISO" -efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
     58endif
    4059
    4160build_dist: clean
    42         mkdir -p $(DISTROOT)/boot/grub
    43         cp $(STAGE2) $(DISTROOT)/boot/grub/
     61        mkdir -p $(BOOT)
     62        cp -r $(GRUB) $(BOOT)/grub
     63ifeq ($(GRUB_ARCH),efi)
     64        gunzip $(IMAGE)
     65endif
     66       
    4467        for module in $(COMPONENTS) ; do \
    45                 cp "$$module" $(DISTROOT)/boot/ ; \
     68                cp "$$module" $(BOOT)/ ; \
    4669        done
    4770       
    48         echo "default 0" > $(DISTROOT)/boot/grub/menu.lst
    49         echo "timeout 10" >> $(DISTROOT)/boot/grub/menu.lst
    50         echo "" >> $(DISTROOT)/boot/grub/menu.lst
    51         echo "title=HelenOS" >> $(DISTROOT)/boot/grub/menu.lst
    52         echo "  root (cd)" >> $(DISTROOT)/boot/grub/menu.lst
     71        echo "set default=0" > $(BOOT_CONFIG)
     72        echo "set timeout=10" >> $(BOOT_CONFIG)
     73        echo "" >> $(BOOT_CONFIG)
     74       
     75ifeq ($(GRUB_ARCH),pc)
     76        echo "insmod vbe" >> $(BOOT_CONFIG)
     77        echo "insmod vga" >> $(BOOT_CONFIG)
     78endif
     79ifeq ($(GRUB_ARCH),efi)
     80        echo "insmod efi_gop" >> $(BOOT_CONFIG)
     81        echo "insmod efi_uga" >> $(BOOT_CONFIG)
     82endif
     83        echo "" >> $(BOOT_CONFIG)
     84       
     85        echo "menuentry 'HelenOS $(RELEASE)' --class helenos --class os {" >> $(BOOT_CONFIG)
    5386        for module in $(MODULES) ; do \
     87                echo "  echo 'Loading $$module'" >> $(BOOT_CONFIG) ; \
    5488                if [ "$$module" = "kernel.bin" ] ; then \
    55                         echo "  kernel /boot/$$module" >> $(DISTROOT)/boot/grub/menu.lst ; \
     89                        echo "  $(MULTIBOOT_CMD) /boot/$$module" >> $(BOOT_CONFIG) ; \
    5690                else \
    57                         echo "  module /boot/$$module" >> $(DISTROOT)/boot/grub/menu.lst ; \
     91                        echo "  $(MODULE_CMD) /boot/$$module /boot/$$module" >> $(BOOT_CONFIG) ; \
    5892                fi \
    5993        done
     94        echo "}" >> $(BOOT_CONFIG)
    6095
    6196clean:

  • boot/arch/amd64/Makefile.inc

    r3b71e84d r7aaed09  
    2626# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727#
    28 
    29 PAGE_SIZE = 4096
    3028
    3129RD_SRVS_ESSENTIAL += \

  • boot/arch/arm32/Makefile.inc

    r3b71e84d r7aaed09  
    3939BITS = 32
    4040ENDIANESS = LE
    41 PAGE_SIZE = 4096
    4241
    4342RD_SRVS_ESSENTIAL += \

  • boot/arch/ia64/Makefile.inc

    r3b71e84d r7aaed09  
    3333BITS = 64
    3434ENDIANESS = LE
    35 PAGE_SIZE = 16384
    3635EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata
    3736

  • boot/arch/mips32/Makefile.inc

    r3b71e84d r7aaed09  
    2929BFD_ARCH = mips
    3030BITS = 32
    31 PAGE_SIZE = 16384
    3231EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
    3332

  • boot/arch/mips64/Makefile.inc

    r3b71e84d r7aaed09  
    2929BFD_ARCH = mips:4000
    3030BITS = 64
    31 PAGE_SIZE = 16384
    3231EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=64
    3332

  • boot/arch/ppc32/Makefile.inc

    r3b71e84d r7aaed09  
    3737BITS = 32
    3838ENDIANESS = BE
    39 PAGE_SIZE = 4096
    4039EXTRA_CFLAGS = -mcpu=powerpc -msoft-float -m32
    4140

  • boot/arch/sparc64/Makefile.inc

    r3b71e84d r7aaed09  
    3737BITS = 64
    3838ENDIANESS = BE
    39 PAGE_SIZE = 16384
    4039EXTRA_CFLAGS = -mcpu=ultrasparc -m64 -mno-fpu -mcmodel=medlow
    4140

  • boot/grub.pc/README

    r3b71e84d r7aaed09  
     1The binary files of GRUB boot loader in this directory have been created
     2by compiling GRUB for the 'i386-pc' target and then using the grub-mkrescue
     3script to create the El Torito boot image.
     4
    15For licensing terms of GRUB boot loader see the file COPYING contained
    26in this directory. Full version of GRUB, including its source code,
Note: See TracChangeset for help on using the changeset viewer.