Changeset b50b5af2 in mainline for HelenOS.config

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• HelenOS.config (modified) (3 diffs)

HelenOS.config

@@ -82 +82 @@
 ! [PLATFORM=sparc64&MACHINE=serengeti] PROCESSOR (choice)
 
-% Ramdisk format
+% RAM disk format
 @ "tmpfs" TMPFS image
 @ "fat" FAT16 image
@@ -273 +273 @@
 
 % OpenFirmware tree support
-! [PLATFORM=sparc64] CONFIG_OFW_TREE (y)
+! [PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_OFW_TREE (y)
+
+% OpenFirmware PCI bus support
+! [PLATFORM=sparc64] CONFIG_OFW_PCI (y)
 
 % Multiboot standard support
@@ -474 +477 @@
 ! [PLATFORM=sparc64&MACHINE=generic] CONFIG_AOUT_ISOFS_B (y)
 
-% External ramdisk
+% External RAM disk
 ! [PLATFORM=sparc64] CONFIG_RD_EXTERNAL (y/n)