diff options
author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-07-14 11:30:13 +0000 |
---|---|---|
committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-07-14 11:30:13 +0000 |
commit | d65919f84c141d69d3b2b11374df99fdae13ff4a (patch) | |
tree | ecd1eb5fa2edb982a5320ef0fc2c8f5323f4062e /conf | |
parent | d1a9129a306a07ade4ca50287345f4e950d308df (diff) | |
parent | 92df2001b5459e00f493ca5b61a5b849ddb24055 (diff) |
merge of '2436a8cf0f1e75038f7abdde2b335ec87e4787c2'
and '5435d6cca1d4e6591c2820a722218a23661342bb'
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/angstrom-2007.1.conf | 9 | ||||
-rw-r--r-- | conf/machine/palmtc.conf | 16 |
2 files changed, 23 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 52a475f8f6..3273d6f329 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -98,6 +98,7 @@ PACKAGE_EXTRA_ARCHS_collie = "arm-oabi" PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi" PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi" PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi" +PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi" FEED_URIS += " \ no-arch##${ANGSTROM_URI}/unstable/feed/all \ @@ -149,6 +150,10 @@ PREFERRED_VERSION_pango = "1.16.4" PREFERRED_VERSION_atk = "1.10.3" PREFERRED_VERSION_gtk+ = "2.10.12" +# newer poppler cvs breaks some apps, fix until popper 6 and apps +# catch up with api changes +PREFERRED_VERSION_poppler = "0.5.4" + # older gtk-webcore releases don't work on ARM/EABI # We need to switch to a fixed SRCDATE or release as soon as possible PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}" @@ -160,7 +165,7 @@ PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -PREFERRED_VERSION_xserver-kdrive ?= "1.2.0" +PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0" PREFERRED_VERSION_libxrandr ?= "1.2.1" PREFERRED_VERSION_xrandr ?= "1.2.0" PREFERRED_VERSION_randrproto ?= "1.2.1" @@ -303,7 +308,7 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" #EXTRA_STUFF_append_akita += "altboot" #EXTRA_STUFF_append_poodle += "altboot" #EXTRA_STUFF_append_tosa += "altboot" -EXTRA_STUFF_append_spitz += "altboot" +#EXTRA_STUFF_append_spitz += "altboot" # do some task-base stuff here diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf new file mode 100644 index 0000000000..f4fcb405c5 --- /dev/null +++ b/conf/machine/palmtc.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: Palm TC +#@DESCRIPTION: Machine configuration for the Palm TX + +require conf/machine/include/palm.conf + +MACHINE_FEATURES += "wifi" + +ROOT_FLASH_SIZE = "100" + +SERIAL_CONSOLE = "115200 ttyS0" + +GUI_MACHINE_CLASS = "bigscreen" + +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxapwm-bl" + |