Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4420 → Rev 4300

/branches/dd/boot/arch/sparc64/loader/Makefile
101,9 → 101,8
$(USPACEDIR)/srv/fb/fb \
$(USPACEDIR)/srv/kbd/kbd \
$(USPACEDIR)/srv/console/console \
$(USPACEDIR)/srv/pci/pci \
$(USPACEDIR)/srv/fs/devfs/devfs \
$(USPACEDIR)/srv/fs/tmpfs/tmpfs
$(USPACEDIR)/srv/fs/tmpfs/tmpfs \
$(USPACEDIR)/srv/pci/pci
 
ifeq ($(MACHINE),generic)
RD_SRVS += \
/branches/dd/boot/arch/sparc64/loader/asm.S
40,7 → 40,7
.global jump_to_kernel
 
halt:
ba %xcc, halt
b halt
nop
memcpy:
116,7 → 116,7
set subarchitecture, %g2
ldub [%g2], %g2
cmp %g2, 3
be %xcc, 1f
be 1f
nop
0:
call icache_flush
/branches/dd/boot/arch/sparc64/loader/boot.S
43,7 → 43,7
 
.global start
start:
ba %xcc, 1f
b 1f
nop
 
/*
83,7 → 83,7
call ofw_init ! initialize OpenFirmware
stx %o4, [%l0]
ba %xcc, bootstrap
b bootstrap
nop
 
.align STACK_ALIGNMENT
/branches/dd/boot/arch/ia32/Makefile.inc
47,7 → 47,6
$(USPACEDIR)/srv/fb/fb \
$(USPACEDIR)/srv/kbd/kbd \
$(USPACEDIR)/srv/console/console \
$(USPACEDIR)/srv/fs/devfs/devfs \
$(USPACEDIR)/srv/fs/tmpfs/tmpfs \
$(USPACEDIR)/srv/fs/fat/fat
 
/branches/dd/boot/arch/ia64/loader/Makefile
100,7 → 100,6
$(USPACEDIR)/srv/fb/fb \
$(USPACEDIR)/srv/kbd/kbd \
$(USPACEDIR)/srv/console/console \
$(USPACEDIR)/srv/fs/devfs/devfs \
$(USPACEDIR)/srv/fs/tmpfs/tmpfs \
$(USPACEDIR)/srv/fs/fat/fat
 
/branches/dd/boot/arch/ppc32/Makefile.inc
32,10 → 32,8
 
$(BASE)/image.iso: depend arch/$(BARCH)/loader/image.boot
mkdir -p $(TMP)/boot
mkdir -p $(TMP)/ppc
cp arch/$(BARCH)/loader/image.boot $(TMP)/boot/image.boot
cp arch/$(BARCH)/yaboot/ofboot.b $(TMP)/boot/ofboot.b
cp arch/$(BARCH)/yaboot/bootinfo.txt $(TMP)/ppc/bootinfo.txt
cp arch/$(BARCH)/yaboot/yaboot $(TMP)/boot/yaboot
cp arch/$(BARCH)/yaboot/yaboot.conf $(TMP)/boot/yaboot.conf
mkisofs -hfs -part -map arch/$(BARCH)/yaboot/maps -no-desktop -hfs-volid "HelenOS" -hfs-bless $(TMP)/boot -r -o $@ $(TMP)/
/branches/dd/boot/arch/ppc32/yaboot/bootinfo.txt
File deleted
/branches/dd/boot/arch/ppc32/yaboot/yaboot.conf
1,5 → 1,4
device=cd:
timeout=0
 
image=/boot/image.boot
label=HelenOS
/branches/dd/boot/arch/ppc32/yaboot/ofboot.b
3,7 → 3,7
MacRISC
</COMPATIBLE>
<DESCRIPTION>
HelenOS
text
</DESCRIPTION>
<BOOT-SCRIPT>
" screen" output
/branches/dd/boot/arch/ppc32/loader/ofwarch.c
52,8 → 52,7
{
char device_name[BUF_SIZE];
if ((ofw_get_property(ofw_aliases, "macio", device_name, sizeof(device_name)) <= 0)
&& (ofw_get_property(ofw_aliases, "mac-io", device_name, sizeof(device_name)) <= 0))
if (ofw_get_property(ofw_aliases, "macio", device_name, sizeof(device_name)) <= 0)
return false;
phandle device = ofw_find_device(device_name);
/branches/dd/boot/arch/ppc32/loader/Makefile
88,7 → 88,6
$(USPACEDIR)/srv/fb/fb \
$(USPACEDIR)/srv/kbd/kbd \
$(USPACEDIR)/srv/console/console \
$(USPACEDIR)/srv/fs/devfs/devfs \
$(USPACEDIR)/srv/fs/tmpfs/tmpfs \
$(USPACEDIR)/srv/fs/fat/fat
 
/branches/dd/boot/arch/amd64/Makefile.inc
47,7 → 47,6
$(USPACEDIR)/srv/fb/fb \
$(USPACEDIR)/srv/kbd/kbd \
$(USPACEDIR)/srv/console/console \
$(USPACEDIR)/srv/fs/devfs/devfs \
$(USPACEDIR)/srv/fs/tmpfs/tmpfs \
$(USPACEDIR)/srv/fs/fat/fat
 
/branches/dd/boot/arch/mips32/loader/Makefile
101,10 → 101,8
$(USPACEDIR)/srv/fb/fb \
$(USPACEDIR)/srv/kbd/kbd \
$(USPACEDIR)/srv/console/console \
$(USPACEDIR)/srv/fs/devfs/devfs \
$(USPACEDIR)/srv/fs/tmpfs/tmpfs \
$(USPACEDIR)/srv/fs/fat/fat \
$(USPACEDIR)/srv/bd/gxe_bd/gxe_bd
$(USPACEDIR)/srv/fs/fat/fat
 
RD_APPS = \
$(USPACEDIR)/app/tetris/tetris \
/branches/dd/boot/arch/arm32/loader/Makefile
89,7 → 89,6
$(USPACEDIR)/srv/fb/fb \
$(USPACEDIR)/srv/kbd/kbd \
$(USPACEDIR)/srv/console/console \
$(USPACEDIR)/srv/fs/devfs/devfs \
$(USPACEDIR)/srv/fs/tmpfs/tmpfs \
$(USPACEDIR)/srv/fs/fat/fat