[haiku-commits] r42210 - in haiku/branches/releases/r1alpha3: build/jam src/system/boot/platform/bios_ia32
- From: pulkomandy@xxxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 16 Jun 2011 21:54:53 +0200 (CEST)
Author: pulkomandy
Date: 2011-06-16 21:54:53 +0200 (Thu, 16 Jun 2011)
New Revision: 42210
Changeset: https://dev.haiku-os.org/changeset/42210
Modified:
haiku/branches/releases/r1alpha3/build/jam/
haiku/branches/releases/r1alpha3/build/jam/ReleaseBuildProfiles
haiku/branches/releases/r1alpha3/src/system/boot/platform/bios_ia32/start.cpp
Log:
* Disable serial output by default
* Set official profile tag
Property changes on: haiku/branches/releases/r1alpha3/build/jam
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals/build/jam:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/build/jam:39365-39568
/haiku/trunk/build/jam:41551,41558-41559,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056,42071,42083-42085,42101-42104,42117,42127-42128,42135-42142
+ /haiku/branches/developer/bonefish/signals/build/jam:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/build/jam:39365-39568
/haiku/branches/releases/r1alpha2/build/jam:36721,36768
/haiku/trunk/build/jam:41551,41558-41559,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056,42071,42083-42085,42101-42104,42117,42127-42128,42135-42142
Modified: haiku/branches/releases/r1alpha3/build/jam/ReleaseBuildProfiles
===================================================================
--- haiku/branches/releases/r1alpha3/build/jam/ReleaseBuildProfiles
2011-06-16 18:07:57 UTC (rev 42209)
+++ haiku/branches/releases/r1alpha3/build/jam/ReleaseBuildProfiles
2011-06-16 19:54:53 UTC (rev 42210)
@@ -53,5 +53,5 @@
# Uncomment in official release branch.
-#HAIKU_DEFINES += HAIKU_OFFICIAL_RELEASE ;
-#TARGET_DEFINES += HAIKU_OFFICIAL_RELEASE ;
+HAIKU_DEFINES += HAIKU_OFFICIAL_RELEASE ;
+TARGET_DEFINES += HAIKU_OFFICIAL_RELEASE ;
Modified:
haiku/branches/releases/r1alpha3/src/system/boot/platform/bios_ia32/start.cpp
===================================================================
---
haiku/branches/releases/r1alpha3/src/system/boot/platform/bios_ia32/start.cpp
2011-06-16 18:07:57 UTC (rev 42209)
+++
haiku/branches/releases/r1alpha3/src/system/boot/platform/bios_ia32/start.cpp
2011-06-16 19:54:53 UTC (rev 42210)
@@ -127,7 +127,7 @@
args.arguments = NULL;
serial_init();
- serial_enable();
+// serial_enable();
console_init();
cpu_init();
mmu_init();
@@ -137,8 +137,8 @@
// reading the keyboard doesn't seem to work in graphics mode
// (maybe a bochs problem)
sBootOptions = check_for_boot_keys();
-// if (sBootOptions & BOOT_OPTION_DEBUG_OUTPUT)
-// serial_enable();
+ if (sBootOptions & BOOT_OPTION_DEBUG_OUTPUT)
+ serial_enable();
apm_init();
acpi_init();
Other related posts:
- » [haiku-commits] r42210 - in haiku/branches/releases/r1alpha3: build/jam src/system/boot/platform/bios_ia32 - pulkomandy
