Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup naming of PXE stage2. It no longer interferes with zbeos build process.

Browse Source 
You can build it using:

TARGET_BOOT_PLATFORM=pxe_ia32 jam pxehaiku-loader

Building the PXE stage1 using:

TARGET_BOOT_PLATFORM=pxe_ia32 jam pxehaiku

is still broken. however, it can be build using:

cd src/system/boot/platform/pxe_ia32/
as -o pxe_stage1.o pxe_stage1.S
ld --oformat binary --Ttext 0x7C00 -o pxe_stage1.bin pxe_stage1.o
cp pxe_stage1.bin /tftpboot/pxehaiku


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19722 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen 2007-01-06 13:46:41 +00:00
parent 167c61fce4
commit aa86f3868f
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/system/boot/Jamfile
View File

@ -69,6 +69,9 @@ actions BuildZbeos {
BuildZbeos zbeos : boot_loader_$(TARGET_BOOT_PLATFORM) ; BuildZbeos zbeos : boot_loader_$(TARGET_BOOT_PLATFORM) ;
# different target for PXE, to be build with TARGET_BOOT_PLATFORM=pxe_ia32 jam pxehaiku-loader
BuildZbeos pxehaiku-loader : boot_loader_$(TARGET_BOOT_PLATFORM) ;
SubInclude HAIKU_TOP src system boot arch $(TARGET_ARCH) ; SubInclude HAIKU_TOP src system boot arch $(TARGET_ARCH) ;
SubInclude HAIKU_TOP src system boot loader ; SubInclude HAIKU_TOP src system boot loader ;
SubInclude HAIKU_TOP src system boot platform ; SubInclude HAIKU_TOP src system boot platform ;

7
src/system/boot/platform/pxe_ia32/Jamfile
View File

@ -70,7 +70,7 @@ actions BuildPXEstage1 {
ld --oformat binary --Ttext 0x7C00 -o $(1) $(1).o ld --oformat binary --Ttext 0x7C00 -o $(1) $(1).o
} }
BuildPXEstage1 pxe_stage1.bin : pxe_stage1.S ; BuildPXEstage1 pxehaiku : pxe_stage1.S ;
SEARCH on [ FGristFiles $(bios_ia32_src) ] SEARCH on [ FGristFiles $(bios_ia32_src) ]
= [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ; = [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ;
@ -85,7 +85,4 @@ SEARCH on [ FGristFiles $(bios_ia32_edid_src) ]
SEARCH on stage1.bin SEARCH on stage1.bin
= [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ; = [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ;
# Tell the build system to where stage1.bin can be found, so it can be used SEARCH on pxe_stage1.S = $(SUBDIR) ;
# elsewhere.
# SEARCH on pxe_stage1.bin = $(SUBDIR) ;

18
src/system/boot/platform/pxe_ia32/pxe_stage1.S
View File

@ -467,7 +467,7 @@ go_unreal: pushw %ds
ret ret
startmsg: .asciz "\r\nHaiku PXE bootloader version 0.1\r\n\r\n" startmsg: .asciz "\r\nHaiku PXE bootloader version 1.0\r\n\r\n"
unrealmsg: .asciz "Switch to unreal mode done\r\n" unrealmsg: .asciz "Switch to unreal mode done\r\n"
pxenvmsg: .asciz "PXENV+ data structure at " pxenvmsg: .asciz "PXENV+ data structure at "
@ -485,10 +485,10 @@ fsizeis: .asciz "Image file size is "
psizeis: .asciz "Packet size is " psizeis: .asciz "Packet size is "
maxfsize: .asciz "Maximum TFTP file size is " maxfsize: .asciz "Maximum TFTP file size is "
maxs2size: .asciz "Maximum stage 2 file size is " maxs2size: .asciz "Maximum stage 2 file size is "
etoobig: .asciz "haiku-pxe-loader file is too large, loading aborted\r\n" etoobig: .asciz "pxehaiku-loader file is too large, loading aborted\r\n"
sizefailed: .asciz "\r\nCouldn't get haiku-pxe-loader file size, loading failed\r\n" sizefailed: .asciz "\r\nCouldn't get pxehaiku-loader file size, loading failed\r\n"
loadfailed: .asciz "\r\nLoading haiku-pxe-loader (stage 2) failed\r\n" loadfailed: .asciz "\r\nLoading pxehaiku-loader (stage 2) failed\r\n"
executing: .asciz "\r\nExecuting haiku-pxe-loader (stage 2)\r\n" executing: .asciz "\r\nExecuting pxehaiku-loader (stage 2)\r\n"
colon: .asciz ":" colon: .asciz ":"
dot: .asciz "." dot: .asciz "."
crlf: .asciz "\r\n" crlf: .asciz "\r\n"
@ -561,8 +561,8 @@ s_PXENV_TFTP_OPEN:
s_PXENV_TFTP_OPEN_Status: .word 0 s_PXENV_TFTP_OPEN_Status: .word 0
s_PXENV_TFTP_OPEN_ServerIPAddress: .long 0 s_PXENV_TFTP_OPEN_ServerIPAddress: .long 0
s_PXENV_TFTP_OPEN_GatewayIPAddress: .long 0 s_PXENV_TFTP_OPEN_GatewayIPAddress: .long 0
s_PXENV_TFTP_OPEN_FileName: .asciz "haiku-pxe-loader" s_PXENV_TFTP_OPEN_FileName: .asciz "pxehaiku-loader"
.fill 111 .fill 112
s_PXENV_TFTP_OPEN_TFTPPort: .word (69 << 8) s_PXENV_TFTP_OPEN_TFTPPort: .word (69 << 8)
s_PXENV_TFTP_OPEN_PacketSize: .word 1456 s_PXENV_TFTP_OPEN_PacketSize: .word 1456
@ -570,8 +570,8 @@ s_PXENV_TFTP_GET_FSIZE:
s_PXENV_TFTP_GET_FSIZE_Status: .word 0 s_PXENV_TFTP_GET_FSIZE_Status: .word 0
s_PXENV_TFTP_GET_FSIZE_ServerIPAddress: .long 0 s_PXENV_TFTP_GET_FSIZE_ServerIPAddress: .long 0
s_PXENV_TFTP_GET_FSIZE_GatewayIPAddress:.long 0 s_PXENV_TFTP_GET_FSIZE_GatewayIPAddress:.long 0
s_PXENV_TFTP_GET_FSIZE_FileName: .asciz "haiku-pxe-loader" s_PXENV_TFTP_GET_FSIZE_FileName: .asciz "pxehaiku-loader"
.fill 111 .fill 112
s_PXENV_TFTP_GET_FSIZE_FileSize: .long 0 s_PXENV_TFTP_GET_FSIZE_FileSize: .long 0
s_PXENV_TFTP_READ: s_PXENV_TFTP_READ: