i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved generic boot platform code to its own static lib, boot_platform_generic.a.

Browse Source 
I hope I didn't break anything, as I can and have only test
bios_ia32's haiku_loader. Flame me otherwise.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40240 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2011-01-17 16:50:58 +00:00
parent 28b7d1d410
commit 4499da3990
8 changed files with 23 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/Jamfile
+2
View File
@@ -1,5 +1,7 @@
SubDir HAIKU_TOP src system boot platform ; SubDir HAIKU_TOP src system boot platform ;
if $(TARGET_BOOT_PLATFORM) { if $(TARGET_BOOT_PLATFORM) {
SubInclude HAIKU_TOP src system boot platform generic ;
SubInclude HAIKU_TOP src system boot platform $(TARGET_BOOT_PLATFORM) ; SubInclude HAIKU_TOP src system boot platform $(TARGET_BOOT_PLATFORM) ;
} }
src/system/boot/platform/amiga_m68k/Jamfile
+1 -11
View File
@@ -2,8 +2,6 @@ SubDir HAIKU_TOP src system boot platform amiga_m68k ;
SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ; SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ;
SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel platform $(TARGET_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel platform $(TARGET_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
@@ -21,13 +19,6 @@ UsePrivateHeaders [ FDirName storage ] ;
#SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ; #SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
local genericPlatformSources =
text_menu.cpp
video_blit.cpp
video_splash.cpp
;
KernelMergeObject boot_platform_amiga_m68k_shell.o : KernelMergeObject boot_platform_amiga_m68k_shell.o :
shell.S shell.S
: -Wa,--pcrel : -Wa,--pcrel
@@ -54,13 +45,12 @@ KernelMergeObject boot_platform_amiga_m68k_other.o :
video.cpp video.cpp
#apm.cpp #apm.cpp
$(genericPlatformSources)
# VESA/DDC EDID # VESA/DDC EDID
#decode_edid.c #decode_edid.c
#dump_edid.c #dump_edid.c
: -fno-pic #-Wa,--pcrel : -fno-pic #-Wa,--pcrel
: boot_platform_generic.a
; ;
src/system/boot/platform/atari_m68k/Jamfile
+1 -11
View File
@@ -2,8 +2,6 @@ SubDir HAIKU_TOP src system boot platform atari_m68k ;
SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ; SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ;
SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel platform $(TARGET_BOOT_PLATFORM) ] ; UsePrivateHeaders [ FDirName kernel platform $(TARGET_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
@@ -21,13 +19,6 @@ UsePrivateHeaders [ FDirName storage ] ;
#SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ; #SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
local genericPlatformSources =
text_menu.cpp
video_blit.cpp
video_splash.cpp
;
KernelMergeObject boot_platform_atari_m68k_shell.o : KernelMergeObject boot_platform_atari_m68k_shell.o :
shell.S shell.S
: -Wa,--pcrel : -Wa,--pcrel
@@ -59,13 +50,12 @@ KernelMergeObject boot_platform_atari_m68k_other.o :
video.cpp video.cpp
#apm.cpp #apm.cpp
$(genericPlatformSources)
# VESA/DDC EDID # VESA/DDC EDID
#decode_edid.c #decode_edid.c
#dump_edid.c #dump_edid.c
: -fno-pic #-Wa,--pcrel : -fno-pic #-Wa,--pcrel
: boot_platform_generic.a
; ;
src/system/boot/platform/bios_ia32/Jamfile
+1 -13
View File
@@ -2,8 +2,6 @@ SubDir HAIKU_TOP src system boot platform bios_ia32 ;
SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ; SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ;
SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateHeaders [ FDirName graphics common ] ;
UsePrivateHeaders [ FDirName graphics vesa ] ; UsePrivateHeaders [ FDirName graphics vesa ] ;
@@ -19,12 +17,6 @@ UsePrivateHeaders [ FDirName storage ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
local genericPlatformSources =
text_menu.cpp
video_blit.cpp
video_splash.cpp
;
KernelMergeObject boot_platform_bios_ia32.o : KernelMergeObject boot_platform_bios_ia32.o :
shell.S shell.S
start.cpp start.cpp
@@ -46,18 +38,14 @@ KernelMergeObject boot_platform_bios_ia32.o :
apm.cpp apm.cpp
hpet.cpp hpet.cpp
$(genericPlatformSources)
# VESA/DDC EDID # VESA/DDC EDID
decode_edid.c decode_edid.c
dump_edid.c dump_edid.c
: -fno-pic : -fno-pic
: boot_platform_generic.a
; ;
SEARCH on [ FGristFiles $(genericPlatformSources) ]
= [ FDirName $(HAIKU_TOP) src system boot platform generic ] ;
# Tell the build system to where stage1.bin can be found, so it can be used # Tell the build system to where stage1.bin can be found, so it can be used
# elsewhere. # elsewhere.
SEARCH on stage1.bin = $(SUBDIR) ; SEARCH on stage1.bin = $(SUBDIR) ;
src/system/boot/platform/generic/Jamfile
+13
View File
@@ -0,0 +1,13 @@
SubDir HAIKU_TOP src system boot platform generic ;
SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
UsePrivateKernelHeaders ;
SubDirC++Flags -D_BOOT_MODE -fno-rtti ;
KernelStaticLibrary boot_platform_generic :
text_menu.cpp
video_blit.cpp
video_splash.cpp
: -fno-pic
;
src/system/boot/platform/openfirmware/Jamfile
+3 -11
View File
@@ -4,16 +4,8 @@ SubDirC++Flags -D_BOOT_MODE -fno-rtti ;
UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateHeaders [ FDirName graphics common ] ;
SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
local genericPlatformSources =
text_menu.cpp
video_blit.cpp
video_splash.cpp
;
KernelMergeObject boot_platform_openfirmware.o : KernelMergeObject boot_platform_openfirmware.o :
console.cpp console.cpp
debug.cpp debug.cpp
@@ -31,14 +23,14 @@ KernelMergeObject boot_platform_openfirmware.o :
openfirmware.cpp openfirmware.cpp
openfirmware_devices.cpp openfirmware_devices.cpp
$(genericPlatformSources)
# VESA/DDC EDID # VESA/DDC EDID
decode_edid.c decode_edid.c
dump_edid.c dump_edid.c
: :
: boot_platform_openfirmware_$(TARGET_ARCH).a :
boot_platform_generic.a
boot_platform_openfirmware_$(TARGET_ARCH).a
; ;
SEARCH on [ FGristFiles $(genericPlatformSources) ] SEARCH on [ FGristFiles $(genericPlatformSources) ]
src/system/boot/platform/pxe_ia32/Jamfile
+1 -9
View File
@@ -4,8 +4,6 @@ SubDirHdrs $(SUBDIR) $(DOTDOT) bios_ia32 ;
SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform bios_ia32 ; SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform bios_ia32 ;
SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ; SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATFORM) ;
SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateHeaders [ FDirName graphics common ] ;
UsePrivateHeaders [ FDirName graphics vesa ] ; UsePrivateHeaders [ FDirName graphics vesa ] ;
@@ -19,12 +17,6 @@ UsePrivateHeaders [ FDirName storage ] ;
SubDirC++Flags $(defines) -fno-rtti ; SubDirC++Flags $(defines) -fno-rtti ;
} }
local genericPlatformSources =
text_menu.cpp
video_blit.cpp
video_splash.cpp
;
local bios_ia32_src = local bios_ia32_src =
start.cpp start.cpp
debug.cpp debug.cpp
@@ -59,9 +51,9 @@ KernelMergeObject boot_platform_pxe_ia32.o :
pxe_undi.cpp pxe_undi.cpp
$(bios_ia32_src) $(bios_ia32_src)
$(bios_ia32_edid_src) $(bios_ia32_edid_src)
$(genericPlatformSources)
: -fno-pic : -fno-pic
: boot_platform_generic.a
; ;
src/system/boot/platform/u-boot/Jamfile
+1 -8
View File
@@ -4,8 +4,6 @@ SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform $(TARGET_BOOT_PLATF
SubDirHdrs $(HAIKU_TOP) src system boot arch $(TARGET_ARCH) ; SubDirHdrs $(HAIKU_TOP) src system boot arch $(TARGET_ARCH) ;
SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateHeaders [ FDirName graphics common ] ;
UsePrivateHeaders [ FDirName graphics vesa ] ; UsePrivateHeaders [ FDirName graphics vesa ] ;
@@ -29,12 +27,6 @@ local uImageFakeOS = "netbsd" ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
local genericPlatformSources =
text_menu.cpp
video_blit.cpp
video_splash.cpp
;
KernelMergeObject boot_platform_u-boot.o : KernelMergeObject boot_platform_u-boot.o :
shell.S shell.S
start2.cpp start2.cpp
@@ -52,6 +44,7 @@ KernelMergeObject boot_platform_u-boot.o :
: -fno-pic : -fno-pic
: boot_platform_generic.a
; ;
# include board-specific defs # include board-specific defs