Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 25a76ab8 in mainline for boot/Makefile.silo


Ignore:
Timestamp:
2010-05-08T07:53:23Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
051bc69a
Parents:
6c39a907 (diff), 1317380 (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.

File:
1 moved

Legend:

Unmodified
Added
Removed
  • boot/Makefile.silo

    r6c39a907 r25a76ab8  
    11#
    22# Copyright (c) 2006 Martin Decky
    3 # Copyright (c) 2006 Jakub Jermar
    43# All rights reserved.
    54#
     
    2827#
    2928
    30 #include <stack.h>
     29.PHONY: all build_dist clean
    3130
    32 .text
     31include Makefile.common
    3332
    34 .global jump_to_kernel
     33ifeq ($(CONFIG_AOUT_ISOFS_B),y)
     34        SILO_PACKAGE = a.out
     35else
     36        SILO_PACKAGE = raw
     37endif
    3538
    36 jump_to_kernel:
    37     alloc loc0 = ar.pfs, 1, 1, 0, 0
    38     movl r8 = 0x4404000;;
    39     mov b1 = r8 ;;
    40     mov r1 = in0;               #Save bootinfo prt
    41     br.call.sptk.many b0 = b1;;
     39ISOFS_B = silo/$(SILO_PACKAGE)/isofs.b
     40SECOND_B = silo/$(SILO_PACKAGE)/second.b
     41SILO_CONF = silo/silo.conf
     42ISOFS_B_IN = $(DISTROOT)/boot/isofs.b
     43
     44all: $(POST_OUTPUT)
     45
     46$(POST_OUTPUT): build_dist
     47        mkisofs -f -G $(ISOFS_B_IN) -B ... -r -o $@ $(DISTROOT)/
     48
     49build_dist: clean
     50        mkdir -p $(DISTROOT)/boot
     51        mkdir -p $(DISTROOT)/HelenOS
     52        cp $(BOOT_OUTPUT) $(DISTROOT)/HelenOS/
     53        cp $(ISOFS_B) $(DISTROOT)/boot/
     54        cp $(SECOND_B) $(DISTROOT)/boot/
     55        cp $(SILO_CONF) $(DISTROOT)/boot/
     56
     57clean:
     58        rm -fr $(DISTROOT)
Note: See TracChangeset for help on using the changeset viewer.