Changeset 4d0f97d in mainline for HelenOS.config

Timestamp:

2010-07-16T14:23:41Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e2650d3

Parents:

aa0d227 (diff), 24697c3 (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 from lp:~jsvoboda/helenos/gta02. This adds support for the GTA02 platform. Fixes ticket #134.

File:

• HelenOS.config (modified) (3 diffs)

HelenOS.config

@@ -58 +58 @@
 
 % Machine type
+@ "gta02" GTA02 / Neo FreeRunner
 @ "testarm" GXEmul Testarm
 @ "integratorcp" Integratorcp
@@ -389 +390 @@
 % Output device class
 @ "generic" Monitor or serial line
-! [PLATFORM=arm32&MACHINE=integratorcp] CONFIG_HID_OUT (choice)
+! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp)] CONFIG_HID_OUT (choice)
 
 % Output device class
@@ -436 +437 @@
 % Support for NS16550 controller
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial)&PLATFORM=ia64&MACHINE=i460GX] CONFIG_NS16550 (y/n)
+
+% Support for Samsung S3C24XX on-chip UART
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_UART (y/n)
 
 % Support for Z8530 controller