[haiku-commits] r40240 - in haiku/trunk/src/system/boot/platform: . amiga_m68k atari_m68k bios_ia32 generic ...
- From: philippe.houdoin@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 17 Jan 2011 17:50:58 +0100 (CET)
Author: phoudoin
Date: 2011-01-17 17:50:58 +0100 (Mon, 17 Jan 2011)
New Revision: 40240
Changeset: http://dev.haiku-os.org/changeset/40240
Added:
haiku/trunk/src/system/boot/platform/generic/Jamfile
Modified:
haiku/trunk/src/system/boot/platform/Jamfile
haiku/trunk/src/system/boot/platform/amiga_m68k/Jamfile
haiku/trunk/src/system/boot/platform/atari_m68k/Jamfile
haiku/trunk/src/system/boot/platform/bios_ia32/Jamfile
haiku/trunk/src/system/boot/platform/openfirmware/Jamfile
haiku/trunk/src/system/boot/platform/pxe_ia32/Jamfile
haiku/trunk/src/system/boot/platform/u-boot/Jamfile
Log:
Moved generic boot platform code to its own static lib, boot_platform_generic.a.
I hope I didn't break anything, as I can and have only test
bios_ia32's haiku_loader. Flame me otherwise.
Modified: haiku/trunk/src/system/boot/platform/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/Jamfile 2011-01-17 11:21:12 UTC
(rev 40239)
+++ haiku/trunk/src/system/boot/platform/Jamfile 2011-01-17 16:50:58 UTC
(rev 40240)
@@ -1,5 +1,7 @@
SubDir HAIKU_TOP src system boot platform ;
if $(TARGET_BOOT_PLATFORM) {
+ SubInclude HAIKU_TOP src system boot platform generic ;
SubInclude HAIKU_TOP src system boot platform $(TARGET_BOOT_PLATFORM) ;
}
+
Modified: haiku/trunk/src/system/boot/platform/amiga_m68k/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/amiga_m68k/Jamfile 2011-01-17
11:21:12 UTC (rev 40239)
+++ haiku/trunk/src/system/boot/platform/amiga_m68k/Jamfile 2011-01-17
16:50:58 UTC (rev 40240)
@@ -2,8 +2,6 @@
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 platform $(TARGET_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
@@ -21,13 +19,6 @@
#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 :
shell.S
: -Wa,--pcrel
@@ -54,13 +45,12 @@
video.cpp
#apm.cpp
- $(genericPlatformSources)
-
# VESA/DDC EDID
#decode_edid.c
#dump_edid.c
: -fno-pic #-Wa,--pcrel
+ : boot_platform_generic.a
;
Modified: haiku/trunk/src/system/boot/platform/atari_m68k/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/atari_m68k/Jamfile 2011-01-17
11:21:12 UTC (rev 40239)
+++ haiku/trunk/src/system/boot/platform/atari_m68k/Jamfile 2011-01-17
16:50:58 UTC (rev 40240)
@@ -2,8 +2,6 @@
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 platform $(TARGET_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
@@ -21,13 +19,6 @@
#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 :
shell.S
: -Wa,--pcrel
@@ -59,13 +50,12 @@
video.cpp
#apm.cpp
- $(genericPlatformSources)
-
# VESA/DDC EDID
#decode_edid.c
#dump_edid.c
: -fno-pic #-Wa,--pcrel
+ : boot_platform_generic.a
;
Modified: haiku/trunk/src/system/boot/platform/bios_ia32/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/Jamfile 2011-01-17
11:21:12 UTC (rev 40239)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/Jamfile 2011-01-17
16:50:58 UTC (rev 40240)
@@ -2,8 +2,6 @@
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 graphics common ] ;
UsePrivateHeaders [ FDirName graphics vesa ] ;
@@ -19,12 +17,6 @@
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 :
shell.S
start.cpp
@@ -46,18 +38,14 @@
apm.cpp
hpet.cpp
- $(genericPlatformSources)
-
# VESA/DDC EDID
decode_edid.c
dump_edid.c
: -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
# elsewhere.
SEARCH on stage1.bin = $(SUBDIR) ;
Added: haiku/trunk/src/system/boot/platform/generic/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/generic/Jamfile
(rev 0)
+++ haiku/trunk/src/system/boot/platform/generic/Jamfile 2011-01-17
16:50:58 UTC (rev 40240)
@@ -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
+;
Modified: haiku/trunk/src/system/boot/platform/openfirmware/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/openfirmware/Jamfile 2011-01-17
11:21:12 UTC (rev 40239)
+++ haiku/trunk/src/system/boot/platform/openfirmware/Jamfile 2011-01-17
16:50:58 UTC (rev 40240)
@@ -4,16 +4,8 @@
UsePrivateHeaders [ FDirName graphics common ] ;
-SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
-
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 :
console.cpp
debug.cpp
@@ -31,14 +23,14 @@
openfirmware.cpp
openfirmware_devices.cpp
- $(genericPlatformSources)
-
# VESA/DDC EDID
decode_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) ]
Modified: haiku/trunk/src/system/boot/platform/pxe_ia32/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/pxe_ia32/Jamfile 2011-01-17
11:21:12 UTC (rev 40239)
+++ haiku/trunk/src/system/boot/platform/pxe_ia32/Jamfile 2011-01-17
16:50:58 UTC (rev 40240)
@@ -4,8 +4,6 @@
SubDirHdrs $(HAIKU_TOP) headers private kernel boot platform bios_ia32 ;
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 graphics common ] ;
UsePrivateHeaders [ FDirName graphics vesa ] ;
@@ -19,12 +17,6 @@
SubDirC++Flags $(defines) -fno-rtti ;
}
-local genericPlatformSources =
- text_menu.cpp
- video_blit.cpp
- video_splash.cpp
-;
-
local bios_ia32_src =
start.cpp
debug.cpp
@@ -59,9 +51,9 @@
pxe_undi.cpp
$(bios_ia32_src)
$(bios_ia32_edid_src)
- $(genericPlatformSources)
: -fno-pic
+ : boot_platform_generic.a
;
Modified: haiku/trunk/src/system/boot/platform/u-boot/Jamfile
===================================================================
--- haiku/trunk/src/system/boot/platform/u-boot/Jamfile 2011-01-17 11:21:12 UTC
(rev 40239)
+++ haiku/trunk/src/system/boot/platform/u-boot/Jamfile 2011-01-17 16:50:58 UTC
(rev 40240)
@@ -4,8 +4,6 @@
SubDirHdrs $(HAIKU_TOP) src system boot arch $(TARGET_ARCH) ;
-SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
-
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName graphics common ] ;
UsePrivateHeaders [ FDirName graphics vesa ] ;
@@ -29,12 +27,6 @@
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 :
shell.S
start2.cpp
@@ -52,6 +44,7 @@
: -fno-pic
+ : boot_platform_generic.a
;
# include board-specific defs
Other related posts:
- » [haiku-commits] r40240 - in haiku/trunk/src/system/boot/platform: . amiga_m68k atari_m68k bios_ia32 generic ... - philippe . houdoin
